From d3f7bc4a1e8b520b37ec73848b863e8ee31d2ab3 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 16 Jul 2024 00:25:30 +0200 Subject: [PATCH 0001/2279] smatch: fix include path for standard headers --- pkgs/by-name/sm/smatch/fix_include_path.patch | 58 +++++++++++++++++++ pkgs/by-name/sm/smatch/package.nix | 31 +++++++--- 2 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/sm/smatch/fix_include_path.patch diff --git a/pkgs/by-name/sm/smatch/fix_include_path.patch b/pkgs/by-name/sm/smatch/fix_include_path.patch new file mode 100644 index 000000000000..af6de589f9e9 --- /dev/null +++ b/pkgs/by-name/sm/smatch/fix_include_path.patch @@ -0,0 +1,58 @@ +diff --git a/pre-process.c b/pre-process.c +index 457685c0..006209ad 100644 +--- a/pre-process.c ++++ b/pre-process.c +@@ -2410,32 +2410,27 @@ static void do_preprocess(struct token **list) + + void init_include_path(void) + { +- FILE *fp; +- char path[256]; +- char arch[32]; +- char os[32]; +- +- fp = popen("/bin/uname -m", "r"); +- if (!fp) +- return; +- if (!fgets(arch, sizeof(arch) - 1, fp)) +- return; +- pclose(fp); +- if (arch[strlen(arch) - 1] == '\n') +- arch[strlen(arch) - 1] = '\0'; +- +- fp = popen("/bin/uname -o", "r"); +- if (!fp) +- return; +- fgets(os, sizeof(os) - 1, fp); +- pclose(fp); +- +- if (strcmp(os, "GNU/Linux\n") != 0) +- return; +- strcpy(os, "linux-gnu"); +- +- snprintf(path, sizeof(path), "/usr/include/%s-%s/", arch, os); +- add_pre_buffer("#add_system \"%s/\"\n", path); ++ add_pre_buffer("#add_system \"%s/\"\n", "@clang@"); ++ add_pre_buffer("#add_system \"%s/\"\n", "@libc@"); ++ ++ bool collect = false; ++ char *nix_cflags = getenv("NIX_CFLAGS_COMPILE"); ++ if (nix_cflags == NULL) ++ return; ++ ++ for ( ++ char *token = strtok(nix_cflags, " "); ++ token != NULL; ++ token = strtok(NULL, " ") ++ ) { ++ if (collect && *token == '/') { ++ add_pre_buffer("#add_system \"%s/\"\n", token); ++ collect = false; ++ continue; ++ } ++ if (!strcmp(token, "-isystem")) ++ collect = true; ++ } + } + + struct token * preprocess(struct token *token) diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix index fe6514e15d92..7c13cf571ab8 100644 --- a/pkgs/by-name/sm/smatch/package.nix +++ b/pkgs/by-name/sm/smatch/package.nix @@ -5,31 +5,44 @@ pkg-config, sqlite, openssl, - buildllvmsparse ? false, - buildc2xml ? false, libllvm, libxml2, + replaceVars, + llvmPackages, + buildllvmsparse ? false, + buildc2xml ? false, }: let version = "1.73"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "smatch"; inherit version; src = fetchFromGitHub { owner = "error27"; repo = "smatch"; - rev = version; - sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; + tag = finalAttrs.version; + hash = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME="; }; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ - "-Wno-incompatible-function-pointer-types" + patches = [ + ./remove_const.patch + ( + let + clang-major = lib.versions.major (lib.getVersion llvmPackages.clang-unwrapped); + clang-lib = lib.getLib llvmPackages.clang-unwrapped; + in + replaceVars ./fix_include_path.patch { + clang = "${clang-lib}/lib/clang/${clang-major}/include"; + libc = "${lib.getDev stdenv.cc.libc}/include"; + } + ) ]; + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config ]; - patches = [ ./remove_const.patch ]; buildInputs = [ @@ -51,4 +64,4 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; -} +}) From d860766d19115e16459a759d1d2bb591991bbc22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 00:47:36 +0000 Subject: [PATCH 0002/2279] libiconvReal: 1.17 -> 1.18 --- pkgs/development/libraries/libiconv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index e3a0d34d6703..c7a527d42d3e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libiconv"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz"; - sha256 = "sha256-j3QhO1YjjIWlClMp934GGYdx5w3Zpzl3n0wC9l2XExM="; + sha256 = "sha256-Owj19Pm064LxUacEC/1v5sb7ki7+SxZZxm6pMydpZeg="; }; enableParallelBuilding = true; From aa2b60bb4f0e085d8810ebb403693a57d19f40ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luukas=20P=C3=B6rtfors?= Date: Fri, 27 Jun 2025 22:45:17 +0200 Subject: [PATCH 0003/2279] maintainers: add lajp --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 17c86233489e..a7e6caa88841 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13893,6 +13893,17 @@ githubId = 55911173; name = "Gwendolyn Quasebarth"; }; + lajp = { + email = "lajp@iki.fi"; + github = "lajp"; + githubId = 31856315; + name = "Luukas Pörtfors"; + keys = [ + { + fingerprint = "24E8 E4CC 0295 F4ED B9E0 B4A6 C913 9B8D EA65 BD82"; + } + ]; + }; lamarios = { matrix = "@lamarios:matrix.org"; github = "lamarios"; From ad4549120b4ab508a0c85fe771b3108fc9b807b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luukas=20P=C3=B6rtfors?= Date: Fri, 27 Jun 2025 22:29:51 +0200 Subject: [PATCH 0004/2279] voikko-fi: init at 2.5 Co-authored-by: Nikolay Korotkiy --- pkgs/by-name/vo/voikko-fi/package.nix | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/vo/voikko-fi/package.nix diff --git a/pkgs/by-name/vo/voikko-fi/package.nix b/pkgs/by-name/vo/voikko-fi/package.nix new file mode 100644 index 000000000000..c51ccaae5d83 --- /dev/null +++ b/pkgs/by-name/vo/voikko-fi/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + python3, + foma, + libvoikko, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "voikko-fi"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "voikko"; + repo = "corevoikko"; + tag = "rel-voikko-fi-${finalAttrs.version}"; + hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M="; + }; + + sourceRoot = "${finalAttrs.src.name}/voikko-fi"; + + enableParallelBuilding = true; + + installTargets = "vvfst-install DESTDIR=$(out)/share/voikko-fi"; + + nativeBuildInputs = [ + python3 + foma + libvoikko + ]; + + meta = { + homepage = "https://voikko.puimula.org"; + description = "Description of Finnish morphology written for libvoikko"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ lajp ]; + platforms = lib.platforms.unix; + }; +}) From af09e3de7dbba1a3c3b33bebfe0af52b010b2d14 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 19 Jul 2025 06:43:55 +0200 Subject: [PATCH 0005/2279] cctools: adjust version string to upstream build --- pkgs/by-name/cc/cctools/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cc/cctools/meson.build b/pkgs/by-name/cc/cctools/meson.build index bfb4f06285d7..dfe412800ff4 100644 --- a/pkgs/by-name/cc/cctools/meson.build +++ b/pkgs/by-name/cc/cctools/meson.build @@ -12,7 +12,7 @@ project( '-DCCTB_PROJECT=cctools', '-DCCTB_PROJVERS=cctools-@version@', '-DCCTB_VERSION=@version@', - '-DCURRENT_PROJECT_VERSION="@version@"', + '-DCURRENT_PROJECT_VERSION=cctools-@version@', '-DCODEDIRECTORY_SUPPORT', '-DLTO_SUPPORT', ], From 7ed6a3f3e7f56e6eb35515f98b9fd068cd8a3f6f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 25 Apr 2025 10:35:34 -0700 Subject: [PATCH 0006/2279] doc: update platform support --- doc/redirects.json | 18 +++++++++ doc/using/platform-support.chapter.md | 53 +++++++++++++++++++++------ 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/doc/redirects.json b/doc/redirects.json index ad13136e23ef..d47c7e16531a 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -177,6 +177,24 @@ "sec-pkg-overrideDerivation": [ "index.html#sec-pkg-overrideDerivation" ], + "sec-platform-breakdown": [ + "index.html#sec-platform-breakdown" + ], + "sec-platform-tier1": [ + "index.html#sec-platform-tier1" + ], + "sec-platform-tier2": [ + "index.html#sec-platform-tier2" + ], + "sec-platform-tier3": [ + "index.html#sec-platform-tier3" + ], + "sec-platform-tier4-7": [ + "index.html#sec-platform-tier4-7" + ], + "sec-platform-tiers": [ + "index.html#sec-platform-tiers" + ], "sec-lib-makeOverridable": [ "index.html#sec-lib-makeOverridable" ], diff --git a/doc/using/platform-support.chapter.md b/doc/using/platform-support.chapter.md index 3f91b3d5d980..d5a985c90d35 100644 --- a/doc/using/platform-support.chapter.md +++ b/doc/using/platform-support.chapter.md @@ -1,18 +1,49 @@ # Platform Support {#chap-platform-support} -Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). +Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is. -Below is the list of the best supported platforms: +## Tiers {#sec-platform-tiers} -- `x86_64-linux`: Highest level of support. -- `aarch64-linux`: Well supported, with most packages building successfully in CI. -- `aarch64-darwin`: Receives better support than `x86_64-darwin`. -- `x86_64-darwin`: Receives some support. +### Tier 1 {#sec-platform-tier1} -There are many other platforms with varying levels of support. -The provisional platform list in [Appendix A] of [RFC046], while not up to date, can be used as guidance. +[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work. -A more formal definition of the platform support tiers is provided in [RFC046], but has not been fully implemented yet. +### Tier 2 {#sec-platform-tier2} -[RFC046]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md -[Appendix A]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#appendix-a-non-normative-description-of-platforms-in-november-2019 +[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support. + +### Tier 3 {#sec-platform-tier3} + +[Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) platforms may receive non-intrusive platform-specific fixes, have native bootstrap tools available with cross-build toolchains in binary cache, but updates might break builds on these platforms. + +### Tier 4-7 {#sec-platform-tier4-7} + +Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) indicate varying levels of minimal support going from receiving only limited fixes to platforms with no support, but a path to support. + +## Breakdown {#sec-platform-breakdown} + +| Triple | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support | +| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- | +| `x86_64-unknown-linux-gnu` | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️ | ✔️ | ✔️ | ✔️ | +| `aarch64-unknown-linux-gnu` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | +| `x86_64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | +| `aarch64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | +| `x86_64-unknown-unknown-freebsd` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `arm64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌\* | +| `x86_64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌\* | +| `i686-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | +| `riscv32-unknown-linux-gnu` | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌ | ❌ | ❌ | ✔️ | +| `riscv64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `loongarch64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `armv6l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `armv6l-unknown-linux-musleabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `armv7l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `armv5tel-unknown-linux-gnueabi` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `mips64el-unknown-linux-gnuabi64` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `mips64el-unknown-linux-gnuabin32` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `mipsel-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `powerpc64le-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| `s390x-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | + +\* - Cross compiling is only supported on Darwin hosts. From 027419d257c9c6147b33f3c0461195caac6c716c Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sun, 27 Jul 2025 16:14:19 +0200 Subject: [PATCH 0007/2279] treewide: fix inappropriate usage of rust.envVars.setEnv It was designed for the Cargo build hook, which goes into `nativeBuildInputs`. Direct usage leads to an incorrect platform offset, which can for example be observed by the package `pkgsStatic.buildPackages` differing from the native one due to accidentally receiving the wrong environment variables. Fix the issue by using `buildPackages` as `nativeBuildInputs` would. --- pkgs/by-name/hd/hdr10plus/package.nix | 4 ++-- pkgs/by-name/li/libdovi/package.nix | 8 ++++---- pkgs/by-name/li/libimagequant/package.nix | 6 +++--- pkgs/by-name/ra/rav1e/package.nix | 6 +++--- pkgs/by-name/ru/rustls-ffi/package.nix | 8 ++++---- pkgs/by-name/ya/yara-x/package.nix | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix index 9358179afd41..54f2bfe44e81 100644 --- a/pkgs/by-name/hd/hdr10plus/package.nix +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - rust, + buildPackages, rustPlatform, hdr10plus_tool, fetchFromGitHub, @@ -11,7 +11,7 @@ let inherit (lib) optionals concatStringsSep; - inherit (rust.envVars) setEnv; + inherit (buildPackages.rust.envVars) setEnv; in rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; diff --git a/pkgs/by-name/li/libdovi/package.nix b/pkgs/by-name/li/libdovi/package.nix index 055c90f7d9c4..a1dad59c0652 100644 --- a/pkgs/by-name/li/libdovi/package.nix +++ b/pkgs/by-name/li/libdovi/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchCrate, cargo-c, - rust, + buildPackages, stdenv, }: @@ -27,19 +27,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix index b9a4acaf44fe..a1faacec910f 100644 --- a/pkgs/by-name/li/libimagequant/package.nix +++ b/pkgs/by-name/li/libimagequant/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - rust, + buildPackages, rustPlatform, cargo-c, python3, @@ -37,13 +37,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index cd4e0e92260e..5efce1866054 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -1,6 +1,6 @@ { lib, - rust, + buildPackages, stdenv, rustPlatform, fetchCrate, @@ -43,11 +43,11 @@ rustPlatform.buildRustPackage rec { checkType = "debug"; postBuild = '' - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; postInstall = '' - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; passthru = { diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index d86c53fd8441..b3b78948696c 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -6,7 +6,7 @@ rustPlatform, cargo-c, validatePkgConfig, - rust, + buildPackages, libiconv, curl, apacheHttpd, @@ -42,19 +42,19 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 9972818aa0da..ccaebd4bca7a 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -1,6 +1,6 @@ { lib, - rust, + buildPackages, stdenv, fetchFromGitHub, rustPlatform, @@ -29,11 +29,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postBuild = '' - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; postInstall = '' - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} + ${buildPackages.rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd yr \ From 458507324d66da2b52bcc3ae3c39094441075ca7 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 21:29:38 -0400 Subject: [PATCH 0008/2279] ted: enable on darwin Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/te/ted/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index b8da10b305da..cf78bc44881a 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -9,10 +9,11 @@ libjpeg, libtiff, libpng, - gtk2, + gtk2-x11, libpaper, makeWrapper, ghostscript, + libXft, }: stdenv.mkDerivation rec { @@ -56,6 +57,8 @@ stdenv.mkDerivation rec { "compile.shared" ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + installPhase = '' runHook preInstall @@ -91,8 +94,9 @@ stdenv.mkDerivation rec { libjpeg libtiff libpng - gtk2 + gtk2-x11 libpaper + libXft ]; meta = with lib; { @@ -112,7 +116,6 @@ stdenv.mkDerivation rec { homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ obadz ]; }; } From 3265b95424400747466ffb79cce164ee4e5698e4 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 21:32:44 -0400 Subject: [PATCH 0009/2279] ted: modernize Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/te/ted/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index cf78bc44881a..a626f8812265 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz"; - sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z"; + hash = "sha256-P6mSwryWrzyniO+UHLUxT0odhDIC79AgG4tO6a2/MWw="; }; preConfigure = '' @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libXft ]; - meta = with lib; { + meta = { description = "Easy rich text processor"; longDescription = '' Ted is a text processor running under X Windows on Unix/Linux systems. @@ -114,8 +114,8 @@ stdenv.mkDerivation rec { Acrobat PDF converter. ''; homepage = "https://nllgg.nl/Ted/"; - license = licenses.gpl2Only; - platforms = platforms.all; - maintainers = with maintainers; [ obadz ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ obadz ]; }; } From 86710a779c0cb90c2a844055c693856e78cfc110 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 10 Aug 2025 17:56:00 -0400 Subject: [PATCH 0010/2279] ted: fix homepage --- pkgs/by-name/te/ted/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index a626f8812265..eaa5c5a373d8 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to Acrobat PDF converter. ''; - homepage = "https://nllgg.nl/Ted/"; + homepage = "https://ftp.nluug.nl/pub/editors/ted/"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ obadz ]; From 6bc5bf225dd57f66c68e9689879921c06272b026 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sun, 10 Aug 2025 19:59:41 -0400 Subject: [PATCH 0011/2279] modrinth-app: 0.9.5 -> 0.10.3 Diff: https://github.com/modrinth/code/compare/v0.9.5...v0.10.3 Co-authored-by: Valentine Briese --- .../mo/modrinth-app-unwrapped/deps.json | 72 ++++++++++++++++++ .../gradle-from-path.patch | 36 +++++++++ .../mo/modrinth-app-unwrapped/package.nix | 74 ++++++++++++++++++- .../remove-spotless.patch | 25 +++++++ 4 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/mo/modrinth-app-unwrapped/deps.json create mode 100644 pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch create mode 100644 pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json new file mode 100644 index 000000000000..098bd55d03f2 --- /dev/null +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json @@ -0,0 +1,72 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "org/gradle/toolchains#foojay-resolver/0.10.0": { + "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=", + "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=", + "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": { + "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8=" + } + }, + "https://repo.maven.apache.org/maven2/org": { + "apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "junit#junit-bom/5.12.1": { + "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=", + "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A=" + }, + "junit/jupiter#junit-jupiter-api/5.12.1": { + "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=", + "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=", + "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w=" + }, + "junit/jupiter#junit-jupiter-engine/5.12.1": { + "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=", + "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=", + "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao=" + }, + "junit/jupiter#junit-jupiter-params/5.12.1": { + "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=", + "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=", + "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M=" + }, + "junit/jupiter#junit-jupiter/5.12.1": { + "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=", + "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=", + "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ=" + }, + "junit/platform#junit-platform-commons/1.12.1": { + "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=", + "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=", + "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM=" + }, + "junit/platform#junit-platform-engine/1.12.1": { + "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=", + "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=", + "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w=" + }, + "junit/platform#junit-platform-launcher/1.12.1": { + "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=", + "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=", + "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk=" + }, + "opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + } + } +} diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch new file mode 100644 index 000000000000..ef97f6e66e6e --- /dev/null +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch @@ -0,0 +1,36 @@ +diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs +index 251c4e84..eeacd02a 100644 +--- a/packages/app-lib/build.rs ++++ b/packages/app-lib/build.rs +@@ -1,7 +1,7 @@ + use std::ffi::OsString; + use std::path::PathBuf; + use std::process::{Command, exit}; +-use std::{env, fs}; ++use std::env; + + fn main() { + println!("cargo::rerun-if-changed=java/gradle"); +@@ -19,21 +19,11 @@ fn main() { + out_dir.join("java/libs").display() + ); + +- let gradle_path = fs::canonicalize( +- #[cfg(target_os = "windows")] +- "java\\gradlew.bat", +- #[cfg(not(target_os = "windows"))] +- "java/gradlew", +- ) +- .unwrap(); +- + let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir="); + build_dir_str.push(out_dir.join("java")); +- let exit_status = Command::new(gradle_path) ++ let exit_status = Command::new("@gradle@") + .arg(build_dir_str) + .arg("build") +- .arg("--no-daemon") +- .arg("--console=rich") + .current_dir(dunce::canonicalize("java").unwrap()) + .status() + .expect("Failed to wait on Gradle build"); diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index c744a2168ff0..8014d0a4d1b4 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -5,44 +5,84 @@ cargo-tauri, desktop-file-utils, fetchFromGitHub, + gradle_8, + jdk11, makeBinaryWrapper, + makeShellWrapper, nix-update-script, nodejs, openssl, pkg-config, pnpm_9, + replaceVars, + runCommand, rustPlatform, turbo, webkitgtk_4_1, }: let + gradle = gradle_8.override { java = jdk; }; + jdk = jdk11; pnpm = pnpm_9; in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.9.5"; + version = "0.10.3"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0="; + hash = "sha256-XfJbjbVcP9N3exAhXQoMGpoHORpKAlb0dPhQq195roY="; }; - cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I="; + patches = [ + # `packages/app-lib/build.rs` requires a Gradle executable, but our flags + # are injected through a bash function sourced by the stdenv :( + # + # So, re-implement said wrapper to have the same behavior when Gradle is ran in `build.rs` + (replaceVars ./gradle-from-path.patch { + # Yes, it has to be a shell wrapper + # https://github.com/NixOS/nixpkgs/issues/172583 + gradle = + runCommand "gradle-exe-wrapper-${gradle.version}" { nativeBuildInputs = [ makeShellWrapper ]; } + '' + makeShellWrapper ${lib.getExe gradle} $out \ + --add-flags "\''${NIX_GRADLEFLAGS_COMPILE:-}" + ''; + }) + + # `gradle.fetchDeps` doesn't seem to pick up a few integrations here + # Thankfully that's fine, since it's only for development + ./remove-spotless.patch + ]; + + # Let the app know about our actual version number + postPatch = '' + substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \ + --replace-fail '1.0.0-local' '${finalAttrs.version}' + ''; + + cargoHash = "sha256-jWMHii65hTnTmiBFHxZ4xO5V+Qt/MPCy75eJvnlyE4c="; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o="; + hash = "sha256-7iqXuIQPbP2p26vrWDjMoyZBPpbVQpigYAylhIg8+ZY="; }; nativeBuildInputs = [ cacert # Required for turbo cargo-tauri.hook desktop-file-utils + gradle nodejs pkg-config pnpm.configHook @@ -51,16 +91,38 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; + gradleFlags = [ + "-Dfile.encoding=utf-8" + "--no-configuration-cache" + ]; + + dontUseGradleBuild = true; + dontUseGradleCheck = true; + # Tests fail on other, unrelated packages in the monorepo cargoTestFlags = [ "--package" "theseus_gui" ]; + # Required for mitmCache + __darwinAllowLocalNetworking = true; + env = { TURBO_BINARY_PATH = lib.getExe turbo; }; + preGradleUpdate = '' + cd packages/app-lib/java + ''; + + # Required for the exe wrapper above + preBuild = '' + local nixGradleFlags=() + concatTo nixGradleFlags gradleFlags gradleFlagsArray + export NIX_GRADLEFLAGS_COMPILE="''${nixGradleFlags[@]}" + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeBinaryWrapper "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/ModrinthApp @@ -97,5 +159,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # Darwin is the only exception # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678 broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; }; }) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch new file mode 100644 index 000000000000..61c11124aada --- /dev/null +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch @@ -0,0 +1,25 @@ +diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts +index b7f9ede0..8a336897 100644 +--- a/packages/app-lib/java/build.gradle.kts ++++ b/packages/app-lib/java/build.gradle.kts +@@ -1,6 +1,5 @@ + plugins { + java +- id("com.diffplug.spotless") version "7.0.4" + } + + repositories { +@@ -23,13 +22,6 @@ tasks.withType().configureEach { + options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror")) + } + +-spotless { +- java { +- palantirJavaFormat() +- removeUnusedImports() +- } +-} +- + tasks.jar { + archiveFileName = "theseus.jar" + } From 537f5bab3bd0dc4677dfaa46d8a5f21bac9c435e Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sun, 10 Aug 2025 20:01:24 -0400 Subject: [PATCH 0012/2279] modrinth-app: wrap with gsettings-desktop-schemas This fixes some issues on non-GTK desktops Co-authored-by: Ludanta Spirito --- pkgs/by-name/mo/modrinth-app/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index 65ea5598cb1a..be0442eabfbb 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -4,7 +4,9 @@ addDriverRunpath, alsa-lib, flite, + glib, glib-networking, + gsettings-desktop-schemas, jdk17, jdk21, jdk8, @@ -30,9 +32,17 @@ symlinkJoin { paths = [ modrinth-app-unwrapped ]; - nativeBuildInputs = [ wrapGAppsHook4 ]; + strictDeps = true; - buildInputs = [ glib-networking ]; + nativeBuildInputs = [ + glib + wrapGAppsHook4 + ]; + + buildInputs = [ + glib-networking + gsettings-desktop-schemas + ]; runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux ( lib.makeLibraryPath [ @@ -72,6 +82,8 @@ symlinkJoin { ''} ) + glibPostInstallHook + gappsWrapperArgsHook wrapGAppsHook ''; From 2aa5caaf7381da88a56a8f00bf39b6368fc285e6 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 7 Aug 2025 17:56:28 -0400 Subject: [PATCH 0013/2279] gitbutler: 0.14.19 -> 0.15.10 Diff: https://github.com/gitbutlerapp/gitbutler/compare/release/0.14.9...release/0.15.10 Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release%2F0.15.10 --- .../gi/gitbutler/gix-from-crates-io.patch | 4292 +++++++++++++++++ pkgs/by-name/gi/gitbutler/package.nix | 25 +- 2 files changed, 4309 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch diff --git a/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch new file mode 100644 index 000000000000..b686317c2c7a --- /dev/null +++ b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch @@ -0,0 +1,4292 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 60b520f8d..8406c39d0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -13,9 +13,9 @@ dependencies = [ + + [[package]] + name = "adler2" +-version = "2.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" ++checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + + [[package]] + name = "aes" +@@ -95,9 +95,9 @@ checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d" + + [[package]] + name = "android_logger" +-version = "0.15.0" ++version = "0.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f6f39be698127218cca460cb624878c9aa4e2b47dba3b277963d2bf00bad263b" ++checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3" + dependencies = [ + "android_log-sys", + "env_filter", +@@ -115,9 +115,9 @@ dependencies = [ + + [[package]] + name = "anstream" +-version = "0.6.18" ++version = "0.6.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" ++checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" + dependencies = [ + "anstyle", + "anstyle-parse", +@@ -130,37 +130,37 @@ dependencies = [ + + [[package]] + name = "anstyle" +-version = "1.0.10" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" ++checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + + [[package]] + name = "anstyle-parse" +-version = "0.2.6" ++version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" ++checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" + dependencies = [ + "utf8parse", + ] + + [[package]] + name = "anstyle-query" +-version = "1.1.2" ++version = "1.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" ++checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" + dependencies = [ +- "windows-sys 0.59.0", ++ "windows-sys 0.60.2", + ] + + [[package]] + name = "anstyle-wincon" +-version = "3.0.7" ++version = "3.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" ++checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" + dependencies = [ + "anstyle", +- "once_cell", +- "windows-sys 0.59.0", ++ "once_cell_polyfill", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -180,15 +180,15 @@ dependencies = [ + + [[package]] + name = "arboard" +-version = "3.5.0" ++version = "3.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70" ++checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227" + dependencies = [ + "clipboard-win", + "image", + "log", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.1", +@@ -213,14 +213,14 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + + [[package]] + name = "ashpd" +-version = "0.9.2" ++version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" ++checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df" + dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", +- "rand 0.8.5", ++ "rand 0.9.2", + "raw-window-handle", + "serde", + "serde_repr", +@@ -229,7 +229,7 @@ dependencies = [ + "wayland-backend", + "wayland-client", + "wayland-protocols", +- "zbus 4.4.0", ++ "zbus 5.9.0", + ] + + [[package]] +@@ -262,9 +262,9 @@ dependencies = [ + + [[package]] + name = "async-channel" +-version = "2.3.1" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" ++checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" + dependencies = [ + "concurrent-queue", + "event-listener-strategy", +@@ -288,9 +288,9 @@ dependencies = [ + + [[package]] + name = "async-io" +-version = "2.4.0" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" ++checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca" + dependencies = [ + "async-lock", + "cfg-if", +@@ -299,17 +299,16 @@ dependencies = [ + "futures-lite", + "parking", + "polling", +- "rustix 0.38.44", ++ "rustix 1.0.8", + "slab", +- "tracing", +- "windows-sys 0.59.0", ++ "windows-sys 0.60.2", + ] + + [[package]] + name = "async-lock" +-version = "3.4.0" ++version = "3.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" ++checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" + dependencies = [ + "event-listener", + "event-listener-strategy", +@@ -350,14 +349,14 @@ checksum = "0289cba6d5143bfe8251d57b4a8cac036adf158525a76533a7082ba65ec76398" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] + name = "async-process" +-version = "2.3.0" ++version = "2.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" ++checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00" + dependencies = [ + "async-channel", + "async-io", +@@ -368,8 +367,7 @@ dependencies = [ + "cfg-if", + "event-listener", + "futures-lite", +- "rustix 0.38.44", +- "tracing", ++ "rustix 1.0.8", + ] + + [[package]] +@@ -380,14 +378,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] + name = "async-signal" +-version = "0.2.10" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" ++checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1" + dependencies = [ + "async-io", + "async-lock", +@@ -395,10 +393,10 @@ dependencies = [ + "cfg-if", + "futures-core", + "futures-io", +- "rustix 0.38.44", ++ "rustix 1.0.8", + "signal-hook-registry", + "slab", +- "windows-sys 0.59.0", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -420,7 +418,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -437,7 +435,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -471,9 +469,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + + [[package]] + name = "autocfg" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" ++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + + [[package]] + name = "axum" +@@ -691,9 +689,9 @@ dependencies = [ + + [[package]] + name = "blocking" +-version = "1.6.1" ++version = "1.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" ++checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" + dependencies = [ + "async-channel", + "async-task", +@@ -722,7 +720,7 @@ dependencies = [ + "proc-macro-crate 3.3.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -759,9 +757,9 @@ dependencies = [ + + [[package]] + name = "bumpalo" +-version = "3.17.0" ++version = "3.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" ++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + + [[package]] + name = "but" +@@ -941,7 +939,7 @@ dependencies = [ + "insta", + "serde", + "serde_json", +- "toml", ++ "toml 0.8.23", + "tracing", + "uuid", + ] +@@ -986,7 +984,7 @@ dependencies = [ + "petgraph 0.8.2", + "serde", + "termtree", +- "toml", ++ "toml 0.8.23", + "tracing", + ] + +@@ -1008,7 +1006,7 @@ dependencies = [ + "serde", + "serde-error", + "serde_json", +- "toml", ++ "toml 0.8.23", + "tracing", + "uuid", + ] +@@ -1057,7 +1055,7 @@ dependencies = [ + "insta", + "serde", + "tempfile", +- "toml", ++ "toml 0.8.23", + "tracing", + ] + +@@ -1275,9 +1273,9 @@ dependencies = [ + + [[package]] + name = "bytemuck" +-version = "1.23.0" ++version = "1.23.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" ++checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" + + [[package]] + name = "byteorder" +@@ -1346,9 +1344,9 @@ dependencies = [ + + [[package]] + name = "camino" +-version = "1.1.9" ++version = "1.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" ++checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0" + dependencies = [ + "serde", + ] +@@ -1378,12 +1376,12 @@ dependencies = [ + + [[package]] + name = "cargo_toml" +-version = "0.22.1" ++version = "0.22.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257" ++checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" + dependencies = [ + "serde", +- "toml", ++ "toml 0.9.5", + ] + + [[package]] +@@ -1397,9 +1395,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.2.23" ++version = "1.2.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" ++checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2" + dependencies = [ + "jobserver", + "libc", +@@ -1435,9 +1433,9 @@ dependencies = [ + + [[package]] + name = "cfg-if" +-version = "1.0.0" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" + + [[package]] + name = "cfg_aliases" +@@ -1472,9 +1470,9 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.5.42" ++version = "4.5.43" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" ++checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f" + dependencies = [ + "clap_builder", + "clap_derive", +@@ -1482,9 +1480,9 @@ dependencies = [ + + [[package]] + name = "clap_builder" +-version = "4.5.42" ++version = "4.5.43" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" ++checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65" + dependencies = [ + "anstream", + "anstyle", +@@ -1501,20 +1499,20 @@ dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] + name = "clap_lex" +-version = "0.7.4" ++version = "0.7.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" ++checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" + + [[package]] + name = "clipboard-win" +-version = "5.4.0" ++version = "5.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" ++checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4" + dependencies = [ + "error-code", + ] +@@ -1527,14 +1525,14 @@ checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" + + [[package]] + name = "cocoa" +-version = "0.26.0" ++version = "0.26.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" ++checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" + dependencies = [ + "bitflags 2.9.1", + "block", + "cocoa-foundation", +- "core-foundation 0.10.0", ++ "core-foundation 0.10.1", + "core-graphics", + "foreign-types 0.5.0", + "libc", +@@ -1543,23 +1541,22 @@ dependencies = [ + + [[package]] + name = "cocoa-foundation" +-version = "0.2.0" ++version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" ++checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" + dependencies = [ + "bitflags 2.9.1", + "block", +- "core-foundation 0.10.0", ++ "core-foundation 0.10.1", + "core-graphics-types", +- "libc", + "objc", + ] + + [[package]] + name = "colorchoice" +-version = "1.0.3" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" ++checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + + [[package]] + name = "colored" +@@ -1705,9 +1702,9 @@ dependencies = [ + + [[package]] + name = "core-foundation" +-version = "0.10.0" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" ++checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -1726,7 +1723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" + dependencies = [ + "bitflags 2.9.1", +- "core-foundation 0.10.0", ++ "core-foundation 0.10.1", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +@@ -1739,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" + dependencies = [ + "bitflags 2.9.1", +- "core-foundation 0.10.0", ++ "core-foundation 0.10.1", + "libc", + ] + +@@ -1825,7 +1822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" + dependencies = [ + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -1835,29 +1832,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" + dependencies = [ + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] + name = "curl" +-version = "0.4.47" ++version = "0.4.48" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265" ++checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b" + dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", +- "socket2 0.5.9", +- "windows-sys 0.52.0", ++ "socket2 0.5.10", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "curl-sys" +-version = "0.4.80+curl-8.12.1" ++version = "0.4.82+curl-8.14.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734" ++checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be" + dependencies = [ + "cc", + "libc", +@@ -1865,7 +1862,7 @@ dependencies = [ + "openssl-sys", + "pkg-config", + "vcpkg", +- "windows-sys 0.52.0", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -1889,7 +1886,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -1900,7 +1897,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" + dependencies = [ + "darling_core", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -1982,7 +1979,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2003,7 +2000,7 @@ dependencies = [ + "darling", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2013,7 +2010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" + dependencies = [ + "derive_builder_core", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2026,7 +2023,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustc_version", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2052,15 +2049,15 @@ dependencies = [ + + [[package]] + name = "diesel_derives" +-version = "2.2.5" ++version = "2.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "68d4216021b3ea446fd2047f5c8f8fe6e98af34508a254a01e4d6bc1e844f84d" ++checksum = "1b96984c469425cb577bf6f17121ecb3e4fe1e81de5d8f780dd372802858d756" + dependencies = [ + "diesel_table_macro_syntax", + "dsl_auto_type", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2080,7 +2077,7 @@ version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" + dependencies = [ +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2162,7 +2159,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" + dependencies = [ + "libc", + "option-ext", +- "redox_users 0.5.0", ++ "redox_users 0.5.2", + "windows-sys 0.60.2", + ] + +@@ -2190,6 +2187,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" + dependencies = [ + "bitflags 2.9.1", ++ "block2 0.6.1", ++ "libc", + "objc2 0.6.1", + ] + +@@ -2201,7 +2200,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2210,7 +2209,7 @@ version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" + dependencies = [ +- "libloading", ++ "libloading 0.8.8", + ] + + [[package]] +@@ -2227,13 +2226,13 @@ dependencies = [ + + [[package]] + name = "dlopen2_derive" +-version = "0.4.0" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" ++checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2277,7 +2276,7 @@ dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2303,9 +2302,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + + [[package]] + name = "dyn-clone" +-version = "1.0.19" ++version = "1.0.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" ++checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + + [[package]] + name = "either" +@@ -2315,16 +2314,16 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + + [[package]] + name = "embed-resource" +-version = "3.0.2" ++version = "3.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fbc6e0d8e0c03a655b53ca813f0463d2c956bc4db8138dbc89f120b066551e3" ++checksum = "4c6d81016d6c977deefb2ef8d8290da019e27cc26167e102185da528e6c0ab38" + dependencies = [ + "cc", + "memchr", + "rustc_version", +- "toml", ++ "toml 0.9.5", + "vswhom", +- "winreg 0.52.0", ++ "winreg 0.55.0", + ] + + [[package]] +@@ -2356,9 +2355,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + + [[package]] + name = "enumflags2" +-version = "0.7.11" ++version = "0.7.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147" ++checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef" + dependencies = [ + "enumflags2_derive", + "serde", +@@ -2366,13 +2365,13 @@ dependencies = [ + + [[package]] + name = "enumflags2_derive" +-version = "0.7.11" ++version = "0.7.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79" ++checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2403,12 +2402,12 @@ dependencies = [ + + [[package]] + name = "errno" +-version = "0.3.12" ++version = "0.3.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" ++checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" + dependencies = [ + "libc", +- "windows-sys 0.59.0", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -2419,9 +2418,9 @@ checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" + + [[package]] + name = "event-listener" +-version = "5.4.0" ++version = "5.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" ++checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" + dependencies = [ + "concurrent-queue", + "parking", +@@ -2495,11 +2494,11 @@ dependencies = [ + + [[package]] + name = "file-id" +-version = "0.2.2" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36" ++checksum = "e1fc6a637b6dc58414714eddd9170ff187ecb0933d4c7024d1abbd23a3cc26e9" + dependencies = [ +- "windows-sys 0.52.0", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -2528,9 +2527,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + + [[package]] + name = "flate2" +-version = "1.1.1" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" ++checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" + dependencies = [ + "crc32fast", + "libz-rs-sys", +@@ -2588,7 +2587,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2703,9 +2702,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + + [[package]] + name = "futures-lite" +-version = "2.6.0" ++version = "2.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" ++checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" + dependencies = [ + "fastrand", + "futures-core", +@@ -2722,7 +2721,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -2919,7 +2918,7 @@ dependencies = [ + "cfg-if", + "js-sys", + "libc", +- "wasi 0.11.0+wasi-snapshot-preview1", ++ "wasi 0.11.1+wasi-snapshot-preview1", + "wasm-bindgen", + ] + +@@ -2997,7 +2996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "587d0dd757ea38f8a7b4761026162f6b9ab39e2cc7eba386852371841f5fe69b" + dependencies = [ + "git2", +- "gix-path 0.10.19", ++ "gix-path", + "log", + "shellexpand", + "thiserror 2.0.12", +@@ -3066,7 +3065,7 @@ dependencies = [ + "serde-error", + "tempfile", + "tokio", +- "toml", ++ "toml 0.8.23", + "tracing", + "url", + ] +@@ -3235,7 +3234,7 @@ dependencies = [ + "bstr", + "gix", + "serde", +- "toml", ++ "toml 0.8.23", + "walkdir", + ] + +@@ -3318,7 +3317,7 @@ dependencies = [ + "gitbutler-testsupport", + "gix", + "serde", +- "toml", ++ "toml 0.8.23", + "tracing", + ] + +@@ -3346,7 +3345,7 @@ dependencies = [ + "serde", + "strum", + "tempfile", +- "toml", ++ "toml 0.8.23", + "tracing", + ] + +@@ -3429,7 +3428,7 @@ dependencies = [ + "serde_json", + "tempfile", + "thiserror 2.0.12", +- "toml", ++ "toml 0.8.23", + "tracing", + "uuid", + ] +@@ -3506,7 +3505,7 @@ dependencies = [ + "itertools", + "serde", + "tempfile", +- "toml", ++ "toml 0.8.23", + ] + + [[package]] +@@ -3729,15 +3728,16 @@ dependencies = [ + [[package]] + name = "gix" + version = "0.73.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "514c29cc879bdc0286b0cbc205585a49b252809eb86c69df4ce4f855ee75f635" + dependencies = [ +- "gix-actor 0.35.3", ++ "gix-actor", + "gix-attributes 0.27.0", + "gix-command", + "gix-commitgraph 0.29.0", + "gix-config", + "gix-credentials", +- "gix-date 0.10.4", ++ "gix-date", + "gix-diff", + "gix-dir", + "gix-discover 0.41.0", +@@ -3756,7 +3756,7 @@ dependencies = [ + "gix-object 0.50.1", + "gix-odb", + "gix-pack", +- "gix-path 0.10.20", ++ "gix-path", + "gix-pathspec", + "gix-prompt", + "gix-protocol", +@@ -3769,12 +3769,12 @@ dependencies = [ + "gix-status", + "gix-submodule", + "gix-tempfile 18.0.0", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "gix-transport", + "gix-traverse 0.47.0", + "gix-url", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-utils", ++ "gix-validate", + "gix-worktree 0.42.0", + "gix-worktree-state", + "once_cell", +@@ -3783,28 +3783,15 @@ dependencies = [ + "thiserror 2.0.12", + ] + +-[[package]] +-name = "gix-actor" +-version = "0.35.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58ebbb8f41071c7cf318a0b1db667c34e1df49db7bf387d282a4e61a3b97882c" +-dependencies = [ +- "bstr", +- "gix-date 0.10.3", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "itoa", +- "thiserror 2.0.12", +- "winnow 0.7.12", +-] +- + [[package]] + name = "gix-actor" + version = "0.35.3" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d1b1ec302f8dc059df125ed46dfdc7e9d33fe7724df19843aea53b5ffd32d5bb" + dependencies = [ + "bstr", +- "gix-date 0.10.4", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-date", ++ "gix-utils", + "itoa", + "serde", + "thiserror 2.0.12", +@@ -3819,9 +3806,9 @@ checksum = "6f50d813d5c2ce9463ba0c29eea90060df08e38ad8f34b8a192259f8bce5c078" + dependencies = [ + "bstr", + "gix-glob 0.20.1", +- "gix-path 0.10.19", +- "gix-quote 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-path", ++ "gix-quote", ++ "gix-trace", + "kstring", + "smallvec", + "thiserror 2.0.12", +@@ -3831,13 +3818,14 @@ dependencies = [ + [[package]] + name = "gix-attributes" + version = "0.27.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45442188216d08a5959af195f659cb1f244a50d7d2d0c3873633b1cd7135f638" + dependencies = [ + "bstr", + "gix-glob 0.21.0", +- "gix-path 0.10.20", +- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-quote", ++ "gix-trace", + "kstring", + "serde", + "smallvec", +@@ -3854,14 +3842,6 @@ dependencies = [ + "thiserror 2.0.12", + ] + +-[[package]] +-name = "gix-bitmap" +-version = "0.2.14" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" +-dependencies = [ +- "thiserror 2.0.12", +-] +- + [[package]] + name = "gix-chunk" + version = "0.4.11" +@@ -3871,23 +3851,16 @@ dependencies = [ + "thiserror 2.0.12", + ] + +-[[package]] +-name = "gix-chunk" +-version = "0.4.11" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" +-dependencies = [ +- "thiserror 2.0.12", +-] +- + [[package]] + name = "gix-command" + version = "0.6.2" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6b31b65ca48a352ae86312b27a514a0c661935f96b481ac8b4371f65815eb196" + dependencies = [ + "bstr", +- "gix-path 0.10.20", +- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-quote", ++ "gix-trace", + "shell-words", + ] + +@@ -3898,7 +3871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e05050fd6caa6c731fe3bd7f9485b3b520be062d3d139cb2626e052d6c127951" + dependencies = [ + "bstr", +- "gix-chunk 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-chunk", + "gix-hash 0.18.0", + "memmap2", + "thiserror 2.0.12", +@@ -3907,10 +3880,11 @@ dependencies = [ + [[package]] + name = "gix-commitgraph" + version = "0.29.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bb23121e952f43a5b07e3e80890336cb847297467a410475036242732980d06" + dependencies = [ + "bstr", +- "gix-chunk 0.4.11 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-chunk", + "gix-hash 0.19.0", + "memmap2", + "serde", +@@ -3920,13 +3894,14 @@ dependencies = [ + [[package]] + name = "gix-config" + version = "0.46.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5dfb898c5b695fd4acfc3c0ab638525a65545d47706064dcf7b5ead6cdb136c0" + dependencies = [ + "bstr", + "gix-config-value", + "gix-features 0.43.1", + "gix-glob 0.21.0", +- "gix-path 0.10.20", ++ "gix-path", + "gix-ref 0.53.0", + "gix-sec 0.12.0", + "memchr", +@@ -3940,11 +3915,12 @@ dependencies = [ + [[package]] + name = "gix-config-value" + version = "0.15.1" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f012703eb67e263c6c1fc96649fec47694dd3e5d2a91abfc65e4a6a6dc85309" + dependencies = [ + "bitflags 2.9.1", + "bstr", +- "gix-path 0.10.20", ++ "gix-path", + "libc", + "thiserror 2.0.12", + ] +@@ -3952,38 +3928,27 @@ dependencies = [ + [[package]] + name = "gix-credentials" + version = "0.30.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0039dd3ac606dd80b16353a41b61fc237ca5cb8b612f67a9f880adfad4be4e05" + dependencies = [ + "bstr", + "gix-command", + "gix-config-value", +- "gix-date 0.10.4", +- "gix-path 0.10.20", ++ "gix-date", ++ "gix-path", + "gix-prompt", + "gix-sec 0.12.0", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "gix-url", + "serde", + "thiserror 2.0.12", + ] + +-[[package]] +-name = "gix-date" +-version = "0.10.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7235bdf4d9d54a6901928e3a37f91c16f419e6957f520ed929c3d292b84226e" +-dependencies = [ +- "bstr", +- "itoa", +- "jiff", +- "smallvec", +- "thiserror 2.0.12", +-] +- + [[package]] + name = "gix-date" + version = "0.10.4" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "467254054f8df1e85b5f73cb910602767b0122391d994302a091841ba43edfaa" + dependencies = [ + "bstr", + "itoa", +@@ -3996,7 +3961,8 @@ dependencies = [ + [[package]] + name = "gix-diff" + version = "0.53.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de854852010d44a317f30c92d67a983e691c9478c8a3fb4117c1f48626bcdea8" + dependencies = [ + "bstr", + "gix-attributes 0.27.0", +@@ -4006,10 +3972,10 @@ dependencies = [ + "gix-hash 0.19.0", + "gix-index 0.41.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", ++ "gix-path", + "gix-pathspec", + "gix-tempfile 18.0.0", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "gix-traverse 0.47.0", + "gix-worktree 0.42.0", + "imara-diff", +@@ -4019,7 +3985,8 @@ dependencies = [ + [[package]] + name = "gix-dir" + version = "0.15.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dad34e4f373f94902df1ba1d2a1df3a1b29eacd15e316ac5972d842e31422dd7" + dependencies = [ + "bstr", + "gix-discover 0.41.0", +@@ -4027,10 +3994,10 @@ dependencies = [ + "gix-ignore 0.16.0", + "gix-index 0.41.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", ++ "gix-path", + "gix-pathspec", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", ++ "gix-utils", + "gix-worktree 0.42.0", + "thiserror 2.0.12", + ] +@@ -4045,7 +4012,7 @@ dependencies = [ + "dunce", + "gix-fs 0.15.0", + "gix-hash 0.18.0", +- "gix-path 0.10.19", ++ "gix-path", + "gix-ref 0.52.1", + "gix-sec 0.11.0", + "thiserror 2.0.12", +@@ -4054,13 +4021,14 @@ dependencies = [ + [[package]] + name = "gix-discover" + version = "0.41.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffb180c91ca1a2cf53e828bb63d8d8f8fa7526f49b83b33d7f46cbeb5d79d30a" + dependencies = [ + "bstr", + "dunce", + "gix-fs 0.16.0", + "gix-hash 0.19.0", +- "gix-path 0.10.20", ++ "gix-path", + "gix-ref 0.53.0", + "gix-sec 0.12.0", + "thiserror 2.0.12", +@@ -4072,9 +4040,9 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "56f4399af6ec4fd9db84dd4cf9656c5c785ab492ab40a7c27ea92b4241923fed" + dependencies = [ +- "gix-path 0.10.19", +- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-path", ++ "gix-trace", ++ "gix-utils", + "libc", + "prodash 29.0.2", + "walkdir", +@@ -4083,15 +4051,16 @@ dependencies = [ + [[package]] + name = "gix-features" + version = "0.43.1" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd1543cd9b8abcbcebaa1a666a5c168ee2cda4dea50d3961ee0e6d1c42f81e5b" + dependencies = [ + "bytes", + "crc32fast", + "crossbeam-channel", + "flate2", +- "gix-path 0.10.20", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-trace", ++ "gix-utils", + "libc", + "once_cell", + "parking_lot", +@@ -4103,7 +4072,8 @@ dependencies = [ + [[package]] + name = "gix-filter" + version = "0.20.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa6571a3927e7ab10f64279a088e0dae08e8da05547771796d7389bbe28ad9ff" + dependencies = [ + "bstr", + "encoding_rs", +@@ -4112,10 +4082,10 @@ dependencies = [ + "gix-hash 0.19.0", + "gix-object 0.50.1", + "gix-packetline-blocking", +- "gix-path 0.10.20", +- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-quote", ++ "gix-trace", ++ "gix-utils", + "smallvec", + "thiserror 2.0.12", + ] +@@ -4129,21 +4099,22 @@ dependencies = [ + "bstr", + "fastrand", + "gix-features 0.42.1", +- "gix-path 0.10.19", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-path", ++ "gix-utils", + "thiserror 2.0.12", + ] + + [[package]] + name = "gix-fs" + version = "0.16.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d793f71e955d18f228d20ec433dcce6d0e8577efcdfd11d72d09d7cc2758dfd1" + dependencies = [ + "bstr", + "fastrand", + "gix-features 0.43.1", +- "gix-path 0.10.20", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-utils", + "thiserror 2.0.12", + ] + +@@ -4156,18 +4127,19 @@ dependencies = [ + "bitflags 2.9.1", + "bstr", + "gix-features 0.42.1", +- "gix-path 0.10.19", ++ "gix-path", + ] + + [[package]] + name = "gix-glob" + version = "0.21.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b947db8366823e7a750c254f6bb29e27e17f27e457bf336ba79b32423db62cd5" + dependencies = [ + "bitflags 2.9.1", + "bstr", + "gix-features 0.43.1", +- "gix-path 0.10.20", ++ "gix-path", + "serde", + ] + +@@ -4186,7 +4158,8 @@ dependencies = [ + [[package]] + name = "gix-hash" + version = "0.19.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "251fad79796a731a2a7664d9ea95ee29a9e99474de2769e152238d4fdb69d50e" + dependencies = [ + "faster-hex", + "gix-features 0.43.1", +@@ -4209,7 +4182,8 @@ dependencies = [ + [[package]] + name = "gix-hashtable" + version = "0.9.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c35300b54896153e55d53f4180460931ccd69b7e8d2f6b9d6401122cdedc4f07" + dependencies = [ + "gix-hash 0.19.0", + "hashbrown 0.15.4", +@@ -4224,20 +4198,21 @@ checksum = "ae358c3c96660b10abc7da63c06788dfded603e717edbd19e38c6477911b71c8" + dependencies = [ + "bstr", + "gix-glob 0.20.1", +- "gix-path 0.10.19", +- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-path", ++ "gix-trace", + "unicode-bom", + ] + + [[package]] + name = "gix-ignore" + version = "0.16.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "564d6fddf46e2c981f571b23d6ad40cb08bddcaf6fc7458b1d49727ad23c2870" + dependencies = [ + "bstr", + "gix-glob 0.21.0", +- "gix-path 0.10.20", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-trace", + "serde", + "unicode-bom", + ] +@@ -4252,15 +4227,15 @@ dependencies = [ + "bstr", + "filetime", + "fnv", +- "gix-bitmap 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-bitmap", + "gix-features 0.42.1", + "gix-fs 0.15.0", + "gix-hash 0.18.0", + "gix-lock 17.1.0", + "gix-object 0.49.1", + "gix-traverse 0.46.2", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-utils", ++ "gix-validate", + "hashbrown 0.14.5", + "itoa", + "libc", +@@ -4273,21 +4248,22 @@ dependencies = [ + [[package]] + name = "gix-index" + version = "0.41.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2af39fde3ce4ce11371d9ce826f2936ec347318f2d1972fe98c2e7134e267e25" + dependencies = [ + "bitflags 2.9.1", + "bstr", + "filetime", + "fnv", +- "gix-bitmap 0.2.14 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-bitmap", + "gix-features 0.43.1", + "gix-fs 0.16.0", + "gix-hash 0.19.0", + "gix-lock 18.0.0", + "gix-object 0.50.1", + "gix-traverse 0.47.0", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-utils", ++ "gix-validate", + "hashbrown 0.15.4", + "itoa", + "libc", +@@ -4305,28 +4281,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "570f8b034659f256366dc90f1a24924902f20acccd6a15be96d44d1269e7a796" + dependencies = [ + "gix-tempfile 17.1.0", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-utils", + "thiserror 2.0.12", + ] + + [[package]] + name = "gix-lock" + version = "18.0.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9fa71da90365668a621e184eb5b979904471af1b3b09b943a84bc50e8ad42ed" + dependencies = [ + "gix-tempfile 18.0.0", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-utils", + "thiserror 2.0.12", + ] + + [[package]] + name = "gix-mailmap" + version = "0.27.2" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a8982e1874a2034d7dd481bcdd6a05579ba444bcda748511eb0f8e50eb10487" + dependencies = [ + "bstr", +- "gix-actor 0.35.3", +- "gix-date 0.10.4", ++ "gix-actor", ++ "gix-date", + "serde", + "thiserror 2.0.12", + ] +@@ -4334,7 +4312,8 @@ dependencies = [ + [[package]] + name = "gix-merge" + version = "0.6.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88c2580b4122a0c40de25f8f20a1817704b5f4e4798c78d29d4a89500af2da89" + dependencies = [ + "bstr", + "gix-command", +@@ -4344,12 +4323,12 @@ dependencies = [ + "gix-hash 0.19.0", + "gix-index 0.41.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", +- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-quote", + "gix-revision", + "gix-revwalk 0.21.0", + "gix-tempfile 18.0.0", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "gix-worktree 0.42.0", + "imara-diff", + "thiserror 2.0.12", +@@ -4358,11 +4337,12 @@ dependencies = [ + [[package]] + name = "gix-negotiate" + version = "0.21.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d58d4c9118885233be971e0d7a589f5cfb1a8bd6cb6e2ecfb0fc6b1b293c83b" + dependencies = [ + "bitflags 2.9.1", + "gix-commitgraph 0.29.0", +- "gix-date 0.10.4", ++ "gix-date", + "gix-hash 0.19.0", + "gix-object 0.50.1", + "gix-revwalk 0.21.0", +@@ -4377,14 +4357,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d957ca3640c555d48bb27f8278c67169fa1380ed94f6452c5590742524c40fbb" + dependencies = [ + "bstr", +- "gix-actor 0.35.2", +- "gix-date 0.10.3", ++ "gix-actor", ++ "gix-date", + "gix-features 0.42.1", + "gix-hash 0.18.0", + "gix-hashtable 0.8.1", +- "gix-path 0.10.19", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-path", ++ "gix-utils", ++ "gix-validate", + "itoa", + "smallvec", + "thiserror 2.0.12", +@@ -4394,17 +4374,18 @@ dependencies = [ + [[package]] + name = "gix-object" + version = "0.50.1" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aff2047f96d57bcc721426e11ec0f9efeb432d5e6ef5f1aa84cfc55198971dca" + dependencies = [ + "bstr", +- "gix-actor 0.35.3", +- "gix-date 0.10.4", ++ "gix-actor", ++ "gix-date", + "gix-features 0.43.1", + "gix-hash 0.19.0", + "gix-hashtable 0.9.0", +- "gix-path 0.10.20", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-utils", ++ "gix-validate", + "itoa", + "serde", + "smallvec", +@@ -4415,18 +4396,19 @@ dependencies = [ + [[package]] + name = "gix-odb" + version = "0.70.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9d7af10fda9df0bb4f7f9bd507963560b3c66cb15a5b825caf752e0eb109ac" + dependencies = [ + "arc-swap", +- "gix-date 0.10.4", ++ "gix-date", + "gix-features 0.43.1", + "gix-fs 0.16.0", + "gix-hash 0.19.0", + "gix-hashtable 0.9.0", + "gix-object 0.50.1", + "gix-pack", +- "gix-path 0.10.20", +- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-quote", + "parking_lot", + "serde", + "tempfile", +@@ -4436,15 +4418,16 @@ dependencies = [ + [[package]] + name = "gix-pack" + version = "0.60.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8571df89bfca5abb49c3e3372393f7af7e6f8b8dbe2b96303593cef5b263019" + dependencies = [ + "clru", +- "gix-chunk 0.4.11 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-chunk", + "gix-features 0.43.1", + "gix-hash 0.19.0", + "gix-hashtable 0.9.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", ++ "gix-path", + "gix-tempfile 18.0.0", + "memmap2", + "parking_lot", +@@ -4457,47 +4440,36 @@ dependencies = [ + [[package]] + name = "gix-packetline" + version = "0.19.1" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2592fbd36249a2fea11056f7055cc376301ef38d903d157de41998335bbf1f93" + dependencies = [ + "bstr", + "faster-hex", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "thiserror 2.0.12", + ] + + [[package]] + name = "gix-packetline-blocking" + version = "0.19.1" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" +-dependencies = [ +- "bstr", +- "faster-hex", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "thiserror 2.0.12", +-] +- +-[[package]] +-name = "gix-path" +-version = "0.10.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c6279d323d925ad4790602105ae27df4b915e7a7d81e4cdba2603121c03ad111" ++checksum = "fc4e706f328cd494cc8f932172e123a72b9a4711b0db5e411681432a89bd4c94" + dependencies = [ + "bstr", +- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "home", +- "once_cell", ++ "faster-hex", ++ "gix-trace", + "thiserror 2.0.12", + ] + + [[package]] + name = "gix-path" + version = "0.10.20" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06d37034a4c67bbdda76f7bcd037b2f7bc0fba0c09a6662b19697a5716e7b2fd" + dependencies = [ + "bstr", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", ++ "gix-validate", + "home", + "once_cell", + "thiserror 2.0.12", +@@ -4506,21 +4478,23 @@ dependencies = [ + [[package]] + name = "gix-pathspec" + version = "0.12.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "daedead611c9bd1f3640dc90a9012b45f790201788af4d659f28d94071da7fba" + dependencies = [ + "bitflags 2.9.1", + "bstr", + "gix-attributes 0.27.0", + "gix-config-value", + "gix-glob 0.21.0", +- "gix-path 0.10.20", ++ "gix-path", + "thiserror 2.0.12", + ] + + [[package]] + name = "gix-prompt" + version = "0.11.1" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ffa1a7a34c81710aaa666a428c142b6c5d640492fcd41267db0740d923c7906" + dependencies = [ + "gix-command", + "gix-config-value", +@@ -4532,11 +4506,12 @@ dependencies = [ + [[package]] + name = "gix-protocol" + version = "0.51.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12b4b807c47ffcf7c1e5b8119585368a56449f3493da93b931e1d4239364e922" + dependencies = [ + "bstr", + "gix-credentials", +- "gix-date 0.10.4", ++ "gix-date", + "gix-features 0.43.1", + "gix-hash 0.19.0", + "gix-lock 18.0.0", +@@ -4546,9 +4521,9 @@ dependencies = [ + "gix-refspec", + "gix-revwalk 0.21.0", + "gix-shallow", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "gix-transport", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-utils", + "maybe-async", + "serde", + "thiserror 2.0.12", +@@ -4562,17 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4a375a75b4d663e8bafe3bf4940a18a23755644c13582fa326e99f8f987d83fd" + dependencies = [ + "bstr", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "thiserror 2.0.12", +-] +- +-[[package]] +-name = "gix-quote" +-version = "0.6.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" +-dependencies = [ +- "bstr", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-utils", + "thiserror 2.0.12", + ] + +@@ -4582,16 +4547,16 @@ version = "0.52.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d1b7985657029684d759f656b09abc3e2c73085596d5cdb494428823970a7762" + dependencies = [ +- "gix-actor 0.35.2", ++ "gix-actor", + "gix-features 0.42.1", + "gix-fs 0.15.0", + "gix-hash 0.18.0", + "gix-lock 17.1.0", + "gix-object 0.49.1", +- "gix-path 0.10.19", ++ "gix-path", + "gix-tempfile 17.1.0", +- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-utils", ++ "gix-validate", + "memmap2", + "thiserror 2.0.12", + "winnow 0.7.12", +@@ -4600,18 +4565,19 @@ dependencies = [ + [[package]] + name = "gix-ref" + version = "0.53.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b7a23209d4e4cbdc2086d294f5f3f8707ac6286768847024d952d8cd3278c5b" + dependencies = [ +- "gix-actor 0.35.3", ++ "gix-actor", + "gix-features 0.43.1", + "gix-fs 0.16.0", + "gix-hash 0.19.0", + "gix-lock 18.0.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", ++ "gix-path", + "gix-tempfile 18.0.0", +- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-utils", ++ "gix-validate", + "memmap2", + "serde", + "thiserror 2.0.12", +@@ -4621,12 +4587,13 @@ dependencies = [ + [[package]] + name = "gix-refspec" + version = "0.31.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d29cae1ae31108826e7156a5e60bffacab405f4413f5bc0375e19772cce0055" + dependencies = [ + "bstr", + "gix-hash 0.19.0", + "gix-revision", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-validate", + "smallvec", + "thiserror 2.0.12", + ] +@@ -4634,17 +4601,18 @@ dependencies = [ + [[package]] + name = "gix-revision" + version = "0.35.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f651f2b1742f760bb8161d6743229206e962b73d9c33c41f4e4aefa6586cbd3d" + dependencies = [ + "bitflags 2.9.1", + "bstr", + "gix-commitgraph 0.29.0", +- "gix-date 0.10.4", ++ "gix-date", + "gix-hash 0.19.0", + "gix-hashtable 0.9.0", + "gix-object 0.50.1", + "gix-revwalk 0.21.0", +- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-trace", + "serde", + "thiserror 2.0.12", + ] +@@ -4656,7 +4624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1bc756b73225bf005ddeb871d1ca7b3c33e2417d0d53e56effa5a36765b52b28" + dependencies = [ + "gix-commitgraph 0.28.0", +- "gix-date 0.10.3", ++ "gix-date", + "gix-hash 0.18.0", + "gix-hashtable 0.8.1", + "gix-object 0.49.1", +@@ -4667,10 +4635,11 @@ dependencies = [ + [[package]] + name = "gix-revwalk" + version = "0.21.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06e74f91709729e099af6721bd0fa7d62f243f2005085152301ca5cdd86ec02c" + dependencies = [ + "gix-commitgraph 0.29.0", +- "gix-date 0.10.4", ++ "gix-date", + "gix-hash 0.19.0", + "gix-hashtable 0.9.0", + "gix-object 0.50.1", +@@ -4685,7 +4654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d0dabbc78c759ecc006b970339394951b2c8e1e38a37b072c105b80b84c308fd" + dependencies = [ + "bitflags 2.9.1", +- "gix-path 0.10.19", ++ "gix-path", + "libc", + "windows-sys 0.59.0", + ] +@@ -4693,19 +4662,21 @@ dependencies = [ + [[package]] + name = "gix-sec" + version = "0.12.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09f7053ed7c66633b56c57bc6ed3377be3166eaf3dc2df9f1c5ec446df6fdf2c" + dependencies = [ + "bitflags 2.9.1", +- "gix-path 0.10.20", ++ "gix-path", + "libc", + "serde", +- "windows-sys 0.60.2", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "gix-shallow" + version = "0.5.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d936745103243ae4c510f19e0760ce73fb0f08096588fdbe0f0d7fb7ce8944b7" + dependencies = [ + "bstr", + "gix-hash 0.19.0", +@@ -4717,7 +4688,8 @@ dependencies = [ + [[package]] + name = "gix-status" + version = "0.20.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a4afff9b34eeececa8bdc32b42fb318434b6b1391d9f8d45fe455af08dc2d35" + dependencies = [ + "bstr", + "filetime", +@@ -4729,7 +4701,7 @@ dependencies = [ + "gix-hash 0.19.0", + "gix-index 0.41.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", ++ "gix-path", + "gix-pathspec", + "gix-worktree 0.42.0", + "portable-atomic", +@@ -4739,11 +4711,12 @@ dependencies = [ + [[package]] + name = "gix-submodule" + version = "0.20.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "657cc5dd43cbc7a14d9c5aaf02cfbe9c2a15d077cded3f304adb30ef78852d3e" + dependencies = [ + "bstr", + "gix-config", +- "gix-path 0.10.20", ++ "gix-path", + "gix-pathspec", + "gix-refspec", + "gix-url", +@@ -4768,7 +4741,8 @@ dependencies = [ + [[package]] + name = "gix-tempfile" + version = "18.0.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "666c0041bcdedf5fa05e9bef663c897debab24b7dc1741605742412d1d47da57" + dependencies = [ + "dashmap", + "gix-fs 0.16.0", +@@ -4807,11 +4781,6 @@ name = "gix-trace" + version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e2ccaf54b0b1743a695b482ca0ab9d7603744d8d10b2e5d1a332fef337bee658" +- +-[[package]] +-name = "gix-trace" +-version = "0.1.13" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" + dependencies = [ + "tracing-core", + ] +@@ -4819,7 +4788,8 @@ dependencies = [ + [[package]] + name = "gix-transport" + version = "0.48.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12f7cc0179fc89d53c54e1f9ce51229494864ab4bf136132d69db1b011741ca3" + dependencies = [ + "base64 0.22.1", + "bstr", +@@ -4828,7 +4798,7 @@ dependencies = [ + "gix-credentials", + "gix-features 0.43.1", + "gix-packetline", +- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-quote", + "gix-sec 0.12.0", + "gix-url", + "serde", +@@ -4843,7 +4813,7 @@ checksum = "b8648172f85aca3d6e919c06504b7ac26baef54e04c55eb0100fa588c102cc33" + dependencies = [ + "bitflags 2.9.1", + "gix-commitgraph 0.28.0", +- "gix-date 0.10.3", ++ "gix-date", + "gix-hash 0.18.0", + "gix-hashtable 0.8.1", + "gix-object 0.49.1", +@@ -4855,11 +4825,12 @@ dependencies = [ + [[package]] + name = "gix-traverse" + version = "0.47.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7cdc82509d792ba0ad815f86f6b469c7afe10f94362e96c4494525a6601bdd5" + dependencies = [ + "bitflags 2.9.1", + "gix-commitgraph 0.29.0", +- "gix-date 0.10.4", ++ "gix-date", + "gix-hash 0.19.0", + "gix-hashtable 0.9.0", + "gix-object 0.50.1", +@@ -4871,11 +4842,12 @@ dependencies = [ + [[package]] + name = "gix-url" + version = "0.32.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b76a9d266254ad287ffd44467cd88e7868799b08f4d52e02d942b93e514d16f" + dependencies = [ + "bstr", + "gix-features 0.43.1", +- "gix-path 0.10.20", ++ "gix-path", + "percent-encoding", + "serde", + "thiserror 2.0.12", +@@ -4887,15 +4859,6 @@ name = "gix-utils" + version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5351af2b172caf41a3728eb4455326d84e0d70fe26fc4de74ab0bd37df4191c5" +-dependencies = [ +- "fastrand", +- "unicode-normalization", +-] +- +-[[package]] +-name = "gix-utils" +-version = "0.3.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" + dependencies = [ + "bstr", + "fastrand", +@@ -4912,15 +4875,6 @@ dependencies = [ + "thiserror 2.0.12", + ] + +-[[package]] +-name = "gix-validate" +-version = "0.10.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" +-dependencies = [ +- "bstr", +- "thiserror 2.0.12", +-] +- + [[package]] + name = "gix-worktree" + version = "0.41.0" +@@ -4936,14 +4890,15 @@ dependencies = [ + "gix-ignore 0.15.0", + "gix-index 0.40.1", + "gix-object 0.49.1", +- "gix-path 0.10.19", +- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gix-path", ++ "gix-validate", + ] + + [[package]] + name = "gix-worktree" + version = "0.42.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "55f625ac9126c19bef06dbc6d2703cdd7987e21e35b497bb265ac37d383877b1" + dependencies = [ + "bstr", + "gix-attributes 0.27.0", +@@ -4954,15 +4909,16 @@ dependencies = [ + "gix-ignore 0.16.0", + "gix-index 0.41.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", +- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)", ++ "gix-path", ++ "gix-validate", + "serde", + ] + + [[package]] + name = "gix-worktree-state" + version = "0.20.0" +-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ba9b17cbacc02b25801197b20100f7f9bd621db1e7fce9d3c8ab3175207bf8" + dependencies = [ + "bstr", + "gix-features 0.43.1", +@@ -4972,7 +4928,7 @@ dependencies = [ + "gix-hash 0.19.0", + "gix-index 0.41.0", + "gix-object 0.50.1", +- "gix-path 0.10.20", ++ "gix-path", + "gix-worktree 0.42.0", + "io-close", + "thiserror 2.0.12", +@@ -5012,7 +4968,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -5091,14 +5047,14 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] + name = "h2" +-version = "0.3.26" ++version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" ++checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" + dependencies = [ + "bytes", + "fnv", +@@ -5106,7 +5062,7 @@ dependencies = [ + "futures-sink", + "futures-util", + "http 0.2.12", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "slab", + "tokio", + "tokio-util", +@@ -5115,9 +5071,9 @@ dependencies = [ + + [[package]] + name = "h2" +-version = "0.4.10" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" ++checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" + dependencies = [ + "atomic-waker", + "bytes", +@@ -5125,7 +5081,7 @@ dependencies = [ + "futures-core", + "futures-sink", + "http 1.3.1", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "slab", + "tokio", + "tokio-util", +@@ -5208,9 +5164,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + + [[package]] + name = "hermit-abi" +-version = "0.4.0" ++version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" ++checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + + [[package]] + name = "hex" +@@ -5341,14 +5297,14 @@ dependencies = [ + "futures-channel", + "futures-core", + "futures-util", +- "h2 0.3.26", ++ "h2 0.3.27", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", +- "socket2 0.5.9", ++ "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", +@@ -5364,7 +5320,7 @@ dependencies = [ + "bytes", + "futures-channel", + "futures-util", +- "h2 0.4.10", ++ "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", + "httparse", +@@ -5392,21 +5348,20 @@ dependencies = [ + + [[package]] + name = "hyper-rustls" +-version = "0.27.5" ++version = "0.27.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" ++checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" + dependencies = [ +- "futures-util", + "http 1.3.1", + "hyper 1.6.0", + "hyper-util", +- "rustls 0.23.27", ++ "rustls 0.23.31", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.2", + "tower-service", +- "webpki-roots 0.26.11", ++ "webpki-roots 1.0.2", + ] + + [[package]] +@@ -5440,9 +5395,9 @@ dependencies = [ + + [[package]] + name = "hyper-util" +-version = "0.1.13" ++version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" ++checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" + dependencies = [ + "base64 0.22.1", + "bytes", +@@ -5456,7 +5411,7 @@ dependencies = [ + "libc", + "percent-encoding", + "pin-project-lite", +- "socket2 0.5.9", ++ "socket2 0.6.0", + "system-configuration 0.6.1", + "tokio", + "tower-service", +@@ -5547,9 +5502,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + + [[package]] + name = "icu_properties" +-version = "2.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" ++checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" + dependencies = [ + "displaydoc", + "icu_collections", +@@ -5563,9 +5518,9 @@ dependencies = [ + + [[package]] + name = "icu_properties_data" +-version = "2.0.0" ++version = "2.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" ++checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + + [[package]] + name = "icu_provider" +@@ -5646,9 +5601,9 @@ dependencies = [ + + [[package]] + name = "indexmap" +-version = "2.9.0" ++version = "2.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" ++checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" + dependencies = [ + "equivalent", + "hashbrown 0.15.4", +@@ -5843,7 +5798,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -5895,9 +5850,9 @@ dependencies = [ + + [[package]] + name = "jpeg-decoder" +-version = "0.3.1" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" ++checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07" + + [[package]] + name = "js-sys" +@@ -5954,7 +5909,7 @@ dependencies = [ + "log", + "secret-service", + "security-framework 2.11.1", +- "security-framework 3.2.0", ++ "security-framework 3.3.0", + "windows-sys 0.60.2", + "zeroize", + ] +@@ -5997,7 +5952,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" + dependencies = [ + "cssparser", + "html5ever", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "selectors", + ] + +@@ -6027,7 +5982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" + dependencies = [ + "gtk-sys", +- "libloading", ++ "libloading 0.7.4", + "once_cell", + ] + +@@ -6048,9 +6003,9 @@ dependencies = [ + + [[package]] + name = "libgit2-sys" +-version = "0.18.1+1.9.0" ++version = "0.18.2+1.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e" ++checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222" + dependencies = [ + "cc", + "libc", +@@ -6070,11 +6025,21 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "libloading" ++version = "0.8.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" ++dependencies = [ ++ "cfg-if", ++ "windows-targets 0.53.3", ++] ++ + [[package]] + name = "libredox" +-version = "0.1.3" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" ++checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" + dependencies = [ + "bitflags 2.9.1", + "libc", +@@ -6108,9 +6073,9 @@ dependencies = [ + + [[package]] + name = "libz-rs-sys" +-version = "0.5.0" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a" ++checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221" + dependencies = [ + "zlib-rs", + ] +@@ -6157,9 +6122,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + + [[package]] + name = "litrs" +-version = "0.4.1" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" ++checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" + + [[package]] + name = "lock_api" +@@ -6244,7 +6209,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -6282,7 +6247,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -6293,9 +6258,9 @@ checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" + + [[package]] + name = "memchr" +-version = "2.7.4" ++version = "2.7.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" ++checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + + [[package]] + name = "memmap2" +@@ -6317,12 +6282,12 @@ dependencies = [ + + [[package]] + name = "migrations_internals" +-version = "2.2.0" ++version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" ++checksum = "3bda1634d70d5bd53553cf15dca9842a396e8c799982a3ad22998dc44d961f24" + dependencies = [ + "serde", +- "toml", ++ "toml 0.9.5", + ] + + [[package]] +@@ -6360,15 +6325,15 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "minisign-verify" +-version = "0.2.3" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3" ++checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43" + + [[package]] + name = "miniz_oxide" +-version = "0.8.8" ++version = "0.8.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" ++checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" + dependencies = [ + "adler2", + "simd-adler32", +@@ -6376,14 +6341,14 @@ dependencies = [ + + [[package]] + name = "mio" +-version = "1.0.3" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" ++checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" + dependencies = [ + "libc", + "log", +- "wasi 0.11.0+wasi-snapshot-preview1", +- "windows-sys 0.52.0", ++ "wasi 0.11.1+wasi-snapshot-preview1", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -6394,23 +6359,23 @@ checksum = "4e1d4c44418358edcac6e1d9ce59cea7fb38052429c7704033f1196f0c179e6a" + + [[package]] + name = "muda" +-version = "0.17.0" ++version = "0.17.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58b89bf91c19bf036347f1ab85a81c560f08c0667c8601bece664d860a600988" ++checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" + dependencies = [ + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.1", + "once_cell", + "png", + "serde", + "thiserror 2.0.12", +- "windows-sys 0.59.0", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -6661,23 +6626,24 @@ dependencies = [ + + [[package]] + name = "num_enum" +-version = "0.7.3" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" ++checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" + dependencies = [ + "num_enum_derive", ++ "rustversion", + ] + + [[package]] + name = "num_enum_derive" +-version = "0.7.3" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" ++checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" + dependencies = [ + "proc-macro-crate 3.3.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -6724,22 +6690,6 @@ dependencies = [ + "objc2-exception-helper", + ] + +-[[package]] +-name = "objc2-app-kit" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +-dependencies = [ +- "bitflags 2.9.1", +- "block2 0.5.1", +- "libc", +- "objc2 0.5.2", +- "objc2-core-data 0.2.2", +- "objc2-core-image 0.2.2", +- "objc2-foundation 0.2.2", +- "objc2-quartz-core 0.2.2", +-] +- + [[package]] + name = "objc2-app-kit" + version = "0.3.1" +@@ -6751,10 +6701,10 @@ dependencies = [ + "libc", + "objc2 0.6.1", + "objc2-cloud-kit", +- "objc2-core-data 0.3.1", ++ "objc2-core-data", + "objc2-core-foundation", + "objc2-core-graphics", +- "objc2-core-image 0.3.1", ++ "objc2-core-image", + "objc2-foundation 0.3.1", + "objc2-quartz-core 0.3.1", + ] +@@ -6770,18 +6720,6 @@ dependencies = [ + "objc2-foundation 0.3.1", + ] + +-[[package]] +-name = "objc2-core-data" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +-dependencies = [ +- "bitflags 2.9.1", +- "block2 0.5.1", +- "objc2 0.5.2", +- "objc2-foundation 0.2.2", +-] +- + [[package]] + name = "objc2-core-data" + version = "0.3.1" +@@ -6817,18 +6755,6 @@ dependencies = [ + "objc2-io-surface", + ] + +-[[package]] +-name = "objc2-core-image" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +-dependencies = [ +- "block2 0.5.1", +- "objc2 0.5.2", +- "objc2-foundation 0.2.2", +- "objc2-metal", +-] +- + [[package]] + name = "objc2-core-image" + version = "0.3.1" +@@ -6862,7 +6788,6 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" + dependencies = [ + "bitflags 2.9.1", + "block2 0.5.1", +- "dispatch", + "libc", + "objc2 0.5.2", + ] +@@ -6921,7 +6846,7 @@ checksum = "26bb88504b5a050dbba515d2414607bf5e57dd56b107bc5f0351197a3e7bdc5d" + dependencies = [ + "bitflags 2.9.1", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-foundation 0.3.1", + ] + +@@ -6970,7 +6895,7 @@ dependencies = [ + "bitflags 2.9.1", + "block2 0.6.1", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.1", + ] +@@ -6990,6 +6915,12 @@ version = "1.21.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + ++[[package]] ++name = "once_cell_polyfill" ++version = "1.70.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" ++ + [[package]] + name = "open" + version = "5.3.2" +@@ -7004,9 +6935,9 @@ dependencies = [ + + [[package]] + name = "openssl" +-version = "0.10.72" ++version = "0.10.73" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" ++checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" + dependencies = [ + "bitflags 2.9.1", + "cfg-if", +@@ -7025,7 +6956,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -7036,18 +6967,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + + [[package]] + name = "openssl-src" +-version = "300.5.0+3.5.0" ++version = "300.5.1+3.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" ++checksum = "735230c832b28c000e3bc117119e6466a663ec73506bc0a9907ea4187508e42a" + dependencies = [ + "cc", + ] + + [[package]] + name = "openssl-sys" +-version = "0.9.108" ++version = "0.9.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" ++checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" + dependencies = [ + "cc", + "libc", +@@ -7074,20 +7005,21 @@ dependencies = [ + + [[package]] + name = "os_info" +-version = "3.11.0" ++version = "3.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9" ++checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3" + dependencies = [ + "log", ++ "plist", + "serde", + "windows-sys 0.52.0", + ] + + [[package]] + name = "os_pipe" +-version = "1.2.1" ++version = "1.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" ++checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224" + dependencies = [ + "libc", + "windows-sys 0.59.0", +@@ -7202,7 +7134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" + dependencies = [ + "fixedbitset 0.4.2", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + ] + + [[package]] +@@ -7213,7 +7145,7 @@ checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca" + dependencies = [ + "fixedbitset 0.5.7", + "hashbrown 0.15.4", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "serde", + ] + +@@ -7321,7 +7253,7 @@ dependencies = [ + "phf_shared 0.11.3", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -7368,7 +7300,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -7402,13 +7334,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + + [[package]] + name = "plist" +-version = "1.7.1" ++version = "1.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d" ++checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1" + dependencies = [ + "base64 0.22.1", +- "indexmap 2.9.0", +- "quick-xml 0.32.0", ++ "indexmap 2.10.0", ++ "quick-xml 0.38.1", + "serde", + "time", + ] +@@ -7428,24 +7360,23 @@ dependencies = [ + + [[package]] + name = "polling" +-version = "3.7.4" ++version = "3.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" ++checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829" + dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", +- "rustix 0.38.44", +- "tracing", +- "windows-sys 0.59.0", ++ "rustix 1.0.8", ++ "windows-sys 0.60.2", + ] + + [[package]] + name = "portable-atomic" +-version = "1.11.0" ++version = "1.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" ++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + + [[package]] + name = "portable-atomic-util" +@@ -7563,7 +7494,7 @@ version = "3.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" + dependencies = [ +- "toml_edit 0.22.26", ++ "toml_edit 0.22.27", + ] + + [[package]] +@@ -7644,7 +7575,7 @@ dependencies = [ + "itertools", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -7694,18 +7625,18 @@ dependencies = [ + + [[package]] + name = "quick-xml" +-version = "0.32.0" ++version = "0.37.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" ++checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" + dependencies = [ + "memchr", + ] + + [[package]] + name = "quick-xml" +-version = "0.37.5" ++version = "0.38.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" ++checksum = "9845d9dccf565065824e69f9f235fafba1587031eda353c1f1561cd6a6be78f4" + dependencies = [ + "memchr", + ] +@@ -7722,8 +7653,8 @@ dependencies = [ + "quinn-proto", + "quinn-udp", + "rustc-hash", +- "rustls 0.23.27", +- "socket2 0.5.9", ++ "rustls 0.23.31", ++ "socket2 0.5.10", + "thiserror 2.0.12", + "tokio", + "tracing", +@@ -7742,7 +7673,7 @@ dependencies = [ + "rand 0.9.2", + "ring", + "rustc-hash", +- "rustls 0.23.27", ++ "rustls 0.23.31", + "rustls-pki-types", + "slab", + "thiserror 2.0.12", +@@ -7753,14 +7684,14 @@ dependencies = [ + + [[package]] + name = "quinn-udp" +-version = "0.5.12" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" ++checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" + dependencies = [ + "cfg_aliases", + "libc", + "once_cell", +- "socket2 0.5.9", ++ "socket2 0.5.10", + "tracing", + "windows-sys 0.59.0", + ] +@@ -7776,9 +7707,9 @@ dependencies = [ + + [[package]] + name = "r-efi" +-version = "5.2.0" ++version = "5.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + + [[package]] + name = "radium" +@@ -7904,9 +7835,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + + [[package]] + name = "redox_syscall" +-version = "0.5.12" ++version = "0.5.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" ++checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" + dependencies = [ + "bitflags 2.9.1", + ] +@@ -7924,9 +7855,9 @@ dependencies = [ + + [[package]] + name = "redox_users" +-version = "0.5.0" ++version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" ++checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" + dependencies = [ + "getrandom 0.2.16", + "libredox", +@@ -7950,7 +7881,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8023,7 +7954,7 @@ dependencies = [ + "encoding_rs", + "futures-core", + "futures-util", +- "h2 0.3.26", ++ "h2 0.3.27", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", +@@ -8066,12 +7997,12 @@ dependencies = [ + "encoding_rs", + "futures-core", + "futures-util", +- "h2 0.4.10", ++ "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", +- "hyper-rustls 0.27.5", ++ "hyper-rustls 0.27.7", + "hyper-tls", + "hyper-util", + "js-sys", +@@ -8082,7 +8013,7 @@ dependencies = [ + "percent-encoding", + "pin-project-lite", + "quinn", +- "rustls 0.23.27", ++ "rustls 0.23.31", + "rustls-native-certs", + "rustls-pki-types", + "serde", +@@ -8101,7 +8032,7 @@ dependencies = [ + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", +- "webpki-roots 1.0.0", ++ "webpki-roots 1.0.2", + ] + + [[package]] +@@ -8131,25 +8062,27 @@ dependencies = [ + + [[package]] + name = "rfd" +-version = "0.15.0" ++version = "0.15.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e" ++checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed" + dependencies = [ + "ashpd", +- "block2 0.5.1", ++ "block2 0.6.1", ++ "dispatch2", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "log", +- "objc2 0.5.2", +- "objc2-app-kit 0.2.2", +- "objc2-foundation 0.2.2", ++ "objc2 0.6.1", ++ "objc2-app-kit", ++ "objc2-core-foundation", ++ "objc2-foundation 0.3.1", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +- "windows-sys 0.48.0", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -8224,7 +8157,7 @@ checksum = "a6e2b2fd7497540489fa2db285edd43b7ed14c49157157438664278da6e42a7a" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8253,15 +8186,15 @@ dependencies = [ + "regex", + "relative-path", + "rustc_version", +- "syn 2.0.101", ++ "syn 2.0.104", + "unicode-ident", + ] + + [[package]] + name = "rust_decimal" +-version = "1.37.1" ++version = "1.37.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50" ++checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d" + dependencies = [ + "arrayvec", + "borsh", +@@ -8275,9 +8208,9 @@ dependencies = [ + + [[package]] + name = "rustc-demangle" +-version = "0.1.24" ++version = "0.1.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" ++checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" + + [[package]] + name = "rustc-hash" +@@ -8334,14 +8267,14 @@ dependencies = [ + + [[package]] + name = "rustls" +-version = "0.23.27" ++version = "0.23.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" ++checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" + dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", +- "rustls-webpki 0.103.3", ++ "rustls-webpki 0.103.4", + "subtle", + "zeroize", + ] +@@ -8355,7 +8288,7 @@ dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", +- "security-framework 3.2.0", ++ "security-framework 3.3.0", + ] + + [[package]] +@@ -8389,9 +8322,9 @@ dependencies = [ + + [[package]] + name = "rustls-webpki" +-version = "0.103.3" ++version = "0.103.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" ++checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" + dependencies = [ + "ring", + "rustls-pki-types", +@@ -8400,9 +8333,9 @@ dependencies = [ + + [[package]] + name = "rustversion" +-version = "1.0.20" ++version = "1.0.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + + [[package]] + name = "ryu" +@@ -8465,6 +8398,18 @@ dependencies = [ + "serde_json", + ] + ++[[package]] ++name = "schemars" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" ++dependencies = [ ++ "dyn-clone", ++ "ref-cast", ++ "serde", ++ "serde_json", ++] ++ + [[package]] + name = "schemars_derive" + version = "0.8.22" +@@ -8474,7 +8419,7 @@ dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8486,7 +8431,7 @@ dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8513,9 +8458,9 @@ dependencies = [ + + [[package]] + name = "sdd" +-version = "3.0.8" ++version = "3.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21" ++checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" + + [[package]] + name = "seahash" +@@ -8567,12 +8512,12 @@ dependencies = [ + + [[package]] + name = "security-framework" +-version = "3.2.0" ++version = "3.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" ++checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c" + dependencies = [ + "bitflags 2.9.1", +- "core-foundation 0.10.0", ++ "core-foundation 0.10.1", + "core-foundation-sys", + "libc", + "security-framework-sys", +@@ -8652,7 +8597,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8663,7 +8608,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8718,14 +8663,23 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", ++] ++ ++[[package]] ++name = "serde_spanned" ++version = "0.6.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" ++dependencies = [ ++ "serde", + ] + + [[package]] + name = "serde_spanned" +-version = "0.6.8" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" ++checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" + dependencies = [ + "serde", + ] +@@ -8744,15 +8698,17 @@ dependencies = [ + + [[package]] + name = "serde_with" +-version = "3.12.0" ++version = "3.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" ++checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" + dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", ++ "schemars 0.9.0", ++ "schemars 1.0.4", + "serde", + "serde_derive", + "serde_json", +@@ -8762,14 +8718,14 @@ dependencies = [ + + [[package]] + name = "serde_with_macros" +-version = "3.12.0" ++version = "3.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" ++checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" + dependencies = [ + "darling", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8794,7 +8750,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -8872,12 +8828,13 @@ dependencies = [ + + [[package]] + name = "shared_child" +-version = "1.0.2" ++version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc" ++checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7" + dependencies = [ + "libc", +- "windows-sys 0.59.0", ++ "sigchld", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -8901,6 +8858,17 @@ version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + ++[[package]] ++name = "sigchld" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1" ++dependencies = [ ++ "libc", ++ "os_pipe", ++ "signal-hook", ++] ++ + [[package]] + name = "signal-hook" + version = "0.3.18" +@@ -8913,9 +8881,9 @@ dependencies = [ + + [[package]] + name = "signal-hook-registry" +-version = "1.4.5" ++version = "1.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" ++checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" + dependencies = [ + "libc", + ] +@@ -8952,12 +8920,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + + [[package]] + name = "slab" +-version = "0.4.9" ++version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +-dependencies = [ +- "autocfg", +-] ++checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" + + [[package]] + name = "smallvec" +@@ -8970,9 +8935,9 @@ dependencies = [ + + [[package]] + name = "socket2" +-version = "0.5.9" ++version = "0.5.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" ++checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" + dependencies = [ + "libc", + "windows-sys 0.52.0", +@@ -9099,15 +9064,14 @@ dependencies = [ + + [[package]] + name = "strum_macros" +-version = "0.27.1" ++version = "0.27.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" ++checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" + dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", +- "rustversion", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -9140,9 +9104,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.101" ++version = "2.0.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" ++checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" + dependencies = [ + "proc-macro2", + "quote", +@@ -9172,7 +9136,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -9186,9 +9150,9 @@ dependencies = [ + + [[package]] + name = "sysinfo" +-version = "0.36.0" ++version = "0.36.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aab138f5c1bb35231de19049060a87977ad23e04f2303e953bc5c2947ac7dec4" ++checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d" + dependencies = [ + "libc", + "memchr", +@@ -9249,7 +9213,7 @@ dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", +- "toml", ++ "toml 0.8.23", + "version-compare", + ] + +@@ -9260,7 +9224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a" + dependencies = [ + "bitflags 2.9.1", +- "core-foundation 0.10.0", ++ "core-foundation 0.10.1", + "core-graphics", + "crossbeam-channel", + "dispatch", +@@ -9277,7 +9241,7 @@ dependencies = [ + "ndk-context", + "ndk-sys", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-foundation 0.3.1", + "once_cell", + "parking_lot", +@@ -9300,7 +9264,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -9348,7 +9312,7 @@ dependencies = [ + "mime", + "muda", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-foundation 0.3.1", + "objc2-ui-kit", + "percent-encoding", +@@ -9394,7 +9358,7 @@ dependencies = [ + "serde_json", + "tauri-utils", + "tauri-winres", +- "toml", ++ "toml 0.8.23", + "walkdir", + ] + +@@ -9416,7 +9380,7 @@ dependencies = [ + "serde", + "serde_json", + "sha2", +- "syn 2.0.101", ++ "syn 2.0.104", + "tauri-utils", + "thiserror 2.0.12", + "time", +@@ -9434,16 +9398,16 @@ dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "tauri-codegen", + "tauri-utils", + ] + + [[package]] + name = "tauri-plugin" +-version = "2.3.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3" ++checksum = "5bd5c1e56990c70a906ef67a9851bbdba9136d26075ee9a2b19c8b46986b3e02" + dependencies = [ + "anyhow", + "glob", +@@ -9452,7 +9416,7 @@ dependencies = [ + "serde", + "serde_json", + "tauri-utils", +- "toml", ++ "toml 0.8.23", + "walkdir", + ] + +@@ -9473,9 +9437,9 @@ dependencies = [ + + [[package]] + name = "tauri-plugin-dialog" +-version = "2.3.0" ++version = "2.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1aefb14219b492afb30b12647b5b1247cadd2c0603467310c36e0f7ae1698c28" ++checksum = "37e5858cc7b455a73ab4ea2ebc08b5be33682c00ff1bf4cad5537d4fb62499d9" + dependencies = [ + "log", + "raw-window-handle", +@@ -9507,7 +9471,7 @@ dependencies = [ + "tauri-plugin", + "tauri-utils", + "thiserror 2.0.12", +- "toml", ++ "toml 0.8.23", + "url", + ] + +@@ -9677,7 +9641,7 @@ dependencies = [ + "tokio", + "url", + "windows-sys 0.60.2", +- "zip 4.2.0", ++ "zip 4.3.0", + ] + + [[package]] +@@ -9728,7 +9692,7 @@ dependencies = [ + "jni", + "log", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-foundation 0.3.1", + "once_cell", + "percent-encoding", +@@ -9775,7 +9739,7 @@ dependencies = [ + "serde_with", + "swift-rs", + "thiserror 2.0.12", +- "toml", ++ "toml 0.8.23", + "url", + "urlpattern", + "uuid", +@@ -9784,13 +9748,13 @@ dependencies = [ + + [[package]] + name = "tauri-winres" +-version = "0.3.1" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4" ++checksum = "7c6d9028d41d4de835e3c482c677a8cb88137ac435d6ff9a71f392d4421576c9" + dependencies = [ + "embed-resource", +- "indexmap 2.9.0", +- "toml", ++ "indexmap 2.10.0", ++ "toml 0.9.5", + ] + + [[package]] +@@ -9849,7 +9813,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -9860,17 +9824,16 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] + name = "thread_local" +-version = "1.1.8" ++version = "1.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" ++checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" + dependencies = [ + "cfg-if", +- "once_cell", + ] + + [[package]] +@@ -9971,7 +9934,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -10000,7 +9963,7 @@ version = "0.26.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" + dependencies = [ +- "rustls 0.23.27", ++ "rustls 0.23.31", + "tokio", + ] + +@@ -10042,21 +10005,45 @@ dependencies = [ + + [[package]] + name = "toml" +-version = "0.8.22" ++version = "0.8.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" ++checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" + dependencies = [ + "serde", +- "serde_spanned", +- "toml_datetime", +- "toml_edit 0.22.26", ++ "serde_spanned 0.6.9", ++ "toml_datetime 0.6.11", ++ "toml_edit 0.22.27", ++] ++ ++[[package]] ++name = "toml" ++version = "0.9.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" ++dependencies = [ ++ "indexmap 2.10.0", ++ "serde", ++ "serde_spanned 1.0.0", ++ "toml_datetime 0.7.0", ++ "toml_parser", ++ "toml_writer", ++ "winnow 0.7.12", + ] + + [[package]] + name = "toml_datetime" +-version = "0.6.9" ++version = "0.6.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "toml_datetime" ++version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" ++checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" + dependencies = [ + "serde", + ] +@@ -10067,8 +10054,8 @@ version = "0.19.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" + dependencies = [ +- "indexmap 2.9.0", +- "toml_datetime", ++ "indexmap 2.10.0", ++ "toml_datetime 0.6.11", + "winnow 0.5.40", + ] + +@@ -10078,30 +10065,45 @@ version = "0.20.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" + dependencies = [ +- "indexmap 2.9.0", +- "toml_datetime", ++ "indexmap 2.10.0", ++ "toml_datetime 0.6.11", + "winnow 0.5.40", + ] + + [[package]] + name = "toml_edit" +-version = "0.22.26" ++version = "0.22.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" ++checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" + dependencies = [ +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "serde", +- "serde_spanned", +- "toml_datetime", ++ "serde_spanned 0.6.9", ++ "toml_datetime 0.6.11", + "toml_write", + "winnow 0.7.12", + ] + ++[[package]] ++name = "toml_parser" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" ++dependencies = [ ++ "winnow 0.7.12", ++] ++ + [[package]] + name = "toml_write" +-version = "0.1.1" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" ++ ++[[package]] ++name = "toml_writer" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" ++checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" + + [[package]] + name = "tonic" +@@ -10114,7 +10116,7 @@ dependencies = [ + "axum 0.7.9", + "base64 0.22.1", + "bytes", +- "h2 0.4.10", ++ "h2 0.4.12", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", +@@ -10124,7 +10126,7 @@ dependencies = [ + "percent-encoding", + "pin-project", + "prost", +- "socket2 0.5.9", ++ "socket2 0.5.10", + "tokio", + "tokio-stream", + "tower 0.4.13", +@@ -10225,13 +10227,13 @@ dependencies = [ + + [[package]] + name = "tracing-attributes" +-version = "0.1.28" ++version = "0.1.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" ++checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -10287,16 +10289,16 @@ dependencies = [ + + [[package]] + name = "tray-icon" +-version = "0.21.0" ++version = "0.21.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2da75ec677957aa21f6e0b361df0daab972f13a5bee3606de0638fd4ee1c666a" ++checksum = "a0d92153331e7d02ec09137538996a7786fe679c629c279e82a6be762b7e6fe2" + dependencies = [ + "crossbeam-channel", + "dirs 6.0.0", + "libappindicator", + "muda", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.1", +@@ -10602,9 +10604,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + + [[package]] + name = "wasi" +-version = "0.11.0+wasi-snapshot-preview1" ++version = "0.11.1+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + + [[package]] + name = "wasi" +@@ -10637,7 +10639,7 @@ dependencies = [ + "log", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "wasm-bindgen-shared", + ] + +@@ -10672,7 +10674,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +@@ -10701,13 +10703,13 @@ dependencies = [ + + [[package]] + name = "wayland-backend" +-version = "0.3.10" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" ++checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" + dependencies = [ + "cc", + "downcast-rs", +- "rustix 0.38.44", ++ "rustix 1.0.8", + "scoped-tls", + "smallvec", + "wayland-sys", +@@ -10715,21 +10717,21 @@ dependencies = [ + + [[package]] + name = "wayland-client" +-version = "0.31.10" ++version = "0.31.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" ++checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" + dependencies = [ + "bitflags 2.9.1", +- "rustix 0.38.44", ++ "rustix 1.0.8", + "wayland-backend", + "wayland-scanner", + ] + + [[package]] + name = "wayland-protocols" +-version = "0.32.8" ++version = "0.32.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a" ++checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" + dependencies = [ + "bitflags 2.9.1", + "wayland-backend", +@@ -10739,9 +10741,9 @@ dependencies = [ + + [[package]] + name = "wayland-protocols-wlr" +-version = "0.3.8" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf" ++checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec" + dependencies = [ + "bitflags 2.9.1", + "wayland-backend", +@@ -10752,9 +10754,9 @@ dependencies = [ + + [[package]] + name = "wayland-scanner" +-version = "0.31.6" ++version = "0.31.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484" ++checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" + dependencies = [ + "proc-macro2", + "quick-xml 0.37.5", +@@ -10763,9 +10765,9 @@ dependencies = [ + + [[package]] + name = "wayland-sys" +-version = "0.31.6" ++version = "0.31.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615" ++checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" + dependencies = [ + "dlib", + "log", +@@ -10844,18 +10846,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + + [[package]] + name = "webpki-roots" +-version = "0.26.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +-dependencies = [ +- "webpki-roots 1.0.0", +-] +- +-[[package]] +-name = "webpki-roots" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" ++checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" + dependencies = [ + "rustls-pki-types", + ] +@@ -10882,7 +10875,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -10898,9 +10891,9 @@ dependencies = [ + + [[package]] + name = "weezl" +-version = "0.1.8" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" ++checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3" + + [[package]] + name = "winapi" +@@ -10940,7 +10933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" + dependencies = [ + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.1", + "raw-window-handle", +@@ -10980,7 +10973,7 @@ dependencies = [ + "windows-interface", + "windows-link", + "windows-result", +- "windows-strings 0.4.2", ++ "windows-strings", + ] + + [[package]] +@@ -11002,7 +10995,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -11013,7 +11006,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -11034,13 +11027,13 @@ dependencies = [ + + [[package]] + name = "windows-registry" +-version = "0.4.0" ++version = "0.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" ++checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" + dependencies = [ ++ "windows-link", + "windows-result", +- "windows-strings 0.3.1", +- "windows-targets 0.53.2", ++ "windows-strings", + ] + + [[package]] +@@ -11052,15 +11045,6 @@ dependencies = [ + "windows-link", + ] + +-[[package]] +-name = "windows-strings" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +-dependencies = [ +- "windows-link", +-] +- + [[package]] + name = "windows-strings" + version = "0.4.2" +@@ -11112,7 +11096,7 @@ version = "0.60.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" + dependencies = [ +- "windows-targets 0.53.2", ++ "windows-targets 0.53.3", + ] + + [[package]] +@@ -11163,10 +11147,11 @@ dependencies = [ + + [[package]] + name = "windows-targets" +-version = "0.53.2" ++version = "0.53.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" ++checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" + dependencies = [ ++ "windows-link", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", +@@ -11405,12 +11390,12 @@ dependencies = [ + + [[package]] + name = "winreg" +-version = "0.52.0" ++version = "0.55.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" ++checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" + dependencies = [ + "cfg-if", +- "windows-sys 0.48.0", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -11469,7 +11454,7 @@ dependencies = [ + "libc", + "ndk", + "objc2 0.6.1", +- "objc2-app-kit 0.3.1", ++ "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation 0.3.1", + "objc2-ui-kit", +@@ -11540,9 +11525,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + + [[package]] + name = "xattr" +-version = "1.5.0" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e" ++checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909" + dependencies = [ + "libc", + "rustix 1.0.8", +@@ -11593,7 +11578,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "synstructure", + ] + +@@ -11620,7 +11605,6 @@ dependencies = [ + "serde_repr", + "sha1", + "static_assertions", +- "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", +@@ -11654,13 +11638,14 @@ dependencies = [ + "ordered-stream", + "serde", + "serde_repr", ++ "tokio", + "tracing", + "uds_windows", + "windows-sys 0.59.0", + "winnow 0.7.12", + "zbus_macros 5.9.0", + "zbus_names 4.2.0", +- "zvariant 5.5.3", ++ "zvariant 5.6.0", + ] + + [[package]] +@@ -11672,7 +11657,7 @@ dependencies = [ + "proc-macro-crate 3.3.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "zvariant_utils 2.1.0", + ] + +@@ -11685,9 +11670,9 @@ dependencies = [ + "proc-macro-crate 3.3.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "zbus_names 4.2.0", +- "zvariant 5.5.3", ++ "zvariant 5.6.0", + "zvariant_utils 3.2.0", + ] + +@@ -11711,27 +11696,27 @@ dependencies = [ + "serde", + "static_assertions", + "winnow 0.7.12", +- "zvariant 5.5.3", ++ "zvariant 5.6.0", + ] + + [[package]] + name = "zerocopy" +-version = "0.8.25" ++version = "0.8.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" ++checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" + dependencies = [ + "zerocopy-derive", + ] + + [[package]] + name = "zerocopy-derive" +-version = "0.8.25" ++version = "0.8.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" ++checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -11751,7 +11736,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "synstructure", + ] + +@@ -11772,7 +11757,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -11788,9 +11773,9 @@ dependencies = [ + + [[package]] + name = "zerovec" +-version = "0.11.2" ++version = "0.11.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" ++checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" + dependencies = [ + "yoke", + "zerofrom", +@@ -11805,7 +11790,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -11825,7 +11810,7 @@ dependencies = [ + "flate2", + "getrandom 0.3.3", + "hmac", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "lzma-rs", + "memchr", + "pbkdf2", +@@ -11840,21 +11825,21 @@ dependencies = [ + + [[package]] + name = "zip" +-version = "4.2.0" ++version = "4.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "95ab361742de920c5535880f89bbd611ee62002bf11341d16a5f057bb8ba6899" ++checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b" + dependencies = [ + "arbitrary", + "crc32fast", +- "indexmap 2.9.0", ++ "indexmap 2.10.0", + "memchr", + ] + + [[package]] + name = "zlib-rs" +-version = "0.5.0" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8" ++checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a" + + [[package]] + name = "zopfli" +@@ -11906,21 +11891,21 @@ dependencies = [ + "enumflags2", + "serde", + "static_assertions", +- "url", + "zvariant_derive 4.2.0", + ] + + [[package]] + name = "zvariant" +-version = "5.5.3" ++version = "5.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1" ++checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f" + dependencies = [ + "endi", + "enumflags2", + "serde", ++ "url", + "winnow 0.7.12", +- "zvariant_derive 5.5.3", ++ "zvariant_derive 5.6.0", + "zvariant_utils 3.2.0", + ] + +@@ -11933,20 +11918,20 @@ dependencies = [ + "proc-macro-crate 3.3.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "zvariant_utils 2.1.0", + ] + + [[package]] + name = "zvariant_derive" +-version = "5.5.3" ++version = "5.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580" ++checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208" + dependencies = [ + "proc-macro-crate 3.3.0", + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + "zvariant_utils 3.2.0", + ] + +@@ -11958,7 +11943,7 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.101", ++ "syn 2.0.104", + ] + + [[package]] +@@ -11971,6 +11956,6 @@ dependencies = [ + "quote", + "serde", + "static_assertions", +- "syn 2.0.101", ++ "syn 2.0.104", + "winnow 0.7.12", + ] +diff --git a/Cargo.toml b/Cargo.toml +index c560a9b64..718574be8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -5,7 +5,7 @@ resolver = "2" + [workspace.dependencies] + bstr = "1.11.1" + # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes. +-gix = { version = "0.73.0", git = "https://github.com/GitoxideLabs/gitoxide", branch = "main", default-features = false, features = [ ++gix = { version = "0.73.0", default-features = false, features = [ + ] } + gix-testtools = "0.16.1" + insta = "1.43.1" diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index c68297840174..5196791667fa 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -17,7 +17,7 @@ nodejs, openssl, pkg-config, - pnpm_9, + pnpm_10, rust, rustPlatform, turbo, @@ -27,6 +27,7 @@ }: let + pnpm = pnpm_10; excludeSpec = spec: [ "--exclude" spec @@ -35,15 +36,18 @@ in rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.14.19"; + version = "0.15.10"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; tag = "release/${version}"; - hash = "sha256-NopuZbgF2jdwuf/p/JzubS0IM5xBnlkh9Tj234auBnE="; + hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI="; }; + # Workaround for https://github.com/NixOS/nixpkgs/issues/359340 + cargoPatches = [ ./gix-from-crates-io.patch ]; + # Let Tauri know what version we're building # # Remove references to non-existent workspaces in `gix` crates @@ -59,12 +63,12 @@ rustPlatform.buildRustPackage rec { --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;' ''; - cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM="; + cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8="; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm.fetchDeps { inherit pname version src; - fetcherVersion = 1; - hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE="; + fetcherVersion = 2; + hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y="; }; nativeBuildInputs = [ @@ -76,7 +80,7 @@ rustPlatform.buildRustPackage rec { moreutils nodejs pkg-config - pnpm_9.configHook + pnpm.configHook turbo wrapGAppsHook4 yq # For `tomlq` @@ -141,6 +145,11 @@ rustPlatform.buildRustPackage rec { LIBGIT2_NO_VENDOR = 1; }; + preBuild = '' + turbo run --filter @gitbutler/svelte-comment-injector build + pnpm build:desktop -- --mode production + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeBinaryWrapper $out/Applications/GitButler.app/Contents/MacOS/gitbutler-tauri $out/bin/gitbutler-tauri From 565a5270d0e605dbfbecb2762e34b246e0538425 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 7 Aug 2025 18:26:11 -0400 Subject: [PATCH 0014/2279] gitbutler: `rec` -> `finalAttrs` --- pkgs/by-name/gi/gitbutler/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 5196791667fa..707ab58cc0c3 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -34,14 +34,14 @@ let ]; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gitbutler"; version = "0.15.10"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; - tag = "release/${version}"; + tag = "release/${finalAttrs.version}"; hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI="; }; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { # Deactivate the built-in updater postPatch = '' tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json" - jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease" + jq '.version = "${finalAttrs.version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease" tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8="; pnpmDeps = pnpm.fetchDeps { - inherit pname version src; + inherit (finalAttrs) pname version src; fetcherVersion = 2; hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y="; }; @@ -174,7 +174,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Git client for simultaneous branches on top of your existing workflow"; homepage = "https://gitbutler.com"; - changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}"; + changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${finalAttrs.version}"; license = lib.licenses.fsl11Mit; maintainers = with lib.maintainers; [ getchoo @@ -183,4 +183,4 @@ rustPlatform.buildRustPackage rec { mainProgram = "gitbutler-tauri"; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) From 3615a9dfc12af66518f308d2696f78d8ae838076 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 16 Aug 2025 14:03:17 +0200 Subject: [PATCH 0015/2279] biber: skip impossible tests on 32bit systems biber has some tests with bibliography entries that have the year 17000002 and -17000002 etc. Such dates are not representable with 32bit integer values and thus break on such systems. Users of 32bit systems should expect such problems, additionally such bibliography entries seem very unlikely in the wild. Let's follow Gentoo and Alpine in ignoring these test failures. --- pkgs/by-name/bi/biber/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix index 0d6dbed84676..ccc47ea66539 100644 --- a/pkgs/by-name/bi/biber/package.nix +++ b/pkgs/by-name/bi/biber/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, perlPackages, shortenPerlShebang, texlive, @@ -15,6 +16,15 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; + # Test suite checks years that are out of range with 32bit integers + patches = lib.optionals stdenv.hostPlatform.is32bit [ + (fetchpatch { + name = "biber-skip-64bit-only-tests.patch"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/65871ad2d20b8ab39caf25a0aaec3ab95fbcf511/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch"; + hash = "sha256-6Tbp62uZuFPoSKZrXerObg+gcSyLwC66IAcvcP+KcHM="; + }) + ]; + buildInputs = with perlPackages; [ autovivification BusinessISBN From ee4d327de8bd438f561b421c45adc7abd797c21f Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 18 Aug 2025 13:36:34 +0200 Subject: [PATCH 0016/2279] trickle: fix build --- pkgs/by-name/tr/trickle/atomicio.patch | 30 +++++++++++++++ pkgs/by-name/tr/trickle/package.nix | 37 ++++++++++++++----- .../tr/trickle/remove-libtrickle.patch | 17 +++++++++ pkgs/by-name/tr/trickle/trickle-gcc14.patch | 25 +++++++++++++ 4 files changed, 100 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/tr/trickle/atomicio.patch create mode 100644 pkgs/by-name/tr/trickle/remove-libtrickle.patch create mode 100644 pkgs/by-name/tr/trickle/trickle-gcc14.patch diff --git a/pkgs/by-name/tr/trickle/atomicio.patch b/pkgs/by-name/tr/trickle/atomicio.patch new file mode 100644 index 000000000000..ea173e0155df --- /dev/null +++ b/pkgs/by-name/tr/trickle/atomicio.patch @@ -0,0 +1,30 @@ +diff --git i/atomicio.c w/atomicio.c +index 3930a07..81a14a4 100644 +--- i/atomicio.c ++++ w/atomicio.c +@@ -37,11 +37,7 @@ + * ensure all of data on socket comes through. f==read || f==write + */ + ssize_t +-atomicio(f, fd, _s, n) +- ssize_t (*f) (); +- int fd; +- void *_s; +- size_t n; ++atomicio(ssize_t (*f)(int, const void *, size_t), int fd, const void *_s, size_t n) + { + char *s = _s; + ssize_t res, pos = 0; +diff --git i/util.h w/util.h +index b00059c..f24d0c3 100644 +--- i/util.h ++++ w/util.h +@@ -41,7 +41,7 @@ + #define MAX(a, b) ((a) > (b) ? (a) : (b)) + #define MIN(a, b) ((a) < (b) ? (a) : (b)) + +-ssize_t atomicio(ssize_t (*)(), int, void *, size_t); ++ssize_t atomicio(ssize_t (*f)(int, const void *, size_t), int fd, const void *s, size_t n); + char *get_progname(char *); + + diff --git a/pkgs/by-name/tr/trickle/package.nix b/pkgs/by-name/tr/trickle/package.nix index 2ade49893aca..822c250c1ad7 100644 --- a/pkgs/by-name/tr/trickle/package.nix +++ b/pkgs/by-name/tr/trickle/package.nix @@ -1,38 +1,57 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, libevent, libtirpc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "trickle"; - version = "1.07"; + version = "1.07-unstable-2019-10-03"; - src = fetchurl { - url = "https://monkey.org/~marius/trickle/trickle-${version}.tar.gz"; - sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; + src = fetchFromGitHub { + owner = "mariusae"; + repo = "trickle"; + rev = "09a1d955c6554eb7e625c99bf96b2d99ec7db3dc"; + sha256 = "sha256-cqkNPeTo+noqMCXsxh6s4vKoYwsWusafm/QYX8RvCek="; }; + patches = [ + ./trickle-gcc14.patch + ./atomicio.patch + ./remove-libtrickle.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ libevent libtirpc ]; - preConfigure = '' - sed -i 's|libevent.a|libevent.so|' configure + preAutoreconf = '' + sed -i -e 's|\s*LIBCGUESS=.*|LIBCGUESS=${stdenv.cc.libc}/lib/libc.so.*|' configure.in + grep LIBCGUESS configure.in + sed -i 's|libevent.a|libevent.so|' configure.in ''; preBuild = '' sed -i '/#define in_addr_t/ s:^://:' config.h + sed -i 's|^_select(int|select(int|' trickle-overload.c ''; NIX_LDFLAGS = [ "-levent" "-ltirpc" ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-I${libtirpc.dev}/include/tirpc" + "-Wno-error=incompatible-pointer-types" + ]; configureFlags = [ "--with-libevent" ]; diff --git a/pkgs/by-name/tr/trickle/remove-libtrickle.patch b/pkgs/by-name/tr/trickle/remove-libtrickle.patch new file mode 100644 index 000000000000..060b3d3fe181 --- /dev/null +++ b/pkgs/by-name/tr/trickle/remove-libtrickle.patch @@ -0,0 +1,17 @@ +diff --git i/Makefile.am w/Makefile.am +index 9c2bbf3..0b0023e 100644 +--- i/Makefile.am ++++ w/Makefile.am +@@ -30,12 +30,6 @@ tricklectl_LDADD = @ERRO@ $(LIBOBJS) + + AM_CFLAGS = -Wall -Icompat @EVENTINC@ + +-overloaddir = $(libdir) +-overload_DATA = libtrickle.so +- +-libtrickle.so: trickle-overload.c atomicio.c +-$(overload_DATA): +- + CLEANFILES = *.so + + EXTRA_DIST = LICENSE README strlcat.c strlcpy.c err.c Makefile.am.inc \ diff --git a/pkgs/by-name/tr/trickle/trickle-gcc14.patch b/pkgs/by-name/tr/trickle/trickle-gcc14.patch new file mode 100644 index 000000000000..b6729dace2ff --- /dev/null +++ b/pkgs/by-name/tr/trickle/trickle-gcc14.patch @@ -0,0 +1,25 @@ +diff --git a/configure.in b/configure.in +index 6ebf3b2..5c85682 100644 +--- a/configure.in ++++ b/configure.in +@@ -198,6 +198,7 @@ if test "$HAVEMETHOD" = "no"; then + AC_TRY_RUN( + #include + #include ++ #include + + int + main(int argc, char **argv) +diff --git a/xdr.c b/xdr.c +index ed8bf5b..a20bbd9 100644 +--- a/xdr.c ++++ b/xdr.c +@@ -103,7 +103,7 @@ xdr_msg(XDR *xdrs, struct msg *msg) + { + X(xdr_short(xdrs, &msg->status)); + X(xdr_union(xdrs, (int *)&msg->type, (char *)&msg->data, +- xdr_msg_discrim, _xdr_void)); ++ xdr_msg_discrim, (xdrproc_t)_xdr_void)); + + return (TRUE); + } From f31fad47e8127344f99bafdb6f5be92362bfad9f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 22 Aug 2025 21:38:23 -0400 Subject: [PATCH 0017/2279] python313Packages.tqdm-multiprocess: disable updateScript The default updater fails, and it's hard or impossible to implement an updater. Not worth the effort. --- pkgs/development/python-modules/tqdm-multiprocess/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/tqdm-multiprocess/default.nix b/pkgs/development/python-modules/tqdm-multiprocess/default.nix index 812a694078d0..e01b5cc0fa0f 100644 --- a/pkgs/development/python-modules/tqdm-multiprocess/default.nix +++ b/pkgs/development/python-modules/tqdm-multiprocess/default.nix @@ -32,6 +32,9 @@ buildPythonPackage { "tqdm_multiprocess" ]; + # pypi is broken; github has no tags; the package haven't seen updates for years + passthru.updateScript = null; + meta = { description = "Support multiple worker processes, each with multiple tqdm progress bars, displaying them cleanly through the main process"; homepage = "https://github.com/EleutherAI/tqdm-multiprocess"; From 71a478fb6e8056c90a209e62092ae9a306bb4e6b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 22 Aug 2025 22:10:27 -0400 Subject: [PATCH 0018/2279] python313Packages.pypdfium2: ignore beta releases --- pkgs/development/python-modules/pypdfium2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix index 66cdf166a6fb..8a566a791873 100644 --- a/pkgs/development/python-modules/pypdfium2/default.nix +++ b/pkgs/development/python-modules/pypdfium2/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, fetchgit, + gitUpdater, setuptools-scm, pdfium-binaries, numpy, @@ -133,6 +134,12 @@ buildPythonPackage rec { "pypdfium2" ]; + passthru = { + updateScript = gitUpdater { + allowedVersions = "^[.0-9]+$"; + }; + }; + meta = { changelog = "https://github.com/pypdfium2-team/pypdfium2/releases/tag/${version}"; description = "Python bindings to PDFium"; From 9444bd23f2b00e2752fbbddea498de9dabe931bf Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Aug 2025 18:41:53 +0200 Subject: [PATCH 0019/2279] ffmpeg: only use asm on x86 platforms ffmpeg only supports using nasm and yasm on x86 based platforms --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 940dd6c9ffc2..2fb174f92bc0 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -827,7 +827,7 @@ stdenv.mkDerivation ( pkg-config ] # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment. - ++ (if versionOlder version "8.0" then [ yasm ] else [ nasm ]) + ++ optionals stdenv.hostPlatform.isx86 (if versionOlder version "8.0" then [ yasm ] else [ nasm ]) # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ]) ++ optionals withCudaLLVM [ clang ] From 2c07b247d3c544293bada8a671182b891d440d50 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Aug 2025 18:44:48 +0200 Subject: [PATCH 0020/2279] ffmpeg: allways use nasm and not yasm ffmpeg recommends usig nasm and support for yasm was droped in 8.0 --- pkgs/development/libraries/ffmpeg/generic.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 2fb174f92bc0..9797f53c9284 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -9,7 +9,6 @@ perl, texinfo, texinfo6, - yasm, nasm, # You can fetch any upstream version using this derivation by specifying version and hash @@ -826,8 +825,7 @@ stdenv.mkDerivation ( perl pkg-config ] - # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment. - ++ optionals stdenv.hostPlatform.isx86 (if versionOlder version "8.0" then [ yasm ] else [ nasm ]) + ++ optionals stdenv.hostPlatform.isx86 [ nasm ] # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ]) ++ optionals withCudaLLVM [ clang ] From 9192040894caa87e0c6a4a0fce758d86cb72150f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Aug 2025 18:50:29 +0200 Subject: [PATCH 0021/2279] ffmpeg: switch to new source repo --- pkgs/development/libraries/ffmpeg/generic.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 9797f53c9284..d9bfa295972a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -15,9 +15,11 @@ # NOTICE: Always use this argument to override the version. Do not use overrideAttrs. version, # ffmpeg ABI version. Also declare this if you're overriding the source. hash ? "", # hash of the upstream source for the given ABI version - source ? fetchgit { - url = "https://git.ffmpeg.org/ffmpeg.git"; - rev = "n${version}"; + source ? fetchFromGitea { + domain = "code.ffmpeg.org"; + owner = "FFmpeg"; + repo = "FFmpeg"; + tag = "n${version}"; inherit hash; }, @@ -40,7 +42,7 @@ # instead. withFullDeps ? ffmpegVariant == "full", - fetchgit, + fetchFromGitea, fetchpatch2, # Feature flags From 05fc9ac6bd0b003e1bbab188e511f11c6e17f58c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 27 Aug 2025 22:31:13 -0400 Subject: [PATCH 0022/2279] moltenvk: 1.3.0 -> 1.4.0 --- pkgs/by-name/mo/moltenvk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix index 576cab57fa59..23680a517df9 100644 --- a/pkgs/by-name/mo/moltenvk/package.nix +++ b/pkgs/by-name/mo/moltenvk/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.3.0"; + version = "1.4.0"; strictDeps = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-V69P1t48XP/pAPgpVsnFeCBidhHk60XGHRkHF6AEke0="; + hash = "sha256-ydXyah6/J6/1Lzuv+7JnMurkqnvQPs+6Vec0uUrxGq0="; }; postPatch = '' From 737ee71624003c5c96fed2075365bad3557e9050 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Tue, 2 Sep 2025 17:13:52 +0300 Subject: [PATCH 0023/2279] 9menu: modernize, add update script --- pkgs/by-name/_9/_9menu/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix index 2329c41eaac7..3afb96ec4bbe 100644 --- a/pkgs/by-name/_9/_9menu/package.nix +++ b/pkgs/by-name/_9/_9menu/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, pkg-config, meson, ninja, @@ -9,7 +10,7 @@ libXext, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "9menu"; version = "unstable-2021-02-24"; @@ -30,6 +31,13 @@ stdenv.mkDerivation { libXext ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "9menu-release-([0-9.]+)" + ]; + }; + meta = { homepage = "https://github.com/arnoldrobbins/9menu"; description = "Simple X11 menu program for running commands"; @@ -38,4 +46,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ ]; platforms = libX11.meta.platforms; }; -} +}) From c4cbd6cf79ae74d389c554d1782c8f61a9679392 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Tue, 2 Sep 2025 17:14:26 +0300 Subject: [PATCH 0024/2279] 9menu: unstable-2021-02-24 -> 1.11 --- pkgs/by-name/_9/_9menu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix index 3afb96ec4bbe..bc7c3b9fc230 100644 --- a/pkgs/by-name/_9/_9menu/package.nix +++ b/pkgs/by-name/_9/_9menu/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "9menu"; - version = "unstable-2021-02-24"; + version = "1.11"; src = fetchFromGitHub { owner = "arnoldrobbins"; repo = "9menu"; - rev = "00cbf99c48dc580ca28f81ed66c89a98b7a182c8"; - sha256 = "arca8Gbr4ytiCk43cifmNj7SUrDgn1XB26zAhZrVDs0="; + tag = "9menu-release-${finalAttrs.version}"; + hash = "sha256-J0vHArLH8WDCOvbbF4TYd9b75+5UkhnVdhbbeiUJ4SM="; }; nativeBuildInputs = [ From 33a9a6b27ef280aba56617b85ddf7b2708d647ba Mon Sep 17 00:00:00 2001 From: SteelPh0enix Date: Tue, 2 Sep 2025 21:55:35 +0200 Subject: [PATCH 0025/2279] Updated stm32cubemx to 6.15.0 --- pkgs/by-name/st/stm32cubemx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index b8c9af298ff2..98c7ee39c83d 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -14,13 +14,13 @@ let iconame = "STM32CubeMX"; package = stdenvNoCC.mkDerivation rec { pname = "stm32cubemx"; - version = "6.14.0"; + version = "6.15.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${ builtins.replaceStrings [ "." ] [ "" ] version }-lin.zip"; - hash = "sha256-GOvoPyfPdQV/gjveuFpZjueTZD/BYuEWSHgQKBm3o3A="; + hash = "sha256-50P+/uvNH3NN1UN+T3RxGgR8QYBIgBDA56mAEU4BipI="; stripRoot = false; }; From e06204e572658eaf4e6f2f2ea0ad063ec491f2c8 Mon Sep 17 00:00:00 2001 From: SteelPh0enix Date: Tue, 2 Sep 2025 22:25:11 +0200 Subject: [PATCH 0026/2279] Fixed icon extraction from STM32CubeMX package --- pkgs/by-name/st/stm32cubemx/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index 98c7ee39c83d..1e79086142a7 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -61,16 +61,15 @@ let EOF chmod +x $out/bin/${pname} - icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico fdupes -dN . > /dev/null ls for size in 16 24 32 48 64 128 256; do mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps if [ $size -eq 256 ]; then - mv ${iconame}_*_"$size"x"$size"x32.png \ + cp $out/opt/STM32CubeMX/help/${iconame}.png \ $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png else - convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \ + magick $out/opt/STM32CubeMX/help/${iconame}.png -resize "$size"x"$size" \ $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png fi done; From 0fd6f799b975a34ecd86fbc82bec58c03153ef12 Mon Sep 17 00:00:00 2001 From: rczb Date: Fri, 5 Sep 2025 20:02:49 +0800 Subject: [PATCH 0027/2279] rime-wanxiang: correct description --- pkgs/by-name/ri/rime-wanxiang/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix index c01ee22ee0d9..6eb8b7411401 100644 --- a/pkgs/by-name/ri/rime-wanxiang/package.nix +++ b/pkgs/by-name/ri/rime-wanxiang/package.nix @@ -32,13 +32,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "Feature-rich pinyin schema for Rime, basic edition"; + description = "Feature-rich pinyin schema for Rime"; longDescription = '' - 万象拼音基础版 is a basic quanpin and shuangpin input schema for Rime based on + 万象拼音 is a quanpin and shuangpin input schema for Rime based on [万象 dictionaries and grammar models](https://github.com/amzxyz/RIME-LMDG), supporting traditional shuangpin as well as tonal schemata such as 自然龙 and 龙码. + This package is built from the upstream repository snapshots, and includes + all the auxiliary encodings. + The schema requires to work the grammar model `wanxiang-lts-zh-hans.gram`. However, this file is [released](https://github.com/amzxyz/RIME-LMDG/releases/tag/LTS) by From 3d52f4bb4abcdebd21afda5698361f66938c36dd Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 19 Jul 2025 01:04:29 +0200 Subject: [PATCH 0028/2279] jitsi-meet: 1.0.8043 -> 1.0.8792, from GitHub --- pkgs/by-name/ji/jitsi-meet/package.nix | 44 ++++++++++++++++++++------ pkgs/by-name/ji/jitsi-meet/update.sh | 14 ++++---- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ji/jitsi-meet/package.nix b/pkgs/by-name/ji/jitsi-meet/package.nix index 90cad423959c..623e554f0370 100644 --- a/pkgs/by-name/ji/jitsi-meet/package.nix +++ b/pkgs/by-name/ji/jitsi-meet/package.nix @@ -1,26 +1,50 @@ { lib, stdenv, - fetchurl, nixosTests, + + fetchFromGitHub, + fetchNpmDeps, + npmHooks, + + libarchive, + nodejs, + olm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jitsi-meet"; - version = "1.0.8043"; + version = "1.0.8792"; - src = fetchurl { - url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "XJlfCMQXnHjfHQhK916RXsdPzrU2U2IaOMiXIHL1sCI="; + src = fetchFromGitHub { + owner = "jitsi"; + repo = "jitsi-meet"; + tag = lib.last (lib.splitVersion finalAttrs.version); + hash = "sha256-K4Xrse1kpNqlUChbQnAjP5lRCRuDfJKiN/022tCmMVQ="; }; - dontBuild = true; + env = { + makeFlags = "source-package"; + makeCacheWritable = true; + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-2NPfr3gskHz9zSGs//uzyCCuE+CZ295hhitDPlS9xuY="; + }; + }; + nativeBuildInputs = [ + libarchive + nodejs + npmHooks.npmConfigHook + ]; + + # yes, the only way in the build system is to generate a tarball and extract + # it immediately after installPhase = '' runHook preInstall - mkdir $out - mv * $out/ + mkdir -p $out + bsdtar -xf jitsi-meet.tar.bz2 -C $out --strip-components 1 runHook postInstall ''; @@ -43,4 +67,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; inherit (olm.meta) knownVulnerabilities; }; -} +}) diff --git a/pkgs/by-name/ji/jitsi-meet/update.sh b/pkgs/by-name/ji/jitsi-meet/update.sh index 1ccf45fd1a4c..12fb08e99c02 100755 --- a/pkgs/by-name/ji/jitsi-meet/update.sh +++ b/pkgs/by-name/ji/jitsi-meet/update.sh @@ -1,12 +1,12 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl pup common-updater-scripts +#!nix-shell -i bash -p curl pup nix-update set -eu -o pipefail -version="$(curl https://download.jitsi.org/stable/ | \ - pup 'a[href] text{}' | \ - awk -F'[_-]' '/jitsi-meet-web_/ {printf $4"\n"}' | \ - sort -Vu | \ - tail -n 1)" +version="$(curl https://download.jitsi.org/jitsi-meet/src/ | + pup 'a[href] text{}' | + awk -F'-|.tar.bz2' '/jitsi-meet-/ {printf $3"\n"}' | + sort -Vu | + tail -n 1)" -update-source-version jitsi-meet "$version" +nix-update --version="$version" jitsi-meet From 5fa5ca491f6557a3df3a569dbe65498c8f8e298b Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 19 Jul 2025 01:04:29 +0200 Subject: [PATCH 0029/2279] jitsi-meet: remove with lib --- pkgs/by-name/ji/jitsi-meet/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ji/jitsi-meet/package.nix b/pkgs/by-name/ji/jitsi-meet/package.nix index 623e554f0370..50425b233027 100644 --- a/pkgs/by-name/ji/jitsi-meet/package.nix +++ b/pkgs/by-name/ji/jitsi-meet/package.nix @@ -55,16 +55,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Secure, Simple and Scalable Video Conferences"; longDescription = '' Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses Jitsi Videobridge to provide high quality, secure and scalable video conferences. ''; homepage = "https://github.com/jitsi/jitsi-meet"; - license = licenses.asl20; - teams = [ teams.jitsi ]; - platforms = platforms.all; + license = lib.licenses.asl20; + teams = [ lib.teams.jitsi ]; + inherit (nodejs.meta) platforms; inherit (olm.meta) knownVulnerabilities; }; }) From f05f1abb5e0c2d3216011992a2ec0c72eefc95f2 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Sat, 19 Jul 2025 03:26:45 +0200 Subject: [PATCH 0030/2279] element-web-unwrapped: unbreak This indirectly marks element-desktop as insecure. This might not be desirable. I don't see a comment in jitsi-meet as to why it is vulnerable in the same way libolm is, so I don't have a way to verify if jitsi-meet actually is vulerable or not... --- pkgs/by-name/el/element-web-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index 1c842d2fe8ec..b8d6f9a5e80e 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation ( runHook preInstall cp -R webapp $out - tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js + cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js echo "${finalAttrs.version}" > "$out/version" jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" From 00ec9c2a4047ca1a0cddc5a59de875c7d8b161fb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 14 Sep 2025 06:46:35 +0100 Subject: [PATCH 0031/2279] luit: 20240910 -> 20250912 Changes: https://invisible-island.net/luit/luit.log.html#t20250912 --- pkgs/by-name/lu/luit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luit/package.nix b/pkgs/by-name/lu/luit/package.nix index 8be9df590ad7..86cc09527242 100644 --- a/pkgs/by-name/lu/luit/package.nix +++ b/pkgs/by-name/lu/luit/package.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "luit"; - version = "20240910"; + version = "20250912"; src = fetchurl { url = "https://invisible-mirror.net/archives/luit/luit-${finalAttrs.version}.tgz"; - hash = "sha256-oV1/y/wlrhRT1hrsI/9roEFF1ue3s7AHHrXP2jo6SdU="; + hash = "sha256-RpWAYOZvNby4pRuiLaHBPXJtKKhsHPUgURvPeRS+854="; }; hardeningDisable = [ "bindnow" From 2fefb13dbb1671aba0ca5cdbca8e3f5f5047bed1 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 15 Sep 2025 12:34:49 -0700 Subject: [PATCH 0032/2279] git: disable more flaky tests --- pkgs/applications/version-management/git/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 8be72836cf2d..5f658dfdd693 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -489,6 +489,12 @@ stdenv.mkDerivation (finalAttrs: { disable_test t5319-multi-pack-index disable_test t6421-merge-partial-clone disable_test t7504-commit-msg-hook + disable_test t5515-fetch-merge-logic + disable_test t4104-apply-boundary + disable_test t7002-mv-sparse-checkout + disable_test t4122-apply-symlink-inside + disable_test t7513-interpret-trailers + disable_test t2200-add-update # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion From 4e3eb5a44fcc7a87ae9b2e5f95fe64023c5467cb Mon Sep 17 00:00:00 2001 From: Alex Tunstall Date: Mon, 15 Sep 2025 23:40:35 +0100 Subject: [PATCH 0033/2279] hugs: Fix build failure We change to Lennart Augustsson's branch in preparation for booting MicroHs via Hugs. --- pkgs/by-name/hu/hugs/package.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/hu/hugs/package.nix b/pkgs/by-name/hu/hugs/package.nix index 4bc39894a6fb..d256e99d76a1 100644 --- a/pkgs/by-name/hu/hugs/package.nix +++ b/pkgs/by-name/hu/hugs/package.nix @@ -1,29 +1,28 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hugs98"; version = "2006-09"; - src = fetchurl { - url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz"; - sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; + src = fetchFromGitHub { + owner = "augustss"; + repo = "hugs98-plus-Sep2006"; + rev = "1f7b60e05b12df00d715d535bb01c189bc1b9b3c"; + hash = "sha256-g6/4kmdWKGDIu5PXVfP8O6Fl3v4bstXWAVkoxZiS6qo="; }; - patches = [ - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs"; - name = "hsbase_inline.patch"; - sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v"; - }) - ]; - nativeBuildInputs = [ bison ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + ]; + postUnpack = "find -type f -exec sed -i 's@/bin/cp@cp@' {} +"; preConfigure = "unset STRIP"; @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; mainProgram = "hugs"; homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; From d535ec48b8c35082fe861589f1e4c6ef67bdeaa9 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 2 Sep 2025 22:58:00 +0900 Subject: [PATCH 0034/2279] somo: 1.1.0 -> 1.2.0 Changelog: https://github.com/theopfr/somo/blob/v1.2.0/CHANGELOG.md?plain=1#L3-L10 Diff: https://github.com/theopfr/somo/compare/v1.1.0...v1.2.0 --- pkgs/by-name/so/somo/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix index 5cee1579ced7..d4cc7c9c9903 100644 --- a/pkgs/by-name/so/somo/package.nix +++ b/pkgs/by-name/so/somo/package.nix @@ -5,21 +5,23 @@ fetchFromGitHub, installShellFiles, versionCheckHook, + libredirect, + iana-etc, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "somo"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "theopfr"; repo = "somo"; tag = "v${finalAttrs.version}"; - hash = "sha256-HUTaBSy3FemAQH1aKZYTJnUWiq0bU/H6c5Gz3yamPiA="; + hash = "sha256-QTW+hsoj8Wrv3BbFCB2aibR27Wu1MA/1gWzAXtPKWsM="; }; - cargoHash = "sha256-e3NrEfbWz6h9q4TJnn8jnRmMJbeaEc4Yo3hFlaRLzzQ="; + cargoHash = "sha256-xlAdEo11UV1Y49D1LjxH5Oykf/RUoe1w6ZcQpGhfqkk="; nativeBuildInputs = [ installShellFiles @@ -29,6 +31,14 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; + nativeCheckInputs = [ + libredirect.hook + ]; + + preCheck = '' + export NIX_REDIRECTS=/etc/services=${iana-etc}/etc/services + ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd somo \ --bash <("$out/bin/somo" generate-completions bash) \ From 41a2afff7c4d787e0d88d7dd72a05141f63fd468 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Sep 2025 06:44:40 +0100 Subject: [PATCH 0035/2279] tinysparql: 3.9.2 -> 3.10.0 Changes: https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.10.0/NEWS --- pkgs/by-name/ti/tinysparql/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 627fca114f06..a4ea112ef7f6 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch2, gettext, meson, mesonEmulatorHook, @@ -35,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.9.2"; + version = "3.10.0"; outputs = [ "out" @@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-FM4DkCQTXhgQIrzOSxqtLgA3fdnH2BK5g5HM/HVtrY4="; + hash = "sha256-+wr5g1XqHbcAdkz0+iRYhKGZyhRe1C7VX5oYxoVSyjA="; }; strictDeps = true; @@ -112,14 +111,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - patches = [ - (fetchpatch2 { - name = "make-dbus-dep-optional.patch"; - url = "https://gitlab.gnome.org/GNOME/tinysparql/-/commit/31b5a793cd40cdce032e0f7d7c3ef7841c6e3691.patch?full_index=1"; - hash = "sha256-YoWJEa2bFIjZdPW9pJ3iHTxi0dvveYDjKaDokcIvnj8="; - }) - ]; - postPatch = '' patchShebangs \ utils/data-generators/cc/generate From 351312ca3a89a5afc7fb2da178cc841f2989e0d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Sep 2025 09:16:15 +0200 Subject: [PATCH 0036/2279] python313Packages.elementpath: 5.0.3 -> 5.0.4 Diff: https://github.com/sissaschool/elementpath/compare/v5.0.3...v5.0.4 Changelog: https://github.com/sissaschool/elementpath/blob/v5.0.4/CHANGELOG.rst --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index de31d75927d9..12a672b332b5 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "5.0.3"; + version = "5.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; tag = "v${version}"; - hash = "sha256-gjJsgc3JrFHgdhDDzLHQspoj99jHmIbkCULEq20yAss="; + hash = "sha256-puScPtX46KQ5tSpsZMtuyiCz1cRY43STeJD4P3rkoFY="; }; build-system = [ setuptools ]; From ffb0bd440216d1c9c91a9827854139593f01e85c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 21 Sep 2025 21:43:57 +0100 Subject: [PATCH 0037/2279] inih: 61 -> 62 Changes: https://github.com/benhoyt/inih/releases/tag/r62 --- pkgs/by-name/in/inih/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix index 14336b289ac7..4bfe3df86292 100644 --- a/pkgs/by-name/in/inih/package.nix +++ b/pkgs/by-name/in/inih/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "61"; + version = "62"; src = fetchFromGitHub { owner = "benhoyt"; repo = "inih"; rev = "r${version}"; - hash = "sha256-tSmdd9uAXaRQtnqj0hKuT0wofcZcYjqgPbhtaR+cr84="; + hash = "sha256-jnMGOncnH+ffgtyNzA8tZPtxPCR/yq9jmPsJZE4BhXo="; }; nativeBuildInputs = [ From fc51e785a19e89b2f03551aa05ed9d10d8db0bf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Sep 2025 03:08:03 +0000 Subject: [PATCH 0038/2279] inotify-tools: 4.23.9.0 -> 4.25.9.0 --- pkgs/by-name/in/inotify-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inotify-tools/package.nix b/pkgs/by-name/in/inotify-tools/package.nix index 10c48bffe7c0..4746fdf6b615 100644 --- a/pkgs/by-name/in/inotify-tools/package.nix +++ b/pkgs/by-name/in/inotify-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "inotify-tools"; - version = "4.23.9.0"; + version = "4.25.9.0"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "inotify-tools"; rev = finalAttrs.version; - hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU="; + hash = "sha256-u7bnFmSEXNGVZTJ71kOTscQLymbjJblJCIY9Uj7/3mM="; }; configureFlags = [ From 003ccb5827aa438de264bfbec7cc57e03ffde51c Mon Sep 17 00:00:00 2001 From: Davis Schirmer Date: Tue, 23 Sep 2025 00:07:45 -0400 Subject: [PATCH 0039/2279] restic: Replace rec with finalAttrs; add djds@ to maintainers --- pkgs/by-name/re/restic/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/restic/package.nix b/pkgs/by-name/re/restic/package.nix index 47d67bfbd56c..e94c4684fed8 100644 --- a/pkgs/by-name/re/restic/package.nix +++ b/pkgs/by-name/re/restic/package.nix @@ -10,14 +10,14 @@ python3, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "restic"; version = "0.18.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-lLinqZUOsZCPPybvVDB1f8o9Hl5qKYi0eHwJAaydsD8="; }; @@ -60,15 +60,16 @@ buildGoModule rec { meta = with lib; { homepage = "https://restic.net"; - changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/restic/restic/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm + djds dotlambda ryan4yin ]; mainProgram = "restic"; }; -} +}) From 0c174928ec2c854e5986a7aeb1b50786b6a6b3b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Sep 2025 07:12:05 +0000 Subject: [PATCH 0040/2279] flatbuffers: 25.2.10 -> 25.9.23 --- pkgs/development/libraries/flatbuffers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 7756fd79422e..d9d48f3edd8b 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "25.2.10"; + version = "25.9.23"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - hash = "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E="; + hash = "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw="; }; nativeBuildInputs = [ From 869c1a5fe717f6bdb37ee1e311c8004b1b71d9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Sep 2025 00:12:21 -0700 Subject: [PATCH 0041/2279] python3Packages.xmltodict: 0.14.2 -> 1.0.2 Diff: https://github.com/martinblech/xmltodict/compare/v0.14.2...v1.0.2 Changelog: https://github.com/martinblech/xmltodict/blob/v1.0.2/CHANGELOG.md --- .../python-modules/xmltodict/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 166f53fd3d1a..9d1c01842a42 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -1,22 +1,21 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "xmltodict"; - version = "0.14.2"; + version = "1.0.2"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-IB58KLshDjdJmdHd5jgpI6sO0ail+u7OSKtSW3gQpVM="; + src = fetchFromGitHub { + owner = "martinblech"; + repo = "xmltodict"; + tag = "v${version}"; + hash = "sha256-gnTNkh0GLfRmjMsLhfvpNrewfinNOhem0i3wzIZvKpA="; }; build-system = [ setuptools ]; @@ -25,11 +24,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "xmltodict" ]; - meta = with lib; { + meta = { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; - changelog = "https://github.com/martinblech/xmltodict/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; + changelog = "https://github.com/martinblech/xmltodict/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; maintainers = [ ]; }; } From ef9f3abca92d6e5c56a58e009649cc421beda87c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Sep 2025 01:26:12 +0000 Subject: [PATCH 0042/2279] freerdp: 3.17.1 -> 3.17.2 --- pkgs/by-name/fr/freerdp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index cf914d822b30..07633d76f71b 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -63,13 +63,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.17.1"; + version = "3.17.2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-KAlxpoGOqvHTqKkb/yMrquSckFfMXgbEfxr2IuLPZFQ="; + hash = "sha256-r9a+tQ3QIBfF4Vtyo4F4dwqLloxJTTFUQFV8J53ITZ4="; }; postPatch = '' From bf7a3cc12528f8d1bd3606149773ec39154ae17e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Sep 2025 07:31:12 +0000 Subject: [PATCH 0043/2279] kronosnet: 1.31 -> 1.32 --- pkgs/by-name/kr/kronosnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix index 7bd2dd09ab6e..f319154c4ec7 100644 --- a/pkgs/by-name/kr/kronosnet/package.nix +++ b/pkgs/by-name/kr/kronosnet/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.31"; + version = "1.32"; src = fetchFromGitHub { owner = "kronosnet"; repo = "kronosnet"; rev = "v${version}"; - sha256 = "sha256-PZWaKrCy0S8d/x3GMh7X2wEiHwgiuEFpfCwKpbLvhsc="; + sha256 = "sha256-g2AgVAFEmRlMaqH7uRabSNJP0ehUQ6Iws4LT2iB8kTA="; }; nativeBuildInputs = [ From b06daee242e453558b7a92b5284fee2cd017348d Mon Sep 17 00:00:00 2001 From: ghpzin Date: Mon, 15 Sep 2025 22:24:00 +0300 Subject: [PATCH 0044/2279] unifdef: fix build with gcc15 - add patch from unmerged upstream PR: https://www.github.com/fanf2/unifdef/pull/19 Fixes build failure with gcc15: ``` unifdef.c:205:1: error: 'constexpr' in empty declaration unifdef.c: In function 'eval_unary': unifdef.c:1089:27: error: expected identifier or '(' before '=' token 1089 | constexpr = false; | ^ unifdef.c:1106:27: error: expected identifier or '(' before '=' token 1106 | constexpr = false; | ^ unifdef.c: In function 'ifeval': unifdef.c:1173:19: error: expected identifier or '(' before '=' token 1173 | constexpr = killconsts ? false : true; | ^ unifdef.c:1176:27: error: expected specifier-qualifier-list before '?' token 1176 | return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); | ^ ``` --- pkgs/by-name/un/unifdef/package.nix | 6 +++ .../unifdef-fix-build-with-gcc15.patch | 54 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch diff --git a/pkgs/by-name/un/unifdef/package.nix b/pkgs/by-name/un/unifdef/package.nix index d3a8bf96ae74..025fcc3bc356 100644 --- a/pkgs/by-name/un/unifdef/package.nix +++ b/pkgs/by-name/un/unifdef/package.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"; }; + patches = [ + # Fix build with gcc15 + # https://github.com/fanf2/unifdef/pull/19 + ./unifdef-fix-build-with-gcc15.patch + ]; + makeFlags = [ "prefix=$(out)" "DESTDIR=" diff --git a/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch b/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch new file mode 100644 index 000000000000..0b6fbb0b3a7e --- /dev/null +++ b/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch @@ -0,0 +1,54 @@ +From d616741e6b0d5b57b66447e85ad32b283b28adde Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 17 Nov 2024 01:26:27 +0000 +Subject: [PATCH] Don't use C23 constexpr keyword + +This fixes building with upcoming GCC 15 which defaults to -std=gnu23. +--- + unifdef.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/unifdef.c b/unifdef.c +index dc145a2..4bd3bda 100644 +--- a/unifdef.c ++++ b/unifdef.c +@@ -202,7 +202,7 @@ static int depth; /* current #if nesting */ + static int delcount; /* count of deleted lines */ + static unsigned blankcount; /* count of blank lines */ + static unsigned blankmax; /* maximum recent blankcount */ +-static bool constexpr; /* constant #if expression */ ++static bool is_constexpr; /* constant #if expression */ + static bool zerosyms; /* to format symdepth output */ + static bool firstsym; /* ditto */ + +@@ -1086,7 +1086,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + *valp = (value[sym] != NULL); + lt = *valp ? LT_TRUE : LT_FALSE; + } +- constexpr = false; ++ is_constexpr = false; + } else if (!endsym(*cp)) { + debug("eval%d symbol", prec(ops)); + sym = findsym(&cp); +@@ -1103,7 +1103,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp) + lt = *valp ? LT_TRUE : LT_FALSE; + cp = skipargs(cp); + } +- constexpr = false; ++ is_constexpr = false; + } else { + debug("eval%d bad expr", prec(ops)); + return (LT_ERROR); +@@ -1170,10 +1170,10 @@ ifeval(const char **cpp) + long val = 0; + + debug("eval %s", *cpp); +- constexpr = killconsts ? false : true; ++ is_constexpr = killconsts ? false : true; + ret = eval_table(eval_ops, &val, cpp); + debug("eval = %d", val); +- return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); ++ return (is_constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret); + } + + /* From 51fbb3a0951f904a382549a413d797b76377f79d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Sep 2025 12:34:06 +0000 Subject: [PATCH 0045/2279] smartdns: 46.1 -> 47 --- pkgs/by-name/sm/smartdns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smartdns/package.nix b/pkgs/by-name/sm/smartdns/package.nix index dcb20ec7015d..44f3fe7ad31c 100644 --- a/pkgs/by-name/sm/smartdns/package.nix +++ b/pkgs/by-name/sm/smartdns/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "46.1"; + version = "47"; src = fetchFromGitHub { owner = "pymumu"; repo = "smartdns"; rev = "Release${version}"; - hash = "sha256-IvaED1V1pP0/Qk2oND3fVr7PMXSnT9jFeuikEkndX0o="; + hash = "sha256-8OK1OV3Jvj/5nUOxnWTTQAa1Qe3RGxNwJhYEZ7O1RIE="; }; buildInputs = [ openssl ]; From ff9b3771b3d27596a3917e4a3d6654728707a24a Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 25 Sep 2025 16:13:29 +0300 Subject: [PATCH 0046/2279] unifdef: cleanup - replace `rec` with `finalAttrs` - remove `with lib;` from `meta` - replace `sha256` with `hash` nix hash to-sri --type sha256 "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3" sha256-Q84PAuzc3HI7JHVXVWPdsZLpiMiG02gmC8CmOu46xAA= --- pkgs/by-name/un/unifdef/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/un/unifdef/package.nix b/pkgs/by-name/un/unifdef/package.nix index 025fcc3bc356..ac4c84e882fe 100644 --- a/pkgs/by-name/un/unifdef/package.nix +++ b/pkgs/by-name/un/unifdef/package.nix @@ -4,13 +4,13 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unifdef"; version = "2.12"; src = fetchurl { - url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz"; - sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"; + url = "https://dotat.at/prog/unifdef/unifdef-${finalAttrs.version}.tar.xz"; + hash = "sha256-Q84PAuzc3HI7JHVXVWPdsZLpiMiG02gmC8CmOu46xAA="; }; patches = [ @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { "DESTDIR=" ]; - meta = with lib; { + meta = { homepage = "https://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.bsd2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ orivej ]; }; -} +}) From b78720e20c65c5f33ccadf88f5af0e8d4bb7e0b7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 25 Sep 2025 20:43:50 +0100 Subject: [PATCH 0047/2279] s2n-tls: 1.5.26 -> 1.5.27 Changes: https://github.com/aws/s2n-tls/releases/tag/v1.5.27 --- pkgs/by-name/s2/s2n-tls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix index f4d0276b9f25..3671fa7e321e 100644 --- a/pkgs/by-name/s2/s2n-tls/package.nix +++ b/pkgs/by-name/s2/s2n-tls/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.5.26"; + version = "1.5.27"; src = fetchFromGitHub { owner = "aws"; repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-6Py1ygHinx3n7k/hQN+85C57YXh7ag0OGYR+NOnx1rE="; + hash = "sha256-aJRw1a/XJivNZS3NkZ4U6nC12+wY/aoNv33mbAzNl0k="; }; nativeBuildInputs = [ cmake ]; From 30a9401ba05878145552f57ceae4654b67616f9e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 26 Sep 2025 06:45:10 +0100 Subject: [PATCH 0048/2279] cc-wrapper/add-hardening.sh: fix spelling of `stackclashprotection` hardening All hardening options have identical spelling to their names except the `stack-clash-protection`. As a result just copying it to `hardeningDisable` from the warning log does not work. Let's fix the discrepancy. --- pkgs/build-support/cc-wrapper/add-hardening.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 4fd6d4b32463..0e07c8d7e716 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -120,7 +120,7 @@ for flag in "${!hardeningEnableMap[@]}"; do hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; stackclashprotection) - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackclashprotection >&2; fi hardeningCFlagsBefore+=('-fstack-clash-protection') ;; nostrictaliasing) From 19c9c011200e0a60d29fddbeb211775b6549214c Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 26 Sep 2025 02:44:26 -0400 Subject: [PATCH 0049/2279] rsync: Remove `fakeroot` from `checkInputs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having `fakeroot` in `checkInputs` has the unfortunate side effect of making rsync depend on systemd, and by extension making the linux kernel depend on systemd. ``` $ nix why-depends --derivation --all -f . linux systemd.src /nix/store/ahnjzvyxn3jqaaqmhkrdxfimzd8m6yya-linux-6.12.48.drv └───/nix/store/07v98114pg0v4vb8xahdj6v488piy23r-rsync-3.4.1.drv └───/nix/store/70yyn9xwg3gkmdw7azal22wb8hp2lyxz-fakeroot-1.37.1.2.drv └───/nix/store/sac9bwghprnv77v8c65ljrwpr09c2wbi-libcap-2.76.drv └───/nix/store/9v3wirxpv9dzjkpr2swkgfwi78q0d72d-linux-pam-1.7.1.drv └───/nix/store/gfkzz6c2lhr73habq4x9ci7bj6jfgjgz-systemd-minimal-libs-257.9.drv └───/nix/store/kxpjbfihhzkm2dilaj4xxndxfwmbm98z-source.drv ``` My main goal is keep systemd updates from rebuilding the kernel, and admittedly the use of rsync in the kernel derivation is completely unnecessary. But I think, in its own right, removing the dependency of rsync on systemd is worthwhile. The consequence of this is that we have to skip two additional tests (out of the total of 46), namely the `chown` and `devices` tests. --- pkgs/applications/networking/sync/rsync/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index c38d5913d2ea..4dccabbf7fbf 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -19,7 +19,6 @@ enableZstd ? true, zstd, nixosTests, - fakeroot, }: stdenv.mkDerivation rec { @@ -58,9 +57,6 @@ stdenv.mkDerivation rec { ++ lib.optional enableOpenSSL openssl ++ lib.optional enableXXHash xxHash; - # fakeroot doesn't work well on darwin anymore, apparently - checkInputs = lib.optionals (!stdenv.isDarwin) [ fakeroot ]; - configureFlags = [ (lib.enableFeature enableLZ4 "lz4") (lib.enableFeature enableOpenSSL "openssl") From 5fa08e42156e851baf018373320c45b338b3a3a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Sep 2025 12:37:36 +0000 Subject: [PATCH 0050/2279] flat-remix-gnome: 20250413 -> 20250926 --- pkgs/by-name/fl/flat-remix-gnome/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix index a6eb2759aecc..0c2ed9709236 100644 --- a/pkgs/by-name/fl/flat-remix-gnome/package.nix +++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix @@ -8,18 +8,18 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20250413"; + version = "20250926"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix-gnome"; rev = version; - hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc="; + hash = "sha256-6K/BQqVOeDeJuUi0+NgCFeerX5sSy+nKapYxIQfbKFQ="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource From be4ece34f3f761af90a333162d85be87b0a4b27a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Sep 2025 07:38:07 +0000 Subject: [PATCH 0051/2279] makeself: 2.5.0 -> 2.6.0 --- pkgs/by-name/ma/makeself/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/makeself/package.nix b/pkgs/by-name/ma/makeself/package.nix index 3c329f6fc0cd..de6d35c66c14 100644 --- a/pkgs/by-name/ma/makeself/package.nix +++ b/pkgs/by-name/ma/makeself/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "makeself"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; tag = "release-${version}"; fetchSubmodules = true; - hash = "sha256-QPisihCGnzG9gaZyb/bUroWdPAoC2GdQiz1tSkoScjs="; + hash = "sha256-F5lx8B2C8CsEUXQPQTK1q8PAMf5yzIEAqq3zbYnseTs="; }; nativeBuildInputs = [ installShellFiles ]; From 5b621c249e32f4f4bd0aef7e9b7c33a3029f5a43 Mon Sep 17 00:00:00 2001 From: Pascal Jungblut Date: Sun, 20 Jul 2025 16:38:50 +0200 Subject: [PATCH 0052/2279] distcc: Add aarch64-darwin as a platform The platform was removed in 431141c, but it builds fine on current aarch64-darwin systems. --- pkgs/development/tools/misc/distcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index cc5a704dcef0..4e0df97cb35b 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -102,8 +102,8 @@ let homepage = "http://distcc.org"; license = "GPL"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ anderspapitto ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ pascalj ]; }; }; in From dae43f1d78609e281caf7c1d75b5e46bdabf339b Mon Sep 17 00:00:00 2001 From: Pascal Jungblut Date: Mon, 21 Jul 2025 22:02:46 +0200 Subject: [PATCH 0053/2279] distcc: Update license from string to gpl2Only --- pkgs/development/tools/misc/distcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 4e0df97cb35b..51541298b9bc 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -100,7 +100,7 @@ let meta = { description = "Fast, free distributed C/C++ compiler"; homepage = "http://distcc.org"; - license = "GPL"; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ pascalj ]; From 74ddb2ff68f8a4b9bb9f22d5d1d5da6f5e0c2a0f Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 26 Sep 2025 22:12:28 -0400 Subject: [PATCH 0054/2279] python3Packages.pynacl: 1.5.0 -> 1.6.0; adopt Diff: https://github.com/pyca/pynacl/compare/1.5.0...1.6.0 Changelog: https://github.com/pyca/pynacl/blob/1.6.0/CHANGELOG.rst#160-2025-09-11 I had to switch the fetcher to GitHub because the pypi fetcher requires that the url path be like /${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}, but the correct pypi URL for this version is this (case sensitive): https://files.pythonhosted.org/packages/source/P/PyNaCl/pynacl-1.6.0.tar.gz. Closes: #446500 --- .../python-modules/pynacl/default.nix | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 5f5b26a17acb..11a60e232336 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,62 +1,64 @@ { lib, buildPythonPackage, - fetchPypi, - fetchpatch2, - pytestCheckHook, - sphinxHook, - pythonOlder, - libsodium, cffi, + fetchFromGitHub, hypothesis, + libsodium, + pytestCheckHook, + pytest-xdist, + pythonOlder, + setuptools, + sphinxHook, }: buildPythonPackage rec { pname = "pynacl"; - version = "1.5.0"; + version = "1.6.0"; outputs = [ "out" "doc" ]; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit version; - pname = "PyNaCl"; - sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"; + src = fetchFromGitHub { + owner = "pyca"; + repo = "pynacl"; + tag = version; + hash = "sha256-7SDJB2bXn0IGJQi597yehs9epdfmS7slbQ97vFVUkEA="; }; - patches = [ - (fetchpatch2 { - # sphinx 8 compat - url = "https://github.com/pyca/pynacl/commit/81943b3c61b9cc731ae0f2e87b7a91e42fbc8fa1.patch"; - hash = "sha256-iO3pBqGW2zZE8lG8khpPjqJso9/rmFbdnwCcBs8iFeI="; - }) + build-system = [ + cffi + setuptools ]; + # cffi is listed in both build-system.requires and project.dependencies, + # and is indeed needed in both when cross-compiling + dependencies = [ cffi ]; + nativeBuildInputs = [ sphinxHook ]; buildInputs = [ libsodium ]; propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cffi ]; - nativeCheckInputs = [ hypothesis pytestCheckHook + pytest-xdist ]; - SODIUM_INSTALL = "system"; + env.SODIUM_INSTALL = "system"; pythonImportsCheck = [ "nacl" ]; - meta = with lib; { + meta = { description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } From 165c788c4416c486918ca0389bcd28f15a0658d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Sep 2025 18:17:39 +0200 Subject: [PATCH 0055/2279] python313Packages.types-setuptools: 80.9.0.20250801 -> 80.9.0.20250822 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 8fdcc17567d7..9aa1f469cf14 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "80.9.0.20250801"; + version = "80.9.0.20250822"; pyproject = true; src = fetchPypi { pname = "types_setuptools"; inherit version; - hash = "sha256-4ekmgvoHImQVOWu04tMfEWoW/75YOwWwH5kQ/N6jt+g="; + hash = "sha256-Bw6ncWlo7GeoTH93aNmVL/JNKLZbZZR5ekZPGzBm+WU="; }; nativeBuildInputs = [ setuptools ]; From 5994d191a5903fef62d811d7cf51d118838bc82c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 Sep 2025 16:55:41 +0200 Subject: [PATCH 0056/2279] python313Packages.simplejson: 3.20.1 -> 3.20.2 Diff: https://github.com/simplejson/simplejson/compare/v3.20.1...v3.20.2 Changelog: https://github.com/simplejson/simplejson/blob/v3.20.2/CHANGES.txt --- pkgs/development/python-modules/simplejson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 31e38d275587..3a360da09b07 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.20.1"; + version = "3.20.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "simplejson"; repo = "simplejson"; tag = "v${version}"; - hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas="; + hash = "sha256-err3NWljoC6MxJoFSYuqLHGKfDcst6ya7myP9XIRbFc="; }; nativeCheckInputs = [ pytestCheckHook ]; From b4b42aae30d8e089404d09869803063d5c3d98a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Sep 2025 22:09:01 +0200 Subject: [PATCH 0057/2279] python313Packages.types-requests: 2.32.4.20250809 -> 2.32.4.20250913 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 24a44fe5db08..3c202ae9f13b 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.4.20250611"; + version = "2.32.4.20250913"; pyproject = true; src = fetchPypi { pname = "types_requests"; inherit version; - hash = "sha256-dByHd+1kJYML9R5U1qviRfebTcuQGfFiK3c0Y5Rr+CY="; + hash = "sha256-q9bU+c46k4PyaXdamDWkwk5c1rn2R9ZPiKpGE8M9710="; }; build-system = [ setuptools ]; From 275f6c82702aea16ded904832cfba9c47c6c7399 Mon Sep 17 00:00:00 2001 From: Daniel Woffinden Date: Sun, 28 Sep 2025 13:33:49 +0100 Subject: [PATCH 0058/2279] python312Packages.regex: 2025.7.34 -> 2025.9.18 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 4de467cc8a8d..d63103093516 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "regex"; - version = "2025.7.34"; + version = "2025.9.18"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nq2XZSF6/QSoaCLfzU7SdH3+Qm6IfaQTsV/wrCRX4ho="; + hash = "sha256-xbojJ0xhxv70R7pqOTMyl9DCR/UwWdugvKQVysUR7cQ="; }; build-system = [ setuptools ]; From 369cc5c66b1efdbca2f136aa0055fedca1117304 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 27 Jun 2025 20:36:21 -0400 Subject: [PATCH 0059/2279] cc-wrapper: make availability warnings into errors --- pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 2b7cd00783a5..865e0d054820 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -35,3 +35,7 @@ elif [[ $0 != *cpp ]]; then extraBefore+=(-mabi=@explicitAbiValue@) fi fi + +if [[ "@darwinMinVersion@" ]]; then + extraBefore+=(-Werror=unguarded-availability) +fi From 204543831464590c5b16556b85397f1031ed0011 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 10:02:09 -0400 Subject: [PATCH 0060/2279] doc/stdenv/platform-notes: add section about availability checks --- doc/redirects.json | 3 +++ doc/stdenv/platform-notes.chapter.md | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/doc/redirects.json b/doc/redirects.json index 375ab08e9384..5301317ffb96 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -216,6 +216,9 @@ "sec-building-packages-with-llvm-using-clang-stdenv": [ "index.html#sec-building-packages-with-llvm-using-clang-stdenv" ], + "sec-darwin-availability-checks": [ + "index.html#sec-darwin-availability-checks" + ], "sec-darwin-libcxx-deployment-targets": [ "index.html#sec-darwin-libcxx-deployment-targets" ], diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index 06662bbc76fa..a6174b3e2008 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -47,6 +47,17 @@ See below for how to use a newer deployment target. For example, `std::print` depends on features that are only available on macOS 13.3 or newer. To make them available, set the deployment target to 13.3 using `darwinMinVersionHook`. +#### Package fails to build due to missing API availability checks {#sec-darwin-availability-checks} + +This is normally a bug in the package or a misconfigured deployment target. +* If it is using an API from a newer release (e.g., from macOS 26.0 while targeting macOS 14.0), it needs to use an availability check. + The code should be patched to use [`__builtin_available`](https://clang.llvm.org/docs/LanguageExtensions.html#objective-c-available). + Note that while the linked documentation is for Objective-C, it is applicable to C and C++ except that you use `__builtin_available` in place of `@available`. +* If the package intends to require the newer platform (i.e., it does not support running on older versions with reduced functionality), use `darwinMinVersionHook` to set the deployment target to the required version. + See below for how to use a newer deployment target. +* If the package actually handles this through some other mechanism (e.g., MoltenVK relies on the running platform’s MSL version), the error can be suppressed. + To suppress the error, add `-Wno-error=unguarded-availability` to `env.NIX_CFLAGS_COMPILE`. + #### Package requires a non-default SDK or fails to build due to missing frameworks or symbols {#sec-darwin-troubleshooting-using-sdks} In some cases, you may have to use a non-default SDK. From ed1bf3bb645ae9bda895a193016c5f28e67e01b5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 29 Jun 2025 10:28:21 -0400 Subject: [PATCH 0061/2279] moltenvk: use the nixpkgs deployment target instead of the hardcoded one --- pkgs/by-name/mo/moltenvk/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix index 576cab57fa59..69e7480aff5a 100644 --- a/pkgs/by-name/mo/moltenvk/package.nix +++ b/pkgs/by-name/mo/moltenvk/package.nix @@ -51,6 +51,13 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' + # Update the deployment target for the minimum target used by nixpkgs. + while IFS= read -d "" proj; do + echo "Updating deployment target to ${stdenv.hostPlatform.darwinMinVersion}: $proj" + substituteInPlace "$proj" \ + --replace-fail 'MACOSX_DEPLOYMENT_TARGET = 10.15' "MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET" + done < <(grep -Z -rl --include=project.pbxproj MACOSX_DEPLOYMENT_TARGET) + # Move `mvkGitRevDerived.h` to a stable location substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ --replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ From aef75df9ee709eb1db2ca118d037dc8dbba53db3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 29 Jun 2025 10:28:21 -0400 Subject: [PATCH 0062/2279] moltenvk: allow unchecked API usage MoltenVK does its own checks at runtime and varies API usage based on the MSL version, which obviates the need for availability checks. --- pkgs/by-name/mo/moltenvk/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix index 69e7480aff5a..d136a116e19c 100644 --- a/pkgs/by-name/mo/moltenvk/package.nix +++ b/pkgs/by-name/mo/moltenvk/package.nix @@ -98,7 +98,11 @@ stdenv.mkDerivation (finalAttrs: { ''; env.NIX_CFLAGS_COMPILE = toString ( - lib.optional (stdenv.cc.libcxx != null) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1" + # MoltenVK does its own checks for availability by probing the version at runtime and checking the MSL version. + [ "-Wno-error=unguarded-availability" ] + ++ lib.optional ( + stdenv.cc.libcxx != null + ) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1" ++ [ "-I${lib.getDev spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-headers}/include/spirv/unified1" From 0b3b48fb5f64058753ba82472fba306249d4065d Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Fri, 12 Sep 2025 17:33:36 -0700 Subject: [PATCH 0063/2279] {cc-wrapper,bintools-wrapper}: drop pie hardening flag We expect compilers to enable PIE by default via --enable-default-pie or similar. --- .../bintools-wrapper/add-hardening.sh | 12 +----- .../bintools-wrapper/default.nix | 19 +-------- .../build-support/cc-wrapper/add-hardening.sh | 11 +---- pkgs/stdenv/generic/make-derivation.nix | 9 +--- pkgs/test/cc-wrapper/hardening.nix | 41 ++----------------- 5 files changed, 8 insertions(+), 84 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index db9553c3fc76..6ce4faf1720b 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -15,7 +15,7 @@ for flag in @hardening_unsupported_flags@; do done if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -a allHardeningFlags=(pie relro bindnow) + declare -a allHardeningFlags=(relro bindnow) declare -A hardeningDisableMap=() # Determine which flags were effectively disabled so we can report below. @@ -36,16 +36,6 @@ fi for flag in "${!hardeningEnableMap[@]}"; do case $flag in - pie) - if [[ ! (" ${params[*]} " =~ " -shared " \ - || " ${params[*]} " =~ " -static " \ - || " ${params[*]} " =~ " -r " \ - || " ${params[*]} " =~ " -Ur " \ - || " ${params[*]} " =~ " -i ") ]]; then - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningLDFlags+=('-pie') - fi - ;; relro) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi hardeningLDFlags+=('-z' 'relro') diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 05f6980f0be4..d31879a86b00 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -55,24 +55,7 @@ "stackprotector" "strictoverflow" "zerocallusedregs" - ] - ++ lib.optional ( - with stdenvNoCC; - lib.any (x: x) [ - # OpenBSD static linking requires PIE - (with targetPlatform; isOpenBSD && isStatic) - (lib.all (x: x) [ - # Musl-based platforms will keep "pie", other platforms will not. - # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}` - # in the nixpkgs manual to inform users about the defaults. - (targetPlatform.libc == "musl") - # Except when: - # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. - # - static armv7l, where compilation fails. - (!(targetPlatform.isAarch && targetPlatform.isStatic)) - ]) - ] - ) "pie", + ], }: assert propagateDoc -> bintools ? man; diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 4fd6d4b32463..d254b139c996 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -52,7 +52,7 @@ fi if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pie pic strictoverflow glibcxxassertions format trivialautovarinit zerocallusedregs) + declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pic strictoverflow glibcxxassertions format trivialautovarinit zerocallusedregs) declare -A hardeningDisableMap=() # Determine which flags were effectively disabled so we can report below. @@ -127,15 +127,6 @@ for flag in "${!hardeningEnableMap[@]}"; do if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling nostrictaliasing >&2; fi hardeningCFlagsBefore+=('-fno-strict-aliasing') ;; - pie) - # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi - hardeningCFlagsBefore=('-fPIE' "${hardeningCFlagsBefore[@]}") - if [[ ! (" ${params[*]} " =~ " -shared " || " ${params[*]} " =~ " -static ") ]]; then - if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningCFlagsBefore=('-pie' "${hardeningCFlagsBefore[@]}") - fi - ;; pic) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi hardeningCFlagsBefore+=('-fPIC') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 7cd7257db484..3632a3007ab1 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -225,14 +225,7 @@ let canExecuteHostOnBuild = buildPlatform.canExecute hostPlatform; defaultHardeningFlags = - (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or - # fallback safe-ish set of flags - ( - if isOpenBSD && isStatic then - knownHardeningFlags # Need pie, in fact - else - remove "pie" knownHardeningFlags - ); + (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or knownHardeningFlags; stdenvHostSuffix = optionalString (hostPlatform != buildPlatform) "-${hostPlatform.config}"; stdenvStaticMarker = optionalString isStatic "-static"; userHook = config.stdenv.userHook or null; diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix index f3e8d38d0ee8..d224c1fd460c 100644 --- a/pkgs/test/cc-wrapper/hardening.nix +++ b/pkgs/test/cc-wrapper/hardening.nix @@ -455,25 +455,10 @@ nameDrvAfterAttrName ( ) ); - pieExplicitEnabled = brokenIf stdenv.hostPlatform.isStatic ( - checkTestBin - (f2exampleWithStdEnv stdenv { - hardeningEnable = [ "pie" ]; - }) - { - ignorePie = false; - } - ); - - pieExplicitEnabledStructuredAttrs = brokenIf stdenv.hostPlatform.isStatic ( - checkTestBin - (f2exampleWithStdEnv stdenv { - hardeningEnable = [ "pie" ]; - __structuredAttrs = true; - }) - { - ignorePie = false; - } + pieAlwaysEnabled = brokenIf stdenv.hostPlatform.isStatic ( + checkTestBin (f2exampleWithStdEnv stdenv { }) { + ignorePie = false; + } ); relROExplicitEnabled = @@ -662,17 +647,6 @@ nameDrvAfterAttrName ( ) ); - pieExplicitDisabled = brokenIf (stdenv.hostPlatform.isMusl && stdenv.cc.isClang) ( - checkTestBin - (f2exampleWithStdEnv stdenv { - hardeningDisable = [ "pie" ]; - }) - { - ignorePie = false; - expectFailure = true; - } - ); - # can't force-disable ("partial"?) relro relROExplicitDisabled = brokenIf true ( checkTestBin @@ -1101,13 +1075,6 @@ nameDrvAfterAttrName ( expectFailure = true; }; - allExplicitDisabledPie = brokenIf (stdenv.hostPlatform.isMusl && stdenv.cc.isClang) ( - checkTestBin tb { - ignorePie = false; - expectFailure = true; - } - ); - # can't force-disable ("partial"?) relro allExplicitDisabledRelRO = brokenIf true ( checkTestBin tb { From 834e9652c3a8027ba7b919ad8696b50e1dbb310e Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 14 Sep 2025 12:56:03 -0700 Subject: [PATCH 0064/2279] doc: drop pie flag from sec-hardening-in-nixpkgs --- doc/redirects.json | 6 ++---- doc/stdenv/stdenv.chapter.md | 13 ------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/doc/redirects.json b/doc/redirects.json index 375ab08e9384..438f5f47ad37 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -1190,7 +1190,8 @@ "index.html#sec-purity-in-nixpkgs" ], "sec-hardening-in-nixpkgs": [ - "index.html#sec-hardening-in-nixpkgs" + "index.html#sec-hardening-in-nixpkgs", + "index.html#pie" ], "sec-hardening-flags-enabled-by-default": [ "index.html#sec-hardening-flags-enabled-by-default" @@ -1225,9 +1226,6 @@ "sec-hardening-flags-disabled-by-default": [ "index.html#sec-hardening-flags-disabled-by-default" ], - "pie": [ - "index.html#pie" - ], "shadowstack": [ "index.html#shadowstack" ], diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 24536c35b2c3..dc49e205a68f 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1631,19 +1631,6 @@ The following flags are disabled by default and should be enabled with `hardenin This flag adds the `-fno-strict-aliasing` compiler option, which prevents the compiler from assuming code has been written strictly following the standard in regards to pointer aliasing and therefore performing optimizations that may be unsafe for code that has not followed these rules. -#### `pie` {#pie} - -This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for - - - `musl`-based package builds, except on Aarch64 and Aarch32, where there are issues. - - - Statically-linked for OpenBSD builds, where it appears to be required to get a working binary. - -Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. - -Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option. -If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`. - #### `strictflexarrays1` {#strictflexarrays1} This flag adds the `-fstrict-flex-arrays=1` compiler option, which reduces the cases the compiler treats as "flexible arrays" to those declared with length `[1]`, `[0]` or (the correct) `[]`. This increases the coverage of fortify checks, because such arrays declared as the trailing element of a structure can normally not have their intended length determined by the compiler. From 77b971e32c409737d581a9df1847d3559e63de83 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 14 Sep 2025 12:59:42 -0700 Subject: [PATCH 0065/2279] doc/rl-2511: note removal of pie hardening flag --- doc/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1c5df5f5e99e..7d5ed3e5066e 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -88,6 +88,8 @@ - `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`. +- the "pie" hardening flag has been removed. compilers are expected to enable PIE by default, as has been common practice since 2016 outside of nixpkgs. If a package needs "pie" disabled pass `-no-pie` in `CFLAGS`. It is unlikely this will be necessary in many cases; due to the prevalance of default PIE toolchains most packages incompatible with PIE already pass no-pie. + - `cudaPackages.cudatoolkit-legacy-runfile` has been removed. - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible. From 4284a14ef78f372ad11a698ec1bb3c29e8a39dc7 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 30 Sep 2025 09:20:01 -0700 Subject: [PATCH 0066/2279] tests.cc-wrapper: regression test for fuse-ld=gold In #49071 fuse-ld=gold was broken in pkgsMusl. Adds a test that fuse-ld=gold works in cc-wrapper so pkgsMusl.tests.cc-wrapper.default can be used to verify this has not regressed. --- pkgs/test/cc-wrapper/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 8d1bdbf3fed1..9dc3413f0e04 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation { '' } + ${ + # Check whether fuse-ld=gold works on our GNU toolchain + # Regression test for https://github.com/NixOS/nixpkgs/issues/49071 + lib.optionalString stdenv.cc.isGNU '' + echo "checking whether compiler builds valid C binaries... " >&2 + CFLAGS="-fuse-ld=gold" ${CC} -o cc-check ${./cc-main.c} + ${emulator} ./cc-check + '' + } + echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 mkdir -p foo/include cp ${./foo.c} foo/include/foo.h From bd20de7a55f70bf3e5a35c3caa1f08d840b568be Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 30 Sep 2025 19:05:41 +0200 Subject: [PATCH 0067/2279] openjpeg: 2.5.2 -> 2.5.4 --- pkgs/by-name/op/openjpeg/package.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix index e747f18bc11d..f227e685aa0c 100644 --- a/pkgs/by-name/op/openjpeg/package.nix +++ b/pkgs/by-name/op/openjpeg/package.nix @@ -34,36 +34,21 @@ let test-data = fetchFromGitHub { owner = "uclouvain"; repo = "openjpeg-data"; - rev = "a428429db695fccfc6d698bd13b6937dffd9d005"; - hash = "sha256-udUi7sPNQJ5uCIAM8SqMGee6vRj1QbF9pLjdpNTQE5k="; + rev = "39524bd3a601d90ed8e0177559400d23945f96a9"; + hash = "sha256-ckZHCZV5UJicVUoi/mZDwvCJneXC3X+NA8Byp6GLE0w="; }; in stdenv.mkDerivation rec { pname = "openjpeg"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitHub { owner = "uclouvain"; repo = "openjpeg"; rev = "v${version}"; - hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw="; + hash = "sha256-HSXGdpHUbwlYy5a+zKpcLo2d+b507Qf5nsaMghVBlZ8="; }; - patches = [ - (fetchpatch { - # https://github.com/uclouvain/openjpeg/issues/1564 - name = "CVE-2024-56826_ISSUE1564.patch"; - url = "https://github.com/uclouvain/openjpeg/commit/e492644fbded4c820ca55b5e50e598d346e850e8.patch"; - hash = "sha256-v+odu4/MXRA+RKOlPO+m/Xk66BMH6mOcEN4ScHn3VAo="; - }) - (fetchpatch { - # https://github.com/uclouvain/openjpeg/issues/1563 - name = "CVE-2024-56826_ISSUE1563.patch"; - url = "https://github.com/uclouvain/openjpeg/commit/98592ee6d6904f1b48e8207238779b89a63befa2.patch"; - hash = "sha256-1ScnEZAPuvclyRME5kbeo7dBMG31Njs5CaYC4sGyx08="; - }) - ]; - outputs = [ "out" "dev" From fddc3385c5cde20933f6228bc6d9d475f7c687c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Oct 2025 21:39:28 +0000 Subject: [PATCH 0068/2279] python3Packages.ollama: 0.5.3 -> 0.6.0 --- pkgs/development/python-modules/ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 684091aa6049..cee610f3b5ba 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.5.3"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ollama"; repo = "ollama-python"; tag = "v${version}"; - hash = "sha256-QpG8bo6tarhW4NpdD4MQ9DWR/w8KjT2zEQyirYtTjJ0="; + hash = "sha256-4GvONxyv3/+mago/AHp5zbfoiKskKxiDZR1h+OhVbPU="; }; pythonRelaxDeps = [ "httpx" ]; From f994b346a07dff60c9ab170c1f0028ed715e0274 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 3 Oct 2025 12:33:34 +0800 Subject: [PATCH 0069/2279] python: fix venv creation --- .../interpreters/python/wrapper.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 6b6f97b74f3d..55e86a8b9c36 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -2,6 +2,7 @@ lib, stdenv, buildEnv, + runCommand, makeBinaryWrapper, # manually pased @@ -22,7 +23,11 @@ let env = let - paths = requiredPythonModules (extraLibs ++ [ python ]); + paths = requiredPythonModules (extraLibs ++ [ python ]) ++ [ + (runCommand "bin" { } '' + mkdir -p $out/bin + '') + ]; pythonPath = "${placeholder "out"}/${python.sitePackages}"; pythonExecutable = "${placeholder "out"}/bin/${python.executable}"; in @@ -36,21 +41,26 @@ let nativeBuildInputs = [ makeBinaryWrapper ]; postBuild = '' - if [ -L "$out/bin" ]; then - unlink "$out/bin" - fi - mkdir -p "$out/bin" - for path in ${lib.concatStringsSep " " paths}; do if [ -d "$path/bin" ]; then cd "$path/bin" for prg in *; do - if [ -f "$prg" ]; then + if [ -f "$prg" ] && [ -x "$prg" ]; then rm -f "$out/bin/$prg" - if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${ - lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"'' - } ${lib.concatStringsSep " " makeWrapperArgs} + if [ "$prg" = "${python.executable}" ]; then + makeWrapper "${python.interpreter}" "$out/bin/$prg" \ + --inherit-argv0 \ + ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \ + ${lib.concatStringsSep " " makeWrapperArgs} + elif [ "$(readlink "$prg")" = "${python.executable}" ]; then + ln -s "${python.executable}" "$out/bin/$prg" + else + makeWrapper "$path/bin/$prg" "$out/bin/$prg" \ + --set NIX_PYTHONPREFIX "$out" \ + --set NIX_PYTHONEXECUTABLE ${pythonExecutable} \ + --set NIX_PYTHONPATH ${pythonPath} \ + ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \ + ${lib.concatStringsSep " " makeWrapperArgs} fi fi done From 148e17cfc3a9a09fe58524fc63b3f40f2faac657 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Oct 2025 04:57:09 +0000 Subject: [PATCH 0070/2279] autobase: 7.19.2 -> 7.20.0 --- pkgs/by-name/au/autobase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix index 8ebad595c3e3..a5d7ad5d8723 100644 --- a/pkgs/by-name/au/autobase/package.nix +++ b/pkgs/by-name/au/autobase/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "autobase"; - version = "7.19.2"; + version = "7.20.0"; src = fetchFromGitHub { owner = "holepunchto"; repo = "autobase"; tag = "v${finalAttrs.version}"; - hash = "sha256-IsqpVx7GFcbIouIAoLHiHLivE6RCzehW1TTmYC6SDgw="; + hash = "sha256-SEeCbNja5BIgpQh0q0LKo452JClKQe6do5YHwRRBMcs="; }; npmDepsHash = "sha256-H9Xy1VD7WQvi0+86v6CMcmc0L3mB6KuSCtgQSF4AlkY="; From 2e6b498101477d203b5a5475cf78f3a14dc35828 Mon Sep 17 00:00:00 2001 From: bubblepipe42 Date: Fri, 3 Oct 2025 16:30:06 +0800 Subject: [PATCH 0071/2279] wamrc: init at 2.3.1 --- pkgs/by-name/wa/wamrc/package.nix | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/wa/wamrc/package.nix diff --git a/pkgs/by-name/wa/wamrc/package.nix b/pkgs/by-name/wa/wamrc/package.nix new file mode 100644 index 000000000000..f2143da08c18 --- /dev/null +++ b/pkgs/by-name/wa/wamrc/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + llvmPackages, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wamrc"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "bytecodealliance"; + repo = "wasm-micro-runtime"; + tag = "WAMR-${finalAttrs.version}"; + hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + llvmPackages.llvm + ]; + + cmakeFlags = + lib.optionals stdenv.hostPlatform.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" + ] + ++ [ + "-DWAMR_BUILD_WITH_CUSTOM_LLVM=ON" + "-DLLVM_DIR=${llvmPackages.llvm.dev}/lib/cmake/llvm" + ]; + + sourceRoot = "${finalAttrs.src.name}/wamr-compiler"; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=WAMR-(.*)" ]; }; + + meta = { + description = "WebAssembly Micro Runtime AOT compiler"; + homepage = "https://github.com/bytecodealliance/wasm-micro-runtime"; + license = lib.licenses.asl20; + mainProgram = "wamrc"; + maintainers = with lib.maintainers; [ bubblepipe ]; + platforms = lib.platforms.unix; + }; +}) From 06c673e201c0841ee75fcbd68966c413a70331c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Oct 2025 19:06:38 +0000 Subject: [PATCH 0072/2279] questdb: 9.0.3 -> 9.1.0 --- pkgs/by-name/qu/questdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix index 90d33fe895fb..897e32a43797 100644 --- a/pkgs/by-name/qu/questdb/package.nix +++ b/pkgs/by-name/qu/questdb/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "9.0.3"; + version = "9.1.0"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-/EkqBK/mero219VUylNLVGD1ZzxBMAYpJ7NcU7BC+aw="; + hash = "sha256-bgeNZi0VonO+L9Vww5n6e0ZOLl9MTXnNe2kPLttbw1c="; }; nativeBuildInputs = [ From b538e81bb4a1c48cc5e01e108f6c8f3145418728 Mon Sep 17 00:00:00 2001 From: Matt Leon Date: Sun, 28 Sep 2025 15:32:25 -0400 Subject: [PATCH 0073/2279] python-matter-server: bundle dashboard Fixes https://github.com/NixOS/nixpkgs/issues/446702. Signed-off-by: Matt Leon --- .../manual/release-notes/rl-2511.section.md | 2 + .../home-automation/matter-server.nix | 8 ++ nixos/tests/matter-server.nix | 4 + .../python-matter-server/default.nix | 80 ++++++++++++++++--- 4 files changed, 83 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 517beed6d0a4..7c21d8bb8513 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -364,6 +364,8 @@ - `services.xserver.desktopManager.deepin` and associated packages have been removed due to being unmaintained. See issue [#422090](https://github.com/NixOS/nixpkgs/issues/422090) for more details. +- `services.matter-server` now hosts a debug dashboard on the configured port. Open the port on the firewall with `services.matter-server.openFirewall`. + - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip). With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation. diff --git a/nixos/modules/services/home-automation/matter-server.nix b/nixos/modules/services/home-automation/matter-server.nix index a0ff6ad33490..8231d108d135 100644 --- a/nixos/modules/services/home-automation/matter-server.nix +++ b/nixos/modules/services/home-automation/matter-server.nix @@ -25,6 +25,12 @@ in description = "Port to expose the matter-server service on."; }; + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to open the port in the firewall."; + }; + logLevel = lib.mkOption { type = lib.types.enum [ "critical" @@ -48,6 +54,8 @@ in }; config = lib.mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ]; + systemd.services.matter-server = { after = [ "network-online.target" ]; before = [ "home-assistant.service" ]; diff --git a/nixos/tests/matter-server.nix b/nixos/tests/matter-server.nix index 167cee21e07b..6d919850f3ce 100644 --- a/nixos/tests/matter-server.nix +++ b/nixos/tests/matter-server.nix @@ -16,6 +16,7 @@ in services.matter-server = { enable = true; port = 1234; + openFirewall = true; }; }; }; @@ -43,6 +44,9 @@ in with subtest("Check storage directory is created"): machine.succeed("ls /var/lib/matter-server/chip.json") + with subtest("Check dashboard loads"): + machine.succeed("curl -f 127.0.0.1:1234") + with subtest("Check systemd hardening"): _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'") machine.log(output) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 6a7e0ca388a3..cd72b8277920 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -5,6 +5,8 @@ pythonOlder, stdenvNoCC, replaceVars, + buildNpmPackage, + python, # build setuptools, @@ -24,14 +26,25 @@ # tests aioresponses, - python, pytest, pytest-aiohttp, pytest-cov-stub, pytestCheckHook, + + # build options + withDashboard ? true, }: let + version = "8.1.1"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "python-matter-server"; + tag = version; + hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA="; + }; + paaCerts = stdenvNoCC.mkDerivation rec { pname = "matter-server-paa-certificates"; version = "1.4.0.0"; @@ -52,22 +65,63 @@ let runHook postInstall ''; }; -in + # Maintainer note: building the dashboard requires a python environment with a + # built version of python-matter-server. To support bundling the dashboard + # with the python-matter-server, the build is parameterized to build without + # a dependency on the dashboard, breaking a cyclical dependency. First, + # python-matter-server is built without the dashboard, then the dashboard is + # built, then python-matter-server is built again with the dashboard. + matterServerDashboard = + let + pythonWithChip = python.withPackages (ps: [ + ps.home-assistant-chip-clusters + (ps.python-matter-server.override { withDashboard = false; }) + ]); + in + buildNpmPackage { + pname = "python-matter-server-dashboard"; + inherit src version; + + npmDepsHash = "sha256-IgI1H3VlTq66duplVQqL67SpgxPF2MOowDn+ICMXCik="; + + prePatch = '' + ${pythonWithChip.interpreter} scripts/generate_descriptions.py + + # cd before the patch phase sets up the npm install hook to find the + # package.json. The script would need to be patched in order to be used + # with sourceRoot. + cd "dashboard" + ''; + + # This package does not contain a normal `npm build` step. + buildPhase = '' + env NODE_ENV=production npm exec -- tsc + env NODE_ENV=production npm exec -- rollup -c + ''; + + installPhase = '' + runHook preInstall + + install -Dt "$out/" public/* + # Copy recursive directory structure, which install does not do. + cp -r dist/web/* "$out/" + + runHook postInstall + ''; + }; +in buildPythonPackage rec { - pname = "python-matter-server"; - version = "8.1.1"; + pname = if withDashboard then "python-matter-server" else "python-matter-server-without-dashboard"; + inherit + src + version + ; + pyproject = true; disabled = pythonOlder "3.12"; - src = fetchFromGitHub { - owner = "home-assistant-libs"; - repo = "python-matter-server"; - tag = version; - hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA="; - }; - patches = [ (replaceVars ./link-paa-root-certs.patch { paacerts = paaCerts; @@ -77,6 +131,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'version = "0.0.0"' 'version = "${version}"' + '' + + lib.optionalString withDashboard '' + substituteInPlace "matter_server/server/server.py" \ + --replace-fail 'Path(__file__).parent.joinpath("../dashboard/")' 'Path("${matterServerDashboard}")' ''; build-system = [ From 9d4bbcda3a043d64546b6179a8fd5584bc46d03c Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Fri, 18 Jul 2025 16:48:35 -0700 Subject: [PATCH 0074/2279] phira{,-unwrapped,-free}: init at 0.6.7 --- pkgs/by-name/ph/phira-free/package.nix | 32 +++++ pkgs/by-name/ph/phira-unwrapped/assets.patch | 19 +++ pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch | 119 ++++++++++++++++++ pkgs/by-name/ph/phira-unwrapped/package.nix | 87 +++++++++++++ .../ph/phira-unwrapped/stable-features.patch | 10 ++ pkgs/by-name/ph/phira-unwrapped/tracing.patch | 24 ++++ pkgs/by-name/ph/phira/package.nix | 51 ++++++++ 7 files changed, 342 insertions(+) create mode 100644 pkgs/by-name/ph/phira-free/package.nix create mode 100644 pkgs/by-name/ph/phira-unwrapped/assets.patch create mode 100644 pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch create mode 100644 pkgs/by-name/ph/phira-unwrapped/package.nix create mode 100644 pkgs/by-name/ph/phira-unwrapped/stable-features.patch create mode 100644 pkgs/by-name/ph/phira-unwrapped/tracing.patch create mode 100644 pkgs/by-name/ph/phira/package.nix diff --git a/pkgs/by-name/ph/phira-free/package.nix b/pkgs/by-name/ph/phira-free/package.nix new file mode 100644 index 000000000000..3cc205396a2e --- /dev/null +++ b/pkgs/by-name/ph/phira-free/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenvNoCC, + phira, + phira-unwrapped, + imagemagick, + ubuntu-classic, +}: + +phira.override { + overrideAssets = stdenvNoCC.mkDerivation { + pname = "phira-assets"; + version = phira.version; + + nativeBuildInputs = [ imagemagick ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ${phira-unwrapped.src}/assets $out + chmod -R +w $out/assets + + magick -size 4000x2000 canvas:'rgb(128,162,206)' $out/assets/background.jpg + cp ${ubuntu-classic}/share/fonts/truetype/ubuntu/Ubuntu-R.ttf $out/assets/font.ttf + + runHook postInstall + ''; + }; +} diff --git a/pkgs/by-name/ph/phira-unwrapped/assets.patch b/pkgs/by-name/ph/phira-unwrapped/assets.patch new file mode 100644 index 000000000000..eeb26be0b563 --- /dev/null +++ b/pkgs/by-name/ph/phira-unwrapped/assets.patch @@ -0,0 +1,19 @@ +diff --git a/prpr/src/core.rs b/prpr/src/core.rs +index 7f9d4db..33c44bb 100644 +--- a/prpr/src/core.rs ++++ b/prpr/src/core.rs +@@ -68,6 +68,14 @@ thread_local! { + } + + pub fn init_assets() { ++ if let Ok(root_path) = std::env::var("PHIRA_ROOT") { ++ let path = std::path::Path::new(&root_path); ++ if path.exists() { ++ std::env::set_current_dir(path).unwrap(); ++ set_pc_assets_folder("assets"); ++ return; ++ } ++ } + if let Ok(mut exe) = std::env::current_exe() { + while exe.pop() { + if exe.join("assets").exists() { diff --git a/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch new file mode 100644 index 000000000000..70912ebdb111 --- /dev/null +++ b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch @@ -0,0 +1,119 @@ +diff --git a/prpr-avc/Cargo.toml b/prpr-avc/Cargo.toml +index 257c575..bf35b10 100644 +--- a/prpr-avc/Cargo.toml ++++ b/prpr-avc/Cargo.toml +@@ -9,3 +9,6 @@ edition = "2021" + sasa = { git = "https://github.com/Mivik/sasa", default-features = false } + thiserror = "1.0.56" + tracing = "0.1.37" ++ ++[build-dependencies] ++pkg-config = "0.3" +diff --git a/prpr-avc/build.rs b/prpr-avc/build.rs +index 961b032..6d0b714 100644 +--- a/prpr-avc/build.rs ++++ b/prpr-avc/build.rs +@@ -1,10 +1,7 @@ + use std::path::Path; + + fn main() { +- let libs_dir = std::env::var("PRPR_AVC_LIBS").unwrap_or_else(|_| format!("{}/static-lib", std::env::var("CARGO_MANIFEST_DIR").unwrap())); +- let libs_path = Path::new(&libs_dir).join(std::env::var("TARGET").unwrap()); +- let libs_path = libs_path.display(); +- println!("cargo:rustc-link-search={libs_path}"); +- println!("cargo:rustc-link-lib=z"); +- println!("cargo:rerun-if-changed={libs_path}"); ++ for lib in ["libavformat", "libavcodec", "libavutil", "libswscale", "libswresample"] { ++ let _ = pkg_config::Config::new().statik(false).probe(lib); ++ } + } +diff --git a/prpr-avc/src/ffi.rs b/prpr-avc/src/ffi.rs +index 8218ef3..a2c7f6a 100644 +--- a/prpr-avc/src/ffi.rs ++++ b/prpr-avc/src/ffi.rs +@@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3; + + pub const AV_ROUND_UP: AVRounding = 0; + +-#[link(name = "avformat", kind = "static")] + extern "C" { + pub fn avformat_alloc_context() -> *mut AVFormatContext; + pub fn avformat_free_context(s: *mut AVFormatContext); +@@ -20,7 +19,6 @@ extern "C" { + pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int; + } + +-#[link(name = "avutil", kind = "static")] + extern "C" { + pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int; + pub fn av_frame_alloc() -> *mut AVFrame; +@@ -29,7 +27,6 @@ extern "C" { + pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64; + } + +-#[link(name = "avcodec", kind = "static")] + extern "C" { + pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec; + pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext; +@@ -43,7 +40,6 @@ extern "C" { + pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat; + } + +-#[link(name = "swscale", kind = "static")] + extern "C" { + pub fn sws_getContext( + srcW: ::std::os::raw::c_int, +@@ -68,10 +64,9 @@ extern "C" { + ) -> ::std::os::raw::c_int; + } + +-#[link(name = "swresample", kind = "static")] + extern "C" { +- pub fn swr_alloc_set_opts( +- s: *mut SwrContext, ++ pub fn swr_alloc_set_opts2( ++ ps: *mut *mut SwrContext, + out_ch_layout: i64, + out_sample_fmt: AVSampleFormat, + out_sample_rate: ::std::os::raw::c_int, +@@ -80,7 +75,7 @@ extern "C" { + in_sample_rate: ::std::os::raw::c_int, + log_offset: ::std::os::raw::c_int, + log_ctx: *mut ::std::os::raw::c_void, +- ) -> *mut SwrContext; ++ ) -> ::std::os::raw::c_int; + pub fn swr_init(s: *mut SwrContext) -> ::std::os::raw::c_int; + pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64; + pub fn swr_convert( +diff --git a/prpr-avc/src/swr.rs b/prpr-avc/src/swr.rs +index 7288a51..c00b874 100644 +--- a/prpr-avc/src/swr.rs ++++ b/prpr-avc/src/swr.rs +@@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr); + impl SwrContext { + pub fn new(in_format: &AudioStreamFormat, out_format: &AudioStreamFormat) -> Result { + unsafe { +- OwnedPtr::new(ffi::swr_alloc_set_opts( +- null_mut(), ++ let mut raw: *mut ffi::SwrContext = null_mut(); ++ let ret = ffi::swr_alloc_set_opts2( ++ &mut raw, + out_format.channel_layout as _, + out_format.sample_fmt, + out_format.sample_rate, +@@ -15,9 +16,12 @@ impl SwrContext { + in_format.sample_rate, + 0, + null_mut(), +- )) +- .map(|ctx| Self(ctx)) +- .ok_or(Error::AllocationFailed) ++ ); ++ if ret < 0 || raw.is_null() { ++ Err(Error::AllocationFailed) ++ } else { ++ OwnedPtr::new(raw).map(|ctx| Self(ctx)).ok_or(Error::AllocationFailed) ++ } + } + } + diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix new file mode 100644 index 000000000000..0aaeb78b1638 --- /dev/null +++ b/pkgs/by-name/ph/phira-unwrapped/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeDesktopItem, + copyDesktopItems, + rustPlatform, + pkg-config, + perl, + ffmpeg, + alsa-lib, + gtk3, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "phira-unwrapped"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "TeamFlos"; + repo = "phira"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4WIvLfKeh+quu7dHKMlUKt+NQnui2/txlFYZoU3voPA="; + }; + + nativeBuildInputs = [ + pkg-config + perl + copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + rustPlatform.bindgenHook # for crate coreaudio-sys + ]; + + buildInputs = [ + ffmpeg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # for crate alsa-sys + gtk3 # for crate gtk-sys + ]; + + patches = [ + # use dynamically linked ffmpeg instead of expecting static lib + ./ffmpeg.patch + + # error[E0554]: `#![feature]` may not be used on the stable release channel + ./stable-features.patch + + # missing macro from tracing crate + ./tracing.patch + + # allow using env var to specify location of assets and data + ./assets.patch + ]; + + cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI="; + + # The developer put assets necessary for this test in gitignore, so it cannot run. + checkFlags = [ "--skip test_parse_chart" ]; + + desktopItems = [ + (makeDesktopItem { + name = "phira"; + desktopName = "Phira"; + exec = "phira-main"; + icon = "phira"; + comment = finalAttrs.meta.description; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + install -Dm644 assets/icon.png $out/share/icons/hicolor/128x128/apps/phira.png + ''; + + meta = { + description = "Rhythm game with custom charts and multiplayer"; + homepage = "https://github.com/TeamFlos/phira"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ulysseszhan ]; + changelog = "https://github.com/TeamFlos/phira/releases/tag/v${finalAttrs.version}"; + platforms = lib.platforms.unix; + mainProgram = "phira-main"; + }; + +}) diff --git a/pkgs/by-name/ph/phira-unwrapped/stable-features.patch b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch new file mode 100644 index 000000000000..9aac943305b1 --- /dev/null +++ b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch @@ -0,0 +1,10 @@ +diff --git a/prpr/src/lib.rs b/prpr/src/lib.rs +index 15a139f..6b4e469 100644 +--- a/prpr/src/lib.rs ++++ b/prpr/src/lib.rs +@@ -1,5 +1,3 @@ +-#![feature(local_key_cell_methods)] +- + pub mod bin; + pub mod config; + pub mod core; diff --git a/pkgs/by-name/ph/phira-unwrapped/tracing.patch b/pkgs/by-name/ph/phira-unwrapped/tracing.patch new file mode 100644 index 000000000000..d1366f439f73 --- /dev/null +++ b/pkgs/by-name/ph/phira-unwrapped/tracing.patch @@ -0,0 +1,24 @@ +diff --git a/phira-monitor/Cargo.toml b/phira-monitor/Cargo.toml +index 722a022..899b7db 100644 +--- a/phira-monitor/Cargo.toml ++++ b/phira-monitor/Cargo.toml +@@ -15,6 +15,7 @@ serde = { version = "*", features = ["derive"] } + serde_yaml = "*" + tokio = { workspace = true } + uuid = { version = "1.4.0", features = ["v4"] } ++tracing = "0.1" + + phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" } + phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" } +diff --git a/phira-monitor/src/main.rs b/phira-monitor/src/main.rs +index 61bcfba..a4bf8af 100644 +--- a/phira-monitor/src/main.rs ++++ b/phira-monitor/src/main.rs +@@ -14,6 +14,7 @@ use prpr::{ + use scene::MainScene; + use serde::Deserialize; + use std::fs::File; ++use tracing::warn; + + mod dir { + use anyhow::Result; diff --git a/pkgs/by-name/ph/phira/package.nix b/pkgs/by-name/ph/phira/package.nix new file mode 100644 index 000000000000..3fb1d9098adc --- /dev/null +++ b/pkgs/by-name/ph/phira/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + symlinkJoin, + fetchzip, + phira-unwrapped, + makeWrapper, + libGL, + # A derivation or a path that contains a dir `assets`. + overrideAssets ? fetchzip { + url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-v${phira-unwrapped.version}.zip"; + hash = "sha256-kgmIIIzg+wxyspQTyW1GucW0RVPfBhIRlK5DEGXK1Qs="; + stripRoot = false; + meta.license = lib.licenses.unfree; + }, +}: + +symlinkJoin { + pname = "phira"; + version = phira-unwrapped.version; + + paths = [ phira-unwrapped ]; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + phira_root=$out/share/phira + mkdir -p $phira_root + cp -r ${overrideAssets}/assets $phira_root + + wrapper_options=( + ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"} + --run ' + export PHIRA_ROOT=''${PHIRA_ROOT-"''${XDG_DATA_HOME-"$HOME/.local/share"}/phira"} + if [[ ! -d "$PHIRA_ROOT/assets" ]]; then + mkdir -p "$PHIRA_ROOT" + cp -r "'$phira_root/assets'" "$PHIRA_ROOT" + chmod -R +w "$PHIRA_ROOT/assets" + fi + ' + ) + + wrapProgram $out/bin/phira-main "''${wrapper_options[@]}" + wrapProgram $out/bin/phira-monitor "''${wrapper_options[@]}" + ''; + + passthru.assets = overrideAssets; + + meta = phira-unwrapped.meta; + +} From ec87d448408c221229690c595dcaf3346ec67b1d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 4 Oct 2025 19:21:22 +0200 Subject: [PATCH 0075/2279] openexr: Disable known-broken tests on big-endian --- pkgs/development/libraries/openexr/3.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index b07b4ccb711e..6729fb07a69d 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, cmake, + ctestCheckHook, imath, libdeflate, pkg-config, @@ -50,6 +51,9 @@ stdenv.mkDerivation rec { imath libdeflate ]; + nativeCheckInputs = [ + ctestCheckHook + ]; # Without 'sse' enforcement tests fail on i686 as due to excessive precision as: # error reading back channel B pixel 21,-76 got -nan expected -nan @@ -58,6 +62,24 @@ stdenv.mkDerivation rec { # https://github.com/AcademySoftwareFoundation/openexr/issues/1400 doCheck = !stdenv.hostPlatform.isAarch32; + disabledTests = lib.optionals stdenv.hostPlatform.isBigEndian [ + # https://github.com/AcademySoftwareFoundation/openexr/issues/1175 + # Not sure if these issues are specific to the tests, or if openexr in general is borked on big-endian. + # Optimistically assuming the former here. + "OpenEXRCore.testReadDeep" + "OpenEXRCore.testDWATable" + "OpenEXRCore.testDWAACompression" + "OpenEXRCore.testDWABCompression" + "OpenEXR.testAttributes" + "OpenEXR.testCompression" + "OpenEXR.testRgba" + "OpenEXR.testCRgba" + "OpenEXR.testRgbaThreading" + "OpenEXR.testSampleImages" + "OpenEXR.testSharedFrameBuffer" + "OpenEXR.testTiledRgba" + ]; + passthru.tests = { inherit libjxl; musl = pkgsCross.musl64.openexr; From 12db352d278237e6c3fac3017bab00c9287ef119 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Sep 2025 22:06:51 +0200 Subject: [PATCH 0076/2279] python313Packages.types-psutil: 7.0.0.20250801 -> 7.0.0.20250822 --- pkgs/development/python-modules/types-psutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 008396640946..32336993ace8 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "7.0.0.20250801"; + version = "7.0.0.20250822"; format = "setuptools"; src = fetchPypi { pname = "types_psutil"; inherit version; - hash = "sha256-AjC1YjQlLMb1nDYdzLqqCPMIjqNWk2er5pAEhdOIyX0="; + hash = "sha256-Imy8DA6pzApQuKvMHZGibIdty0C+I4Ex9peINpBBlpg="; }; # Module doesn't have tests From 392f7c843bf68ee8de87921d69068ee83a9a332b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Oct 2025 00:34:03 +0000 Subject: [PATCH 0077/2279] kphotoalbum: 6.0.1 -> 6.1.0 --- pkgs/by-name/kp/kphotoalbum/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix index 41792f04b475..72020cfba7b5 100644 --- a/pkgs/by-name/kp/kphotoalbum/package.nix +++ b/pkgs/by-name/kp/kphotoalbum/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kphotoalbum"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { url = "mirror://kde/stable/kphotoalbum/${finalAttrs.version}/kphotoalbum-${finalAttrs.version}.tar.xz"; - hash = "sha256-LLsQ66wKDg77nZUIxjcfzvC3AwLOtojuuDgkJm2dsww="; + hash = "sha256-fznB/B2VriB+Wt6ZxrPrNoJP45AuK1vV4ONpAHYwUlY="; }; env.LANG = "C.UTF-8"; From 9e225e754e4bb5d93cc59f57c98a9187c831989e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 5 Oct 2025 17:06:59 +0200 Subject: [PATCH 0078/2279] python313Packages.zdaemon: mark as broken --- pkgs/development/python-modules/zdaemon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 5501429c8367..0fbf5b4607ff 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -44,5 +44,6 @@ buildPythonPackage rec { changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = [ ]; + broken = true; }; } From 0c356b913f4116c72c81283586d3cba09e24a62a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Oct 2025 22:20:47 +0000 Subject: [PATCH 0079/2279] argocd-autopilot: 0.4.19 -> 0.4.20 --- pkgs/by-name/ar/argocd-autopilot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argocd-autopilot/package.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix index 3121f2648aa1..6a4ff5e379b7 100644 --- a/pkgs/by-name/ar/argocd-autopilot/package.nix +++ b/pkgs/by-name/ar/argocd-autopilot/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.19"; + version = "0.4.20"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM="; + sha256 = "sha256-JLh41ZWiDcDrUtd8d+Ak5TFca4L6VHzUguS55P9lmj0="; }; - vendorHash = "sha256-GzSkA8JO0LEVeGIRKkr1Ff1P8WhNIEvRmry91agYJRo="; + vendorHash = "sha256-Ur0BfIg4lZakjx01UOL4n5/O1yjTJJcGuDxWVDqUOyY="; proxyVendor = true; From 3117d65998736cbf465d908673bb5b2081cf1ae5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 09:58:35 +0000 Subject: [PATCH 0080/2279] gn: 0-unstable-2025-07-29 -> 0-unstable-2025-08-29 --- pkgs/by-name/gn/gn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index 17f0b7daea27..286cb5d53af6 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -11,11 +11,11 @@ version ? # This is a workaround for update-source-version to be able to update this let - _version = "0-unstable-2025-07-29"; + _version = "0-unstable-2025-08-29"; in _version, - rev ? "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee", - hash ? "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw=", + rev ? "5d0a4153b0bcc86c5a23310d5b648a587be3c56d", + hash ? "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=", }: stdenv.mkDerivation { From 58441cd09e5521a7923db939c1a60f1f7ddead80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 14:23:14 +0000 Subject: [PATCH 0081/2279] gnote: 48.2 -> 49.0 --- pkgs/by-name/gn/gnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix index fe7eae9a508d..20b5fd96f3d1 100644 --- a/pkgs/by-name/gn/gnote/package.nix +++ b/pkgs/by-name/gn/gnote/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "48.2"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-PIFooZ3mWJ+56O4RmkRUISOUHB6XSK79NooCjmclx4E="; + hash = "sha256-GXUaLyN3Kb+fSElVQKNeNG5FwbobAW25y3VNReztCl0="; }; buildInputs = [ From 5f0e71686d4847ae4d56844779d6a7d4fad34d6b Mon Sep 17 00:00:00 2001 From: Daniel Woffinden Date: Mon, 6 Oct 2025 22:21:23 +0100 Subject: [PATCH 0082/2279] python312Packages.regex: add maintainer --- pkgs/development/python-modules/regex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index d63103093516..4ca491e0e076 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { licenses.asl20 licenses.cnri-python ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ dwoffinden ]; }; } From 918084080efce213440050d8445a09ef983cb83f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Oct 2025 21:39:06 +0000 Subject: [PATCH 0083/2279] opam-publish: 2.6.0 -> 2.7.0 --- pkgs/by-name/op/opam-publish/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix index 96d4165bba75..e8014588aa33 100644 --- a/pkgs/by-name/op/opam-publish/package.nix +++ b/pkgs/by-name/op/opam-publish/package.nix @@ -19,13 +19,13 @@ in buildDunePackage rec { pname = "opam-publish"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "ocaml-opam"; repo = "opam-publish"; rev = version; - hash = "sha256-HEmeY3k1sHMNhIUD0GmVlUKKRxC+z/tMAqHGQNT48LA="; + hash = "sha256-Li7Js8mrxOrRNNuu8z4X+VXbuECfk7Gsgpy4d6R3RwU="; }; buildInputs = [ From 58dafa63001e26917046914a687ba92cc7789d4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Oct 2025 02:05:42 +0000 Subject: [PATCH 0084/2279] iio-hyprland: 0-unstable-2025-08-21 -> 0-unstable-2025-10-06 --- pkgs/by-name/ii/iio-hyprland/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix index 137dff309b13..95f364565ceb 100644 --- a/pkgs/by-name/ii/iio-hyprland/package.nix +++ b/pkgs/by-name/ii/iio-hyprland/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "iio-hyprland"; - version = "0-unstable-2025-08-21"; + version = "0-unstable-2025-10-06"; src = fetchFromGitHub { owner = "JeanSchoeller"; repo = "iio-hyprland"; - rev = "282f38c700ebf0b69df5aae40134d56e4cd67775"; - hash = "sha256-mzp2KV9SAsZL/exXSZHFPArcTV8uh3LXufADKX4ppEU="; + rev = "801c4722ea678ddf103fc0ff4c3c0211d13ad046"; + hash = "sha256-asLtzpUbwr+Wq2uQvITORBnrxh/mIZneYyfhdsElTeI="; }; buildInputs = [ dbus ]; From 6c438cc1f7dfb5d36523a150544eb5376cae85b1 Mon Sep 17 00:00:00 2001 From: Cobalt Date: Tue, 7 Oct 2025 10:04:38 +0200 Subject: [PATCH 0085/2279] harfbuzz: add cobalt to maintainers Will try to cover {aarch64,x86_64}-linux and regular updates --- pkgs/by-name/ha/harfbuzz/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix index cf7198d79132..ba93bacf59a1 100644 --- a/pkgs/by-name/ha/harfbuzz/package.nix +++ b/pkgs/by-name/ha/harfbuzz/package.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { description = "OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS"; - maintainers = [ ]; + maintainers = [ maintainers.cobalt ]; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ From ef576b1fd63d1f1116a9ed10e0027cbabb0412df Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Mon, 6 Oct 2025 18:43:12 +0200 Subject: [PATCH 0086/2279] v4l-utils: 1.30.1 -> 1.32.0 Changelog: https://git.linuxtv.org/v4l-utils.git/commit/?id=5a666c7ce89c00d66aa8e53c8f098a0c6c401f91 https://git.linuxtv.org/v4l-utils.git/tag/?h=v4l-utils-1.32.0 Meson patches removed due to https://git.linuxtv.org/v4l-utils.git/commit/?id=34aa1df2b23fb85b030cddf64c427137ddf04e93 https://git.linuxtv.org/v4l-utils.git/commit/?id=1a86657afd88889fe0918128211fb231b0eeeccd --- pkgs/by-name/v4/v4l-utils/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix index beaaeaffdd0f..b8adda9766ac 100644 --- a/pkgs/by-name/v4/v4l-utils/package.nix +++ b/pkgs/by-name/v4/v4l-utils/package.nix @@ -34,11 +34,11 @@ in # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt stdenv.mkDerivation (finalAttrs: { pname = "v4l-utils"; - version = "1.30.1"; + version = "1.32.0"; src = fetchurl { url = "https://linuxtv.org/downloads/v4l-utils/v4l-utils-${finalAttrs.version}.tar.xz"; - hash = "sha256-wc9UnC7DzznrXse/FXMTSeYbJqIbXpY5IttCIzO64Zc="; + hash = "sha256-aCiCihd3VSbrk/slipKU0dEHPWM8NE3XHs1Oeh/7ffw="; }; patches = [ @@ -106,17 +106,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ libjpeg ]; - # these two `substituteInPlace` have been sent upstream as patches - # https://lore.kernel.org/linux-media/867c4d2e-7871-4280-8c89-d4b654597f32@public-files.de/T/ - # they might fail and have to be removed once the patches get accepted postPatch = '' patchShebangs utils/ - substituteInPlace \ - lib/libdvbv5/meson.build \ - --replace-fail "install_dir: 'include/libdvbv5'" "install_dir: get_option('includedir') / 'libdvbv5'" - substituteInPlace \ - meson.build \ - --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')" ''; # Meson unable to find moc/uic/rcc in case of cross-compilation From 1319af86d909dd60b8b54d5684ca0771b1a081d6 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 00:46:56 +0800 Subject: [PATCH 0087/2279] uv: 0.8.23 -> 0.8.24 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 8122b1afea86..f1232c1c6287 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.8.23"; + version = "0.8.24"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-5L/FipR5MPsscpWfpDURbC5qwn6XB5KoOrjedk1HzDo="; + hash = "sha256-BxgVdPh9R+Oiu4kl8fe01mIZche4qy3FsERaMSImA6o="; }; - cargoHash = "sha256-JHfqsT/W7RvoHx9WbA4fdQZw2/+BOSRuGV3mcMx1FN4="; + cargoHash = "sha256-KQ+YjVmlfDdvUN1Gmmu0duIYZE0+BXirf9ZQH/hGpRI="; buildInputs = [ rust-jemalloc-sys From c27d4b0b745774e5ee1d7f23201b430726c18d6a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:52:47 +1000 Subject: [PATCH 0088/2279] go_1_25: 1.25.1 -> 1.25.2 Changelog: https://go.dev/doc/devel/release#go1.25 --- pkgs/development/compilers/go/1.25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index b25f60b3d5ae..0908ef39dec9 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.1"; + version = "1.25.2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ="; + hash = "sha256-NxEUDPuH/Oj3oT982GDfBB5sEvdhD0DKxuxvorZeluQ="; }; strictDeps = true; From 97a43a6db48222c372a4d067ab13d3b42a5869bc Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 14 Sep 2025 10:51:15 -0700 Subject: [PATCH 0089/2279] go: teach internal linker to use correct ELF interpreter Teaches go's internal linker to use the GO_LDSO env var as the path for the dynamic linker, instead of defaulting to an FHS /lib path. GO_LDSO is automatically set to the appropriate value by checking $NIX_CC/nix-support/dynamic-linker External linking is set as the default for cross compile situations where CGO is supported. Teaching go to correctly handle cross in the internal linker is hard, and our system linker already knows how to find the right ELF interpreter. For cross situations where CGO is not supported we assume either non-ELF binaries or static binaries will be produced. --- pkgs/build-support/go/module.nix | 3 ++ pkgs/development/compilers/go/1.24.nix | 10 +++++ pkgs/development/compilers/go/1.25.nix | 10 +++++ .../compilers/go/go-env-go_ldso.patch | 44 +++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 pkgs/development/compilers/go/go-env-go_ldso.patch diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index c1c644e4294e..d2d12be74229 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -250,6 +250,9 @@ lib.extendMkDerivation { export GOPATH="$TMPDIR/go" export GOPROXY=off export GOSUMDB=off + if [ -f "$NIX_CC_FOR_TARGET/nix-support/dynamic-linker" ]; then + export GO_LDSO=$(cat $NIX_CC_FOR_TARGET/nix-support/dynamic-linker) + fi cd "$modRoot" '' + lib.optionalString (finalAttrs.vendorHash != null) '' diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 947123c5e170..3390a34eb7aa 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { }) ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch + ./go-env-go_ldso.patch ]; inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM; @@ -99,6 +100,9 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild export GOCACHE=$TMPDIR/go-cache + if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then + export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker) + fi export PATH=$(pwd)/bin:$PATH @@ -106,6 +110,12 @@ stdenv.mkDerivation (finalAttrs: { # Independent from host/target, CC should produce code for the building system. # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + # Prefer external linker for cross when CGO is supported, since + # we haven't taught go's internal linker to pick the correct ELF + # interpreter for cross + # When CGO is not supported we rely on static binaries being built + # since they don't need an ELF interpreter + export GO_EXTLINK_ENABLED=${toString finalAttrs.CGO_ENABLED} ''} ulimit -a diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index b25f60b3d5ae..ab81706c7d27 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { }) ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch + ./go-env-go_ldso.patch ]; inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM; @@ -104,6 +105,9 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild export GOCACHE=$TMPDIR/go-cache + if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then + export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker) + fi export PATH=$(pwd)/bin:$PATH @@ -111,6 +115,12 @@ stdenv.mkDerivation (finalAttrs: { # Independent from host/target, CC should produce code for the building system. # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + # Prefer external linker for cross when CGO is supported, since + # we haven't taught go's internal linker to pick the correct ELF + # interpreter for cross + # When CGO is not supported we rely on static binaries being built + # since they don't need an ELF interpreter + export GO_EXTLINK_ENABLED=${toString finalAttrs.CGO_ENABLED} ''} ulimit -a diff --git a/pkgs/development/compilers/go/go-env-go_ldso.patch b/pkgs/development/compilers/go/go-env-go_ldso.patch new file mode 100644 index 000000000000..395b1dab3bf4 --- /dev/null +++ b/pkgs/development/compilers/go/go-env-go_ldso.patch @@ -0,0 +1,44 @@ +diff --git a/src/cmd/dist/buildruntime.go b/src/cmd/dist/buildruntime.go +index 87e8867176..dbb635011f 100644 +--- a/src/cmd/dist/buildruntime.go ++++ b/src/cmd/dist/buildruntime.go +@@ -62,7 +62,7 @@ func mkbuildcfg(file string) { + fmt.Fprintf(&buf, "const DefaultGORISCV64 = `%s`\n", goriscv64) + fmt.Fprintf(&buf, "const defaultGOEXPERIMENT = `%s`\n", goexperiment) + fmt.Fprintf(&buf, "const defaultGO_EXTLINK_ENABLED = `%s`\n", goextlinkenabled) +- fmt.Fprintf(&buf, "const defaultGO_LDSO = `%s`\n", defaultldso) ++ fmt.Fprintf(&buf, "const DefaultGO_LDSO = `%s`\n", defaultldso) + fmt.Fprintf(&buf, "const version = `%s`\n", findgoversion()) + fmt.Fprintf(&buf, "const defaultGOOS = runtime.GOOS\n") + fmt.Fprintf(&buf, "const defaultGOARCH = runtime.GOARCH\n") +diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go +index 6ff1d94383..147a7d91c9 100644 +--- a/src/cmd/link/internal/ld/elf.go ++++ b/src/cmd/link/internal/ld/elf.go +@@ -1927,8 +1927,12 @@ func asmbElf(ctxt *Link) { + sh.Flags = uint64(elf.SHF_ALLOC) + sh.Addralign = 1 + +- if interpreter == "" && buildcfg.GOOS == runtime.GOOS && buildcfg.GOARCH == runtime.GOARCH && buildcfg.GO_LDSO != "" { +- interpreter = buildcfg.GO_LDSO ++ if interpreter == "" { ++ if goLdso := os.Getenv("GO_LDSO"); goLdso != "" { ++ interpreter = goLdso ++ } else if buildcfg.GOOS == runtime.GOOS && buildcfg.GOARCH == runtime.GOARCH { ++ interpreter = buildcfg.DefaultGO_LDSO ++ } + } + + if interpreter == "" { +diff --git a/src/internal/buildcfg/cfg.go b/src/internal/buildcfg/cfg.go +index 7e4ee365df..8aaa70fb36 100644 +--- a/src/internal/buildcfg/cfg.go ++++ b/src/internal/buildcfg/cfg.go +@@ -33,7 +33,6 @@ var ( + GORISCV64 = goriscv64() + GOWASM = gowasm() + ToolTags = toolTags() +- GO_LDSO = defaultGO_LDSO + GOFIPS140 = gofips140() + Version = version + ) From 08aadbf8d4dbdab061b455e3181b16046445b48b Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 14 Sep 2025 10:52:42 -0700 Subject: [PATCH 0090/2279] go: position independent executables by default Followup to setting --enable-default-pie for our gcc, we teach go to build PIE by default when supported. --- pkgs/build-support/go/module.nix | 7 ------ pkgs/development/compilers/go/1.24.nix | 1 + pkgs/development/compilers/go/1.25.nix | 23 +++++++++++++++++++ .../compilers/go/go-default-pie.patch | 13 +++++++++++ 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/compilers/go/go-default-pie.patch diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index d2d12be74229..685f0071bc82 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -269,13 +269,6 @@ lib.extendMkDerivation { } '' + '' - - # currently pie is only enabled by default in pkgsMusl - # this will respect the `hardening{Disable,Enable}` flags if set - if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then - export GOFLAGS="-buildmode=pie $GOFLAGS" - fi - runHook postConfigure '' ); diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 3390a34eb7aa..653b14f6ca1e 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch ./go-env-go_ldso.patch + ./go-default-pie.patch ]; inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM; diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index ab81706c7d27..e7676644128c 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -10,8 +10,12 @@ buildPackages, pkgsBuildTarget, targetPackages, + # for testing testers, + runCommand, + bintools, skopeo, + clickhouse-backup, buildGo125Module, }: @@ -19,6 +23,7 @@ let goBootstrap = buildPackages.callPackage ./bootstrap122.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo125Module; }; + clickhouse-backupTest = clickhouse-backup.override { buildGoModule = buildGo125Module; }; # We need a target compiler which is still runnable at build time, # to handle the cross-building case where build != host == target @@ -70,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch ./go-env-go_ldso.patch + ./go-default-pie.patch ]; inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM; @@ -179,6 +185,23 @@ stdenv.mkDerivation (finalAttrs: { command = "go version"; version = "go${finalAttrs.version}"; }; + # Picked clickhouse-backup as a package that sets CGO_ENABLED=0 + # Running and outputting the right version proves a working ELF interpreter was picked + clickhouse-backup = testers.testVersion { package = clickhouse-backupTest; }; + clickhouse-backup-is-pie = runCommand "has-pie" { meta.broken = stdenv.hostPlatform.isStatic; } '' + ${lib.optionalString (!isCross) '' + if ${lib.getExe' bintools "readelf"} -p .comment ${lib.getExe clickhouse-backup} | grep -Fq "GCC: (GNU)"; then + echo "${lib.getExe clickhouse-backup} has a GCC .comment, but it should have used the internal go linker" + exit 1 + fi + ''} + if ${lib.getExe' bintools "readelf"} -h ${lib.getExe clickhouse-backup} | grep -q "Type:.*DYN"; then + touch $out + else + echo "ERROR: clickhouse-backup is NOT PIE" + exit 1 + fi + ''; }; }; diff --git a/pkgs/development/compilers/go/go-default-pie.patch b/pkgs/development/compilers/go/go-default-pie.patch new file mode 100644 index 000000000000..d26ac8f6cd0c --- /dev/null +++ b/pkgs/development/compilers/go/go-default-pie.patch @@ -0,0 +1,13 @@ +diff --git a/src/internal/platform/supported.go b/src/internal/platform/supported.go +index f9706a6988..abac42d550 100644 +--- a/src/internal/platform/supported.go ++++ b/src/internal/platform/supported.go +@@ -249,7 +253,7 @@ func DefaultPIE(goos, goarch string, isRace bool) bool { + case "darwin": + return true + } +- return false ++ return BuildModeSupported("gc", "pie", goos, goarch) + } + + // ExecutableHasDWARF reports whether the linked executable includes DWARF From ca6a37f817e815f31445af2a373b7747e62f372e Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 14 Sep 2025 10:53:46 -0700 Subject: [PATCH 0091/2279] linkerd: remove unnecessary buildmode=pie This is no longer needed now that our go produces PIE by default --- pkgs/applications/networking/cluster/linkerd/generic.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index ef5835bcd6db..20f07da27e2b 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -31,11 +31,6 @@ buildGoModule rec { env GOFLAGS="" go generate ./jaeger/static env GOFLAGS="" go generate ./multicluster/static env GOFLAGS="" go generate ./viz/static - - # Necessary for building Musl - if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then - export GOFLAGS="-buildmode=pie $GOFLAGS" - fi ''; tags = [ From dbb57d8d86f6fcc92d28c3d6835a83d85bb5e4b5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 7 Oct 2025 17:25:46 -0700 Subject: [PATCH 0092/2279] go: only enable PIE by default when building for GOARCH matching target We rely on teaching go to use the correct ELF interpreter for PIE in a way that can't work for packages that go off and do their own GOARCH=something cross builds without touching nixpkgs cross machinery, so update the default pie patch to bake targetPlatform's GOARCH and only activate for it. tailscale works as a testcase for this as it cross compiles many arches in tstest/archtest/qemu_test.go --- pkgs/development/compilers/go/1.24.nix | 4 +++- pkgs/development/compilers/go/1.25.nix | 4 +++- pkgs/development/compilers/go/go-default-pie.patch | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 653b14f6ca1e..8ee9c0f16725 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -65,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: { ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch ./go-env-go_ldso.patch - ./go-default-pie.patch + (replaceVars ./go-default-pie.patch { + inherit (stdenv.targetPlatform.go) GOARCH; + }) ]; inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM; diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index e7676644128c..60a8c24ae425 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -75,7 +75,9 @@ stdenv.mkDerivation (finalAttrs: { ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch ./go-env-go_ldso.patch - ./go-default-pie.patch + (replaceVars ./go-default-pie.patch { + inherit (stdenv.targetPlatform.go) GOARCH; + }) ]; inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM; diff --git a/pkgs/development/compilers/go/go-default-pie.patch b/pkgs/development/compilers/go/go-default-pie.patch index d26ac8f6cd0c..bce8d8dafd3d 100644 --- a/pkgs/development/compilers/go/go-default-pie.patch +++ b/pkgs/development/compilers/go/go-default-pie.patch @@ -7,7 +7,7 @@ index f9706a6988..abac42d550 100644 return true } - return false -+ return BuildModeSupported("gc", "pie", goos, goarch) ++ return goarch == "@GOARCH@" && BuildModeSupported("gc", "pie", goos, goarch) } // ExecutableHasDWARF reports whether the linked executable includes DWARF From 7f562f1d546b5b221445f9f959822dba482c4f2f Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 11:30:20 +0800 Subject: [PATCH 0093/2279] uv: 0.8.24 -> 0.9.0 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index f1232c1c6287..230079fc6aba 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.8.24"; + version = "0.9.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-BxgVdPh9R+Oiu4kl8fe01mIZche4qy3FsERaMSImA6o="; + hash = "sha256-YDpaDArhw0QmJ7fmoNZAewOQx+cMnxW+xhdCL3zQ9GI="; }; - cargoHash = "sha256-KQ+YjVmlfDdvUN1Gmmu0duIYZE0+BXirf9ZQH/hGpRI="; + cargoHash = "sha256-eHkEUG2Er6qN8JcUaEyJSec6L9cMI4EebNrdv4UJIUk="; buildInputs = [ rust-jemalloc-sys From ca4492361ff94ce41249848df589575bee397a43 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 12:55:45 +0800 Subject: [PATCH 0094/2279] jj-pre-push: fix build with uv_build 0.9.0 --- pkgs/by-name/jj/jj-pre-push/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index 9b01ece64361..582e28f3aba2 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch2, }: python3Packages.buildPythonApplication rec { @@ -16,6 +17,15 @@ python3Packages.buildPythonApplication rec { hash = "sha256-9HyVWxYmemF/K3ttQ0L1lZF/XFkSeqwli/Mm+FFI8lQ="; }; + patches = [ + # https://github.com/acarapetis/jj-pre-push/pull/2 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/jj-pre-push/commit/aa2d917ec9560318178fbc1040281228db7b7ec1.patch?full_index=1"; + hash = "sha256-uNqOO0yVHShcXxYMPFcPCDM5YlL4IcmpUAfClmDlJ4Q="; + }) + ]; + build-system = [ python3Packages.uv-build ]; From c6c7abead4f4ecceae28e64b036a787035cdf7d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Oct 2025 07:01:55 +0000 Subject: [PATCH 0095/2279] zwave-js-server: 3.2.1 -> 3.4.0 --- pkgs/by-name/zw/zwave-js-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix index b1d2591220bb..48c39bf3d9ef 100644 --- a/pkgs/by-name/zw/zwave-js-server/package.nix +++ b/pkgs/by-name/zw/zwave-js-server/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "zwave-js-server"; - version = "3.2.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-server"; rev = version; - hash = "sha256-oZA+tMYxiWc+PiPiqGEJpEa434CqNjPbutBWjXBgmhw="; + hash = "sha256-JmPO1faJgpJ+RjocvauP0EQGken61G59CLqQAZiRSUU="; }; - npmDepsHash = "sha256-1JgfXF3kNuUj0jprKBsJSPeFH6ZpqpU4lceTQm5FBgg="; + npmDepsHash = "sha256-lCJ4dcLIv+PQkoNdaP9FsXbWIzy2sdooQw08ZVbESCM="; # For some reason the zwave-js dependency is in devDependencies npmFlags = [ "--include=dev" ]; From 1cb13614d99aa6f75870486446a63f33967c9160 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:06:51 +0800 Subject: [PATCH 0096/2279] python3Packages.construct-classes: fix build with uv_build 0.9.0 --- .../python-modules/construct-classes/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix index 189729fb9bd7..bcfa798f614d 100644 --- a/pkgs/development/python-modules/construct-classes/default.nix +++ b/pkgs/development/python-modules/construct-classes/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, construct, fetchFromGitHub, + fetchpatch2, pytestCheckHook, uv-build, }: @@ -19,6 +20,14 @@ buildPythonPackage rec { hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4="; }; + patches = [ + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/matejcik/construct-classes/commit/d1ecacc0cf5cb332ffe6ed85ce9dfc552f77231f.patch?full_index=1"; + hash = "sha256-VeifL8bER0mIRNXKTA+/cje8AxWJKg/q8ipmf3gTeiw="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ construct ]; From f8a5a66b69b7267e894dd13a59cc52978313a076 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:13:13 +0800 Subject: [PATCH 0097/2279] python3Packages.django-bootstrap3: fix build with uv_build 0.9.0 --- .../python-modules/django-bootstrap3/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 62abd28fde23..1edf6d8332f3 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system uv-build, @@ -26,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo="; }; + patches = [ + # https://github.com/zostera/django-bootstrap3/pull/1085 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/django-bootstrap3/commit/d3285ad9c3de87aa763bb49b9666baed514f7c87.patch?full_index=1"; + hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ django ]; From 976b80484b737f87122036569eaec56b353a4a5b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:18:35 +0800 Subject: [PATCH 0098/2279] python3Packages.django-bootstrap4: fix build with uv_build 0.9.0 --- .../python-modules/django-bootstrap4/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 389aaf503a41..348ae60e5095 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system uv-build, @@ -29,6 +30,15 @@ buildPythonPackage rec { hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4="; }; + patches = [ + # https://github.com/zostera/django-bootstrap4/pull/826 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/django-bootstrap4/commit/e3e6b7cc6720568177d37ff0998007c84c294c5a.patch?full_index=1"; + hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ beautifulsoup4 ]; From 555d58793034729fe2cd9aa28fdb9210f0bf8738 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:22:17 +0800 Subject: [PATCH 0099/2279] python3Packages.django-bootstrap5: fix build with uv_build 0.9.0 --- .../python-modules/django-bootstrap5/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix index a3a67ada4c95..9327c112676e 100644 --- a/pkgs/development/python-modules/django-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-bootstrap5/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, django, fetchFromGitHub, + fetchpatch2, jinja2, pillow, pytest-django, @@ -23,6 +24,15 @@ buildPythonPackage rec { hash = "sha256-aqP2IkAkZsw5vbQxhiy9L3giSgb0seub9gsxPTajiXo="; }; + patches = [ + # https://github.com/zostera/django-bootstrap5/pull/769 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/django-bootstrap5/commit/e588b25e0c81d9133ca2b9391c125b41d485aefc.patch?full_index=1"; + hash = "sha256-cFOY+pu2TAZXpAipSIQh1nPPC0ipfncvpObcH667+ac="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ django ]; From e4ed1873a68a1f22dd7ebb3c2a12a9427f3bd267 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:27:13 +0800 Subject: [PATCH 0100/2279] python3Packages.ffmpy: fix build with uv_build 0.9.0 --- pkgs/development/python-modules/ffmpy/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index a576b37cd48f..a07ad53dd1cb 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, uv-build, pytestCheckHook, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-u//L2vxucFlWmk1+pdp+iCrpzzMZUonDAn1LELgX86E="; }; + patches = [ + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Ch00k/ffmpy/commit/11a053d11939b488ce7ac362589372904218a798.patch?full_index=1"; + hash = "sha256-78D64uSX03zp2VM7h3hg493Vtow8fh+tQWXkzVgokDA="; + }) + ]; + postPatch = # Default to store ffmpeg. '' From 98b7ba06e3536eac547bd928060765b208274958 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:38:25 +0800 Subject: [PATCH 0101/2279] python3Packages.githubkit: fix build with uv_build 0.9.0 --- pkgs/development/python-modules/githubkit/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index de3e186bba64..34868273a87e 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -3,6 +3,7 @@ anyio, buildPythonPackage, fetchFromGitHub, + fetchpatch2, hishel, httpx, pydantic, @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-4THc5BNQGSrpf3Y3OoFisywEdKp8ZgNjle4yvVLUy1A="; }; + patches = [ + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/yanyongyu/githubkit/commit/2817664d904541242d4cedf7aae85cd4c4b606e2.patch?full_index=1"; + hash = "sha256-mmtjlebHZpHX457frSOe88tsUo7iNdSIUynGZjcjuw4="; + }) + ]; + pythonRelaxDeps = [ "hishel" ]; build-system = [ uv-build ]; From 39f481527f3716c2f3927c28e26aba7542269785 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:39:34 +0800 Subject: [PATCH 0102/2279] python3Packages.marimo: fix build with uv_build 0.9.0 --- pkgs/development/python-modules/marimo/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3cf144ae9961..24e51364669b 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, pythonOlder, @@ -42,6 +43,15 @@ buildPythonPackage rec { hash = "sha256-cmkz/ZyVYfpz4yOxghsXPF4PhRluwqSXo1CcwvwkXFg="; }; + patches = [ + # https://github.com/marimo-team/marimo/pull/6714 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/marimo/commit/b1c690e82e8117c451a74fdf172eb51a4861853d.patch?full_index=1"; + hash = "sha256-iFS5NSGjaGdECRk0LCRSA8XzRb1/sVSZCTRLy6taHNU="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ From 66b379da343be2361cbc1956e00a44143da266c2 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 8 Oct 2025 13:52:12 +0800 Subject: [PATCH 0103/2279] python3Packages.sigstore-models: fix build with uv_build 0.9.0 --- .../python-modules/sigstore-models/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/sigstore-models/default.nix b/pkgs/development/python-modules/sigstore-models/default.nix index 2a45c9cdef5a..5bda1519e17d 100644 --- a/pkgs/development/python-modules/sigstore-models/default.nix +++ b/pkgs/development/python-modules/sigstore-models/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pydantic, typing-extensions, uv-build, @@ -20,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-zlIZzfgHZPEuiZu3JNX74Cg1jPNaO1HUhMtpxoyOoqk="; }; + patches = [ + # https://github.com/astral-sh/sigstore-models/pull/4 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/sigstore-models/commit/0cbd46ce7ebc8a5d2825b8fc98147a9ba4b3be70.patch?full_index=1"; + hash = "sha256-6DLhhHkGW2Ok9xwKx6YT5BkCqQNH/Ja/KEO9FHl4NXo="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ From 2a45fd10397434e8eb54a430a56558902b75f512 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 21 May 2025 21:46:52 +0100 Subject: [PATCH 0104/2279] cc-wrapper: add support for libcxxhardeningfast/extensive hardening flags as with glibcxxassertions, we don't yet have a nice mechanism for deferring support decisions to the c++ library in use, so for now at least enabling this hardening flag will cause _LIBCPP_HARDENING_MODE to be defined on all compilers --- doc/redirects.json | 6 + doc/release-notes/rl-2511.section.md | 4 +- doc/stdenv/stdenv.chapter.md | 12 ++ .../bintools-wrapper/default.nix | 2 + .../build-support/cc-wrapper/add-hardening.sh | 26 ++- pkgs/stdenv/generic/make-derivation.nix | 4 + pkgs/test/cc-wrapper/hardening.nix | 171 ++++++++++++++++-- pkgs/top-level/variants.nix | 1 + 8 files changed, 211 insertions(+), 15 deletions(-) diff --git a/doc/redirects.json b/doc/redirects.json index d1e9e1724ce0..879eb37bd369 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -124,6 +124,12 @@ "inkscape-plugins": [ "index.html#inkscape-plugins" ], + "libcxxhardeningextensive": [ + "index.html#libcxxhardeningextensive" + ], + "libcxxhardeningfast": [ + "index.html#libcxxhardeningfast" + ], "major-ghc-deprecation": [ "index.html#major-ghc-deprecation" ], diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 674198d1dc82..b552bc487a92 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -245,7 +245,7 @@ - `installShellCompletion`: now supports Nushell completion files -- New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively. +- New hardening flags `strictflexarrays1`, `strictflexarrays3`, `glibcxxassertions`, `libcxxhardeningfast` and `libcxxhardeningextensive` were made available. - `gramps` has been updated to 6.0.0 Upstream recommends [backing up your Family Trees](https://gramps-project.org/wiki/index.php/Gramps_6.0_Wiki_Manual_-_Manage_Family_Trees#Backing_up_a_Family_Tree) before upgrading. @@ -261,8 +261,6 @@ - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables. If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`. -- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option. - - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index dc49e205a68f..2a0b239740c0 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1675,6 +1675,18 @@ Adds the `-D_GLIBCXX_ASSERTIONS` compiler flag. This flag only has an effect on These checks may have an impact on performance in some cases. +#### `libcxxhardeningfast` {#libcxxhardeningfast} + +Adds the `-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST` compiler flag. This flag only has an effect on libc++ targets, and when defined, enables a set of assertions that prevent undefined behavior caused by violating preconditions of the standard library. libc++ provides several hardening modes, and this "fast" mode contains a set of security-critical checks that can be done with relatively little overhead in constant time. + +Disabling `libcxxhardeningfast` implies disablement of checks from `libcxxhardeningextensive`. + +#### `libcxxhardeningextensive` {#libcxxhardeningextensive} + +Adds the `-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE` compiler flag. This flag only has an effect on libc++ targets, and when defined, enables a set of assertions that prevent undefined behavior caused by violating preconditions of the standard library. libc++ provides several hardening modes, and this "extensive" mode adds checks for undefined behavior that incur relatively little overhead but aren’t security-critical. The additional rigour impacts performance more than fast mode: benchmarking is recommended to determine if it is acceptable for a particular application. + +Enabling this flag implies enablement of checks from `libcxxhardeningfast`. Disabling this flag does not imply disablement of checks from `libcxxhardeningfast`. + #### `pacret` {#pacret} This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques. diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index a05ecc0cdca1..8f5613e9e7bb 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -49,6 +49,8 @@ "format" "fortify" "fortify3" + "libcxxhardeningextensive" + "libcxxhardeningfast" "pic" "relro" "stackclashprotection" diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index d254b139c996..aafde3874dad 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -25,6 +25,13 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then hardeningEnableMap["strictflexarrays1"]=1 fi +# libcxxhardeningextensive implies libcxxhardeningfast enablement - make explicit before +# we filter unsupported flags because unsupporting libcxxhardeningextensive +# doesn't mean we should unsupport libcxxhardeningfast too +if [[ -n "${hardeningEnableMap[libcxxhardeningextensive]-}" ]]; then + hardeningEnableMap["libcxxhardeningfast"]=1 +fi + # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do @@ -37,6 +44,10 @@ for flag in @hardening_unsupported_flags@; do if [[ "$flag" = 'strictflexarrays1' ]] ; then unset -v "hardeningEnableMap['strictflexarrays3']" fi + # libcxxhardeningfast being unsupported implies libcxxhardeningextensive is unsupported + if [[ "$flag" = 'libcxxhardeningfast' ]] ; then + unset -v "hardeningEnableMap['libcxxhardeningextensive']" + fi done @@ -50,9 +61,14 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then unset -v "hardeningEnableMap['strictflexarrays1']" fi +# now make libcxxhardeningfast and libcxxhardeningextensive mutually exclusive +if [[ -n "${hardeningEnableMap[libcxxhardeningextensive]-}" ]]; then + unset -v "hardeningEnableMap['libcxxhardeningfast']" +fi + if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pic strictoverflow glibcxxassertions format trivialautovarinit zerocallusedregs) + declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pic strictoverflow libcxxhardeningfast libcxxhardeningextensive glibcxxassertions format trivialautovarinit zerocallusedregs) declare -A hardeningDisableMap=() # Determine which flags were effectively disabled so we can report below. @@ -115,6 +131,14 @@ for flag in "${!hardeningEnableMap[@]}"; do if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling glibcxxassertions >&2; fi hardeningCFlagsBefore+=('-D_GLIBCXX_ASSERTIONS') ;; + libcxxhardeningfast) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling libcxxhardeningfast >&2; fi + hardeningCFlagsBefore+=('-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST') + ;; + libcxxhardeningextensive) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling libcxxhardeningextensive >&2; fi + hardeningCFlagsBefore+=('-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE') + ;; stackprotector) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index cae787432714..0af13170c261 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -155,6 +155,8 @@ let "relro" "stackprotector" "glibcxxassertions" + "libcxxhardeningfast" + "libcxxhardeningextensive" "stackclashprotection" "strictoverflow" "trivialautovarinit" @@ -427,6 +429,8 @@ let (concretizeFlagImplications "fortify" [ "fortify3" ]) # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ]) + # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled + (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ]) ] ); enabledHardeningOptions = diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix index d224c1fd460c..c5ce7f3836ae 100644 --- a/pkgs/test/cc-wrapper/hardening.nix +++ b/pkgs/test/cc-wrapper/hardening.nix @@ -31,8 +31,8 @@ let [ -n "$preBuild" ] && eval "$preBuild" n=$out/bin/test-bin mkdir -p "$(dirname "$n")" - cp "$codePath" code.c - NIX_DEBUG=1 $CC -x c code.c -O1 $TEST_EXTRA_FLAGS -o "$n" + cp "$codePath" . + NIX_DEBUG=1 $CC -x ''${TEST_SOURCE_LANG:-c} "$(basename $codePath)" -O1 $TEST_EXTRA_FLAGS -o "$n" ''; f1exampleWithStdEnv = writeCBinWithStdenv ./fortify1-example.c; @@ -41,15 +41,60 @@ let flexArrF2ExampleWithStdEnv = writeCBinWithStdenv ./flex-arrays-fortify-example.c; + # we don't really have a reliable property for testing for + # libstdc++ we'll just have to check for the absence of libcxx checkGlibcxxassertionsWithStdEnv = - expectDefined: - writeCBinWithStdenv ( - writeText "main.cpp" '' - #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS - #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined" - #endif - int main() {} - '' + expectDefined: stdenv': derivationArgs: + brokenIf (stdenv.cc.libcxx != null) ( + writeCBinWithStdenv + (writeText "main.cpp" '' + #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS + #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined" + #endif + int main() {} + '') + stdenv' + ( + derivationArgs + // { + env = (derivationArgs.env or { }) // { + TEST_SOURCE_LANG = derivationArgs.env.TEST_SOURCE_LANG or "c++"; + }; + } + ) + ); + + checkLibcxxHardeningWithStdEnv = + expectValue: stdenv': env: + brokenIf (stdenv.cc.libcxx == null) ( + writeCBinWithStdenv + (writeText "main.cpp" ( + '' + #include + #ifndef _LIBCPP_HARDENING_MODE + #error "Expected _LIBCPP_HARDENING_MODE to be defined" + #endif + #ifndef ${expectValue} + #error "Expected ${expectValue} to be defined" + #endif + + #if _LIBCPP_HARDENING_MODE != ${expectValue} + #error "Expected _LIBCPP_HARDENING_MODE to equal ${expectValue}" + #endif + '' + + '' + int main() {} + '' + )) + stdenv' + ( + env + // { + env = (env.env or { }) // { + TEST_SOURCE_LANG = env.env.TEST_SOURCE_LANG or "c++"; + }; + } + ) ); # for when we need a slightly more complicated program @@ -691,6 +736,48 @@ nameDrvAfterAttrName ( hardeningDisable = [ "glibcxxassertions" ]; }; + lchFastExplicitDisabled = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv { + hardeningDisable = [ "libcxxhardeningfast" ]; + }; + + lchExtensiveExplicitEnabled = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv + { + hardeningEnable = [ "libcxxhardeningextensive" ]; + }; + + lchExtensiveExplicitDisabledDoesntDisableLchFast = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" stdenv + { + hardeningEnable = [ "libcxxhardeningfast" ]; + hardeningDisable = [ "libcxxhardeningextensive" ]; + }; + + lchFastExplicitDisabledDisablesLchExtensive = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv + { + hardeningEnable = [ "libcxxhardeningextensive" ]; + hardeningDisable = [ "libcxxhardeningfast" ]; + }; + + lchFastExtensiveExplicitEnabledResultsInLchExtensive = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv + { + hardeningEnable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + }; + + lchFastExtensiveExplicitDisabledDisablesBoth = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv + { + hardeningDisable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + }; + # most flags can't be "unsupported" by compiler alone and # binutils doesn't have an accessible hardeningUnsupportedFlags # mechanism, so can only test a couple of flags through altered @@ -897,6 +984,30 @@ nameDrvAfterAttrName ( hardeningEnable = [ "glibcxxassertions" ]; }; + lchFastStdenvUnsupp = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" + (stdenvUnsupport [ "libcxxhardeningfast" ]) + { + hardeningEnable = [ "libcxxhardeningfast" ]; + }; + + lchFastStdenvUnsuppUnsupportsLchExtensive = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" + (stdenvUnsupport [ "libcxxhardeningfast" ]) + { + hardeningEnable = [ "libcxxhardeningextensive" ]; + }; + + lchExtensiveStdenvUnsuppDoesntUnsupportLchFast = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" + (stdenvUnsupport [ "libcxxhardeningextensive" ]) + { + hardeningEnable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + }; + fortify3EnabledEnvEnablesFortify1 = checkTestBin (f1exampleWithStdEnv stdenv { @@ -992,6 +1103,38 @@ nameDrvAfterAttrName ( expectFailure = true; }; + lchFastEnabledEnv = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" stdenv { + hardeningDisable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + postConfigure = '' + export NIX_HARDENING_ENABLE="libcxxhardeningfast" + ''; + }; + + lchExtensiveEnabledEnv = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv { + hardeningDisable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + postConfigure = '' + export NIX_HARDENING_ENABLE="libcxxhardeningextensive" + ''; + }; + + lchFastExtensiveEnabledEnvResultsInLchExtensive = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv + { + hardeningDisable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + postConfigure = '' + export NIX_HARDENING_ENABLE="libcxxhardeningextensive libcxxhardeningfast" + ''; + }; + # NIX_HARDENING_ENABLE can't enable an unsupported feature stackProtectorUnsupportedEnabledEnv = checkTestBin @@ -1101,9 +1244,15 @@ nameDrvAfterAttrName ( hardeningDisable = [ "all" ]; }) true; - glibcxxassertionsExplicitDisabled = checkGlibcxxassertionsWithStdEnv false stdenv { + allExplicitDisabledGlibcxxAssertions = checkGlibcxxassertionsWithStdEnv false stdenv { hardeningDisable = [ "all" ]; }; + + allExplicitDisabledLibcxxHardening = + checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv + { + hardeningDisable = [ "all" ]; + }; } ) ) diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix index ea288206dfbc..e3a12fcadcf5 100644 --- a/pkgs/top-level/variants.nix +++ b/pkgs/top-level/variants.nix @@ -165,6 +165,7 @@ self: super: { "nostrictaliasing" "pacret" "glibcxxassertions" + "libcxxhardeningfast" "trivialautovarinit" ] ) super'.stdenv; From 422942c3a6a0b526be6afd0b478ea9418c66b6e6 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 25 May 2025 19:26:35 +0100 Subject: [PATCH 0105/2279] ld64: disable libcxxhardeningfast hardening flag ld built with this fails to link glib's gio on x86_64 darwin --- pkgs/by-name/ld/ld64/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index c6e5c7cff969..f6a1dfc2cdf8 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -119,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: { xar ]; + # ld built with this fails to link glib's gio on x86_64 darwin + hardeningDisable = [ "libcxxhardeningfast" ]; + dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM. # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, From bbcaea53fc1c19843c0630a13d1341ff7a4e6718 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 8 Oct 2025 21:59:34 +0200 Subject: [PATCH 0106/2279] libjxl: Disable known-borked tests on big-endian --- pkgs/by-name/li/libjxl/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index af5041e2ca5b..d5615b27d1a0 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -5,6 +5,7 @@ fetchpatch, brotli, cmake, + ctestCheckHook, giflib, gperftools, gtest, @@ -97,6 +98,10 @@ stdenv.mkDerivation rec { libhwy ]; + nativeCheckInputs = [ + ctestCheckHook + ]; + cmakeFlags = [ # For C dependencies like brotli, which are dynamically linked, # we want to use the system libraries, so that we don't have to care about @@ -176,6 +181,30 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690 doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64); + disabledTests = lib.optionals stdenv.hostPlatform.isBigEndian [ + # https://github.com/libjxl/libjxl/issues/3629 + "DecodeTest.ProgressionTestLosslessAlpha" + "DecodeTest.FlushTestLosslessProgressiveAlpha" + "EncodeTest.FrameSettingsTest" + "JxlTest.RoundtripAlphaResampling" + "JxlTest.RoundtripAlphaResamplingOnlyAlpha" + "JxlTest.RoundtripAlpha16" + "JxlTest.RoundtripProgressive" + "JxlTest.RoundtripProgressiveLevel2Slow" + "ModularTest.RoundtripLossyDeltaPalette" + "ModularTest.RoundtripLossy" + "ModularTest.RoundtripLossy16" + "PassesTest.ProgressiveDownsample2DegradesCorrectlyGrayscale" + "PassesTest.ProgressiveDownsample2DegradesCorrectly" + ]; + + ctestFlags = lib.optionals stdenv.hostPlatform.isBigEndian [ + # https://github.com/libjxl/libjxl/issues/3629 + # These didn't seem to be accepted via disabledTests + "--exclude-regex" + ".*bitSqueeze.*" + ]; + meta = with lib; { homepage = "https://github.com/libjxl/libjxl"; description = "JPEG XL image format reference implementation"; From 0cb6bb8d6f4af2a4cc1a3b8aca1d805b2c516d76 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 8 Oct 2025 22:15:24 +0200 Subject: [PATCH 0107/2279] openblas: Fetch patch to fix SCAL on POWER4 kernel --- .../libraries/science/math/openblas/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 7f359ebacbdb..b01d34047673 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, perl, which, # Most packages depending on openblas expect integer width to match @@ -198,6 +199,13 @@ stdenv.mkDerivation rec { # Remove this once https://github.com/OpenMathLib/OpenBLAS/issues/5414 is # resolved. ./disable-sme-sgemm-kernel.patch + + # https://github.com/OpenMathLib/OpenBLAS/issues/5460 + (fetchpatch { + name = "0001-openblas-Use-generic-kernels-for-SCAL-on-POWER4-5.patch"; + url = "https://github.com/OpenMathLib/OpenBLAS/commit/14c9dcaac70d9382de00ba4418643d9587f4950e.patch"; + hash = "sha256-mIOqRc7tE1rV/krrAu630JwApZHdeHCdVmO5j6eDC8U="; + }) ]; postPatch = '' From 1e6b2f451858d4929898856b5345a742aefd879c Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 23 Sep 2025 08:27:04 +0000 Subject: [PATCH 0108/2279] flclash: 0.8.87 -> 0.8.88 --- pkgs/by-name/fl/flclash/package.nix | 10 +- pkgs/by-name/fl/flclash/pubspec.lock.json | 496 ++++++++++++---------- 2 files changed, 288 insertions(+), 218 deletions(-) diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 807b3dba5f57..32ba400d8a09 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter332, + flutter335, keybinder3, libayatana-appindicator, buildGoModule, @@ -12,14 +12,14 @@ let pname = "flclash"; - version = "0.8.87"; + version = "0.8.88"; src = (fetchFromGitHub { owner = "chen08209"; repo = "FlClash"; tag = "v${version}"; - hash = "sha256-vGRq9Kc6XU6r3huIGAKoh5x46fFS8jmXgus9WgpvG3A="; + hash = "sha256-yhIaYIlAyc2+oHkMRA9ybBQ+14URBY2kUp9wqTgFrwI="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -41,7 +41,7 @@ let modRoot = "core"; - vendorHash = "sha256-Uc+RvpW3vndPFnM7yhqrNTEexAPaolCk8YK8u/+55RQ="; + vendorHash = "sha256-ekNuZ3Uv6TDfyZ4hVvXA3Wft4fetaXzddKIpis4ER1g="; env.CGO_ENABLED = 0; @@ -57,7 +57,7 @@ let meta = metaCommon; }; in -flutter332.buildFlutterApplication { +flutter335.buildFlutterApplication { inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json index bb49e16c8c88..dfa865af4231 100644 --- a/pkgs/by-name/fl/flclash/pubspec.lock.json +++ b/pkgs/by-name/fl/flclash/pubspec.lock.json @@ -4,31 +4,41 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", "url": "https://pub.dev" }, "source": "hosted", - "version": "80.0.0" + "version": "85.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", + "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.0" + "version": "7.6.0" + }, + "analyzer_buffer": { + "dependency": "transitive", + "description": { + "name": "analyzer_buffer", + "sha256": "f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.10" }, "analyzer_plugin": { "dependency": "transitive", "description": { "name": "analyzer_plugin", - "sha256": "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916", + "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.0" + "version": "0.13.4" }, "animations": { "dependency": "direct main", @@ -44,11 +54,11 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", + "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.0" + "version": "6.4.1" }, "app_links_linux": { "dependency": "transitive", @@ -84,11 +94,11 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "direct dev", @@ -124,21 +134,21 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "sha256": "ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "3.1.0" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "build_daemon": { "dependency": "transitive", @@ -154,31 +164,31 @@ "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "sha256": "d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.3" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "sha256": "b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.15" + "version": "2.7.1" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "sha256": "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.0" + "version": "9.3.1" }, "built_collection": { "dependency": "transitive", @@ -194,11 +204,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.5" + "version": "8.12.0" }, "characters": { "dependency": "transitive", @@ -214,11 +224,11 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "ci": { "dependency": "transitive", @@ -230,6 +240,16 @@ "source": "hosted", "version": "0.1.0" }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "cli_util": { "dependency": "transitive", "description": { @@ -254,11 +274,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.1" + "version": "4.11.0" }, "collection": { "dependency": "direct main", @@ -274,11 +294,11 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99", + "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "6.1.5" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -300,6 +320,16 @@ "source": "hosted", "version": "3.1.2" }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, "cross_file": { "dependency": "transitive", "description": { @@ -321,54 +351,54 @@ "version": "3.0.6" }, "custom_lint": { - "dependency": "direct dev", + "dependency": "transitive", "description": { "name": "custom_lint", - "sha256": "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e", + "sha256": "78085fbe842de7c5bef92de811ca81536968dbcbbcdac5c316711add2d15e796", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.8.0" }, "custom_lint_builder": { "dependency": "transitive", "description": { "name": "custom_lint_builder", - "sha256": "e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d", + "sha256": "cc5532d5733d4eccfccaaec6070a1926e9f21e613d93ad0927fad020b95c9e52", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.8.0" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e", + "sha256": "cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.8.0" }, "custom_lint_visitor": { "dependency": "transitive", "description": { "name": "custom_lint_visitor", - "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8", + "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0+7.3.0" + "version": "1.0.0+7.7.0" }, "dart_style": { "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af", + "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "dbus": { "dependency": "transitive", @@ -394,31 +424,31 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.4.0" + "version": "11.5.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.2" + "version": "7.0.3" }, "dio": { "dependency": "direct main", "description": { "name": "dio", - "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", + "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.8.0+1" + "version": "5.9.0" }, "dio_web_adapter": { "dependency": "transitive", @@ -434,11 +464,11 @@ "dependency": "direct main", "description": { "name": "dynamic_color", - "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", + "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.0" + "version": "1.8.1" }, "emoji_regex": { "dependency": "direct main", @@ -480,16 +510,6 @@ "source": "hosted", "version": "2.1.4" }, - "ffigen": { - "dependency": "direct dev", - "description": { - "name": "ffigen", - "sha256": "72d732c33557fc0ca9b46379d3deff2dadbdc539696dc0b270189e2989be20ef", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "18.1.0" - }, "file": { "dependency": "transitive", "description": { @@ -504,11 +524,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", + "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.7" + "version": "10.3.3" }, "file_selector_linux": { "dependency": "transitive", @@ -524,11 +544,11 @@ "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", + "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4+2" + "version": "0.9.4+4" }, "file_selector_platform_interface": { "dependency": "transitive", @@ -566,16 +586,6 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_acrylic": { - "dependency": "direct main", - "description": { - "name": "flutter_acrylic", - "sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, "flutter_cache_manager": { "dependency": "direct main", "description": { @@ -617,31 +627,31 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", + "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.28" + "version": "2.0.30" }, "flutter_riverpod": { "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "sha256": "ca2480512a8e840291325249f4857e363ffa5d1b77b132e189c9313a9d9fb9e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "3.0.0" }, "flutter_svg": { "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", + "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.1" }, "flutter_test": { "dependency": "direct dev", @@ -659,21 +669,21 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c", + "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.8" + "version": "3.2.3" }, "freezed_annotation": { "dependency": "direct main", "description": { "name": "freezed_annotation", - "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.1.0" }, "frontend_server_client": { "dependency": "transitive", @@ -779,11 +789,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", + "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "http_multi_server": { "dependency": "transitive", @@ -809,81 +819,81 @@ "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", + "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "image_picker_android": { "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb", + "sha256": "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12+23" + "version": "0.8.13+3" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83", + "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.1.0" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100", + "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12+2" + "version": "0.8.13" }, "image_picker_linux": { "dependency": "transitive", "description": { "name": "image_picker_linux", - "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9", + "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+2" + "version": "0.2.2" }, "image_picker_macos": { "dependency": "transitive", "description": { "name": "image_picker_macos", - "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1", + "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+2" + "version": "0.2.2" }, "image_picker_platform_interface": { "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0", + "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.10.1" + "version": "2.11.0" }, "image_picker_windows": { "dependency": "transitive", "description": { "name": "image_picker_windows", - "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", + "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+1" + "version": "0.2.2" }, "intl": { "dependency": "direct main", @@ -949,11 +959,11 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.5" + "version": "6.11.1" }, "launch_at_startup": { "dependency": "direct main", @@ -969,31 +979,31 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.9" + "version": "11.0.2" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.9" + "version": "3.0.10" }, "leak_tracker_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "lints": { "dependency": "transitive", @@ -1015,26 +1025,6 @@ "source": "hosted", "version": "1.3.0" }, - "lpinyin": { - "dependency": "direct main", - "description": { - "name": "lpinyin", - "sha256": "0bb843363f1f65170efd09fbdfc760c7ec34fc6354f9fcb2f89e74866a0d814a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "macos_window_utils": { - "dependency": "transitive", - "description": { - "name": "macos_window_utils", - "sha256": "4e683da162825018580c7341d9e926a6fa39a869a3504c2e5471618553bd55cd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.2" - }, "matcher": { "dependency": "transitive", "description": { @@ -1089,11 +1079,21 @@ "dependency": "direct main", "description": { "name": "mobile_scanner", - "sha256": "72f06a071aa8b14acea3ab43ea7949eefe4a2469731ae210e006ba330a033a8c", + "sha256": "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" + }, + "mockito": { + "dependency": "transitive", + "description": { + "name": "mockito", + "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0" }, "nm": { "dependency": "transitive", @@ -1105,6 +1105,16 @@ "source": "hosted", "version": "0.5.0" }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "package_config": { "dependency": "transitive", "description": { @@ -1119,21 +1129,21 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.0" + "version": "8.3.1" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "path": { "dependency": "direct main", @@ -1169,21 +1179,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.18" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1219,11 +1229,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -1249,11 +1259,21 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" }, "proxy": { "dependency": "direct main", @@ -1284,16 +1304,6 @@ "source": "hosted", "version": "1.5.0" }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, "re_editor": { "dependency": "direct main", "description": { @@ -1319,51 +1329,51 @@ "dependency": "direct main", "description": { "name": "riverpod", - "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "sha256": "135723ec44dfba141bc4696224048a408336e794228a0117439e7ad0a8be6d05", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "3.0.0" }, "riverpod_analyzer_utils": { "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3", + "sha256": "c971e50f678d55c87d9e3b5015df7fcaadb2302a84ea101247cf99387b4554fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.9" + "version": "1.0.0-dev.6" }, "riverpod_annotation": { "dependency": "direct main", "description": { "name": "riverpod_annotation", - "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "sha256": "1f9c1bc10b13f68ebc83ab391e77a865ff796880461d2a60c5ce301e1fb65f51", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "3.0.0" }, "riverpod_generator": { "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f", + "sha256": "178d6bfa6de66d7db97db2466e5fad2da91a678ab376a7309235eec731755046", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.4" + "version": "3.0.0" }, "riverpod_lint": { "dependency": "direct dev", "description": { "name": "riverpod_lint", - "sha256": "b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693", + "sha256": "89bce8d40bed52aa89b43ef45cfe473a9c7736629d61fc659c95e4e9f4d571a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.4" + "version": "3.0.0" }, "rxdart": { "dependency": "transitive", @@ -1439,11 +1449,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.12" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1505,6 +1515,26 @@ "source": "hosted", "version": "1.4.2" }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, "shelf_web_socket": { "dependency": "transitive", "description": { @@ -1535,21 +1565,41 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "3.1.0" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.5" + "version": "1.3.8" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" }, "source_span": { "dependency": "transitive", @@ -1585,21 +1635,21 @@ "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2+2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "sqflite_darwin": { "dependency": "transitive", @@ -1685,11 +1735,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.0" }, "term_glyph": { "dependency": "transitive", @@ -1701,15 +1751,35 @@ "source": "hosted", "version": "1.2.2" }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.26.2" + }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.6" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.11" }, "timing": { "dependency": "transitive", @@ -1725,11 +1795,11 @@ "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0", + "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.5.1" }, "typed_data": { "dependency": "transitive", @@ -1755,31 +1825,31 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.2" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.16" + "version": "6.3.22" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.4" }, "url_launcher_linux": { "dependency": "transitive", @@ -1795,11 +1865,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.3" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1845,11 +1915,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.18" + "version": "1.1.19" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1865,41 +1935,41 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", + "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.17" + "version": "1.1.19" }, "vector_math": { "dependency": "transitive", "description": { "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.2" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.3" }, "web": { "dependency": "transitive", @@ -1941,15 +2011,25 @@ "source": "hosted", "version": "1.2.2" }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.0" + "version": "5.14.0" }, "win32_registry": { "dependency": "direct main", @@ -1974,11 +2054,11 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.5.1" }, "xdg_directories": { "dependency": "transitive", @@ -1994,11 +2074,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" }, "yaml": { "dependency": "transitive", @@ -2009,20 +2089,10 @@ }, "source": "hosted", "version": "3.1.3" - }, - "yaml_edit": { - "dependency": "transitive", - "description": { - "name": "yaml_edit", - "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.2" } }, "sdks": { - "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.29.0" + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" } } From b3836bf54c9c75708110f39e3762346fc0eb2d50 Mon Sep 17 00:00:00 2001 From: kyehn Date: Thu, 25 Sep 2025 11:24:59 +0800 Subject: [PATCH 0109/2279] flclash: refactor --- pkgs/by-name/fl/flclash/package.nix | 20 +++++++++----------- pkgs/by-name/fl/flclash/update.sh | 12 ++++++------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 32ba400d8a09..84add28784b9 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -28,16 +28,16 @@ let GIT_CONFIG_VALUE_0 = "git@github.com:"; }); - metaCommon = { - description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free"; + meta = { + description = "Proxy client based on ClashMeta, simple and easy to use"; homepage = "https://github.com/chen08209/FlClash"; license = with lib.licenses; [ gpl3Plus ]; maintainers = [ ]; }; - libclash = buildGoModule { - inherit version src; - pname = "libclash"; + core = buildGoModule { + pname = "core"; + inherit version src meta; modRoot = "core"; @@ -53,8 +53,6 @@ let runHook postBuild ''; - - meta = metaCommon; }; in flutter335.buildFlutterApplication { @@ -98,19 +96,19 @@ flutter335.buildFlutterApplication { preBuild = '' mkdir -p libclash/linux - cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore + cp ${core}/bin/FlClashCore libclash/linux/FlClashCore ''; postInstall = '' - install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png + install -D --mode=0644 assets/images/icon.png $out/share/pixmaps/flclash.png ''; passthru = { - inherit libclash; + inherit core; updateScript = ./update.sh; }; - meta = metaCommon // { + meta = meta // { mainProgram = "FlClash"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/fl/flclash/update.sh b/pkgs/by-name/fl/flclash/update.sh index b2fea37f8187..37627d5043b6 100755 --- a/pkgs/by-name/fl/flclash/update.sh +++ b/pkgs/by-name/fl/flclash/update.sh @@ -1,20 +1,20 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update +#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update set -eou pipefail -ROOT="$(dirname "$(readlink -f "$0")")" +PACKAGE_DIR=$(realpath "$(dirname "$0")") -latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name) +latestTag=$(curl --fail --location --silent ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name) latestVersion=$(echo "$latestTag" | sed 's/^v//') -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"') +currentVersion=$(nix eval --file . --raw flclash.version) if [[ "$currentVersion" == "$latestVersion" ]]; then echo "package is up-to-date: $currentVersion" exit 0 fi -nix-update --subpackage libclash flclash +nix-update --subpackage core --use-github-releases flclash -curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json +curl --fail --location --silent https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json From f0b3f5c365e36f1b93bffb42d592a5d491128a36 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 27 Sep 2025 07:48:09 +0000 Subject: [PATCH 0110/2279] flclash: 0.8.88 -> 0.8.90 --- pkgs/by-name/fl/flclash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 84add28784b9..dfe911fd2de5 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -12,14 +12,14 @@ let pname = "flclash"; - version = "0.8.88"; + version = "0.8.90"; src = (fetchFromGitHub { owner = "chen08209"; repo = "FlClash"; tag = "v${version}"; - hash = "sha256-yhIaYIlAyc2+oHkMRA9ybBQ+14URBY2kUp9wqTgFrwI="; + hash = "sha256-wEgWjzdP7HeWgDacaP9fYNczG9BrTN790AQ5aj9scwM="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -41,7 +41,7 @@ let modRoot = "core"; - vendorHash = "sha256-ekNuZ3Uv6TDfyZ4hVvXA3Wft4fetaXzddKIpis4ER1g="; + vendorHash = "sha256-5oYJMcyKh8CpMLOLch5/svwa148hY4rnSR5inTRNK4M="; env.CGO_ENABLED = 0; From 4349f1b9a90c3f37f46f27494bec4f2988b24c6e Mon Sep 17 00:00:00 2001 From: kyehn Date: Thu, 9 Oct 2025 01:48:45 +0000 Subject: [PATCH 0111/2279] dart.hotkey_manager_linux: init --- .../dart/package-source-builders/default.nix | 1 + .../hotkey_manager_linux/default.nix | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index c19832506b78..16e70b9ec0ba 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -7,6 +7,7 @@ flutter_vodozemac = callPackage ./flutter_vodozemac { }; flutter_volume_controller = callPackage ./flutter_volume_controller { }; handy_window = callPackage ./handy-window { }; + hotkey_manager_linux = callPackage ./hotkey_manager_linux { }; matrix = callPackage ./matrix { }; media_kit_libs_linux = callPackage ./media_kit_libs_linux { }; olm = callPackage ./olm { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix new file mode 100644 index 000000000000..51b2d8d69847 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix @@ -0,0 +1,27 @@ +{ + stdenv, +}: + +{ version, src, ... }: + +stdenv.mkDerivation { + pname = "hotkey_manager_linux"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + pushd ${src.passthru.packageRoot} + substituteInPlace linux/hotkey_manager_linux_plugin.cc \ + --replace-fail "const char* identifier;" "const char* identifier = nullptr;" \ + --replace-fail "const char* keystring;" "const char* keystring = nullptr;" + popd + ''; + + installPhase = '' + runHook preInstall + + cp --recursive . "$out" + + runHook postInstall + ''; +} From 0e947838b56c22d454581d3942cc05530fb08ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Oct 2025 08:15:09 -0700 Subject: [PATCH 0112/2279] catch2_3: 3.10.0 -> 3.11.0 Diff: https://github.com/catchorg/Catch2/compare/v3.10.0...v3.11.0 Changelog: https://github.com/catchorg/Catch2/blob/v3.11.0/docs/release-notes.md --- pkgs/by-name/ca/catch2_3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix index 269a445c48a4..5afa01a642f5 100644 --- a/pkgs/by-name/ca/catch2_3/package.nix +++ b/pkgs/by-name/ca/catch2_3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; tag = "v${version}"; - hash = "sha256-eeqqzHMeXLRiXzbY+ay8gJ/YDuxDj3f6+d6eXA1uZHE="; + hash = "sha256-7Dx7PhtRwkbo8vHF57sAns2fQZ442D3cMyCt25RvzJc="; }; patches = lib.optionals stdenv.cc.isClang [ From bd0dd33de11c7905028f6521a54a8e99e8de4d94 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 0113/2279] cc-wrapper: always include libc++ in the search path The libc++ headers are expected to be found in the sysroot when `clang` is invoked for C++ code. Always making them available improves compatibility with build systems like Bazel and SwiftPM, which try to compile C++ code with `clang`. --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index eb5b99643dba..246c1b1f65f6 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -140,6 +140,15 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then params=(${kept+"${kept[@]}"}) fi +# Some build systems such as Bazel and SwiftPM use `clang` instead of `clang++`, +# which will find the libc++ headers in the sysroot for C++ files. +if [[ "$isCxx" = 0 && "@isClang@" ]]; then +# This duplicates the behavior of a native toolchain, which can find the +# libc++ headers but requires `-lc++` to be specified explicitly when linking. + isCxx=1 + cxxLibrary=0 +fi + if [[ "$isCxx" = 1 ]]; then if [[ "$cxxInclude" = 1 ]]; then # From 76a8ffa6d8d2f93b81d4e9be327a01cab1c893c0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0114/2279] cc-wrapper: use `-cxx-isystem` instead of `-isystem` on Clang This allows Clang to always look for the libc++ headers when compling C++ code (regardless of whether it is invoked with `clang` or `clang++` while not exposing the headers when compiling plain C code. See https://releases.llvm.org/21.1.0/tools/clang/docs/ClangCommandLineReference.html#cmdoption-clang-cxx-isystem-directory --- pkgs/build-support/cc-wrapper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 50ff90609a5e..427161f4742c 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -741,14 +741,14 @@ stdenvNoCC.mkDerivation { # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903) + optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) '' for dir in ${gccForLibs}/include/c++/*; do - include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags + include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags done for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do - include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags + include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags done '' + optionalString (libcxx.isLLVM or false) '' - include -isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + include -cxx-isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags '' # GCC NG friendly libc++ From 6cf50d7e1e0aeb2f90d693ca34ef1cd028ea473a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 9 Oct 2025 13:26:04 +0200 Subject: [PATCH 0115/2279] python3Packages.sphinx-autodoc-typehints: 3.2.0 -> 3.4.0 https://github.com/tox-dev/sphinx-autodoc-typehints/releases/tag/3.4.0 --- .../python-modules/sphinx-autodoc-typehints/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 200af582e86b..f06e3580fddc 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -4,26 +4,23 @@ fetchPypi, hatch-vcs, hatchling, - pythonOlder, sphinx, pytestCheckHook, }: let pname = "sphinx-autodoc-typehints"; - version = "3.2.0"; + version = "3.4.0"; in buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-EHrJi8i0g3ICyIwHNtWdbaRAduZaDX19VDp4Yx9mKps="; + hash = "sha256-oknrcmSdBbS4fUKgykIln1UEmg/xVTk0FGP1nkslasU="; }; pythonRelaxDeps = [ "sphinx" ]; From 7b3a342260ecb20350acc42eb7593f8ffc9bec26 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Wed, 8 Oct 2025 09:38:44 -0700 Subject: [PATCH 0116/2279] go: restrict default pie patch to known good GOARCH Blanket application of the patch was insufficiently pessimistic. The original plan from discussion in matrix was that BuildModeSupported("gc", "pie", goos, goarch) should let us know if default pie would work, however it seems that in some cases BuildModeSupported can return true but pie will fail anyway. Let's make an allowlist of GOARCH values so we aren't breaking any value that has not been tested. Co-authored-by: Philip Taron --- pkgs/development/compilers/go/1.24.nix | 26 ++++++++++++++++++++++++++ pkgs/development/compilers/go/1.25.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index 8ee9c0f16725..de002ec70b09 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -24,6 +24,30 @@ let targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; isCross = stdenv.buildPlatform != stdenv.targetPlatform; + + # In order for buildmode=pie to work either Go's internal linker must know how + # to produce position-independent executables or Go must be using an external linker. + # + # go-default-pie.patch tries to enable position-independent codegen (PIE) only when the platform + # reports support (via BuildModeSupported(..., "pie", ...)). + # + # That probe is not fully reliable: for example, `pkgsi686Linux.go` can fail during bootstrap + # with message 'default PIE binary requires external (cgo) linking, but cgo is not enabled' + # despite CGO being enabled. (we set `CGO_ENABLED=1`). + # + # To avoid such breakage, limit this patch to a small set of explicitly tested platforms + # rather than relying on the general BuildModeSupported("pie") check. + supportsDefaultPie = + let + hasPie = { + "amd64" = true; + "arm64" = true; + "ppc64le" = true; + "riscv64" = true; + }; + in + hasPie.${stdenv.hostPlatform.go.GOARCH} or false + && hasPie.${stdenv.targetPlatform.go.GOARCH} or false; in stdenv.mkDerivation (finalAttrs: { pname = "go"; @@ -65,6 +89,8 @@ stdenv.mkDerivation (finalAttrs: { ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch ./go-env-go_ldso.patch + ] + ++ lib.optionals supportsDefaultPie [ (replaceVars ./go-default-pie.patch { inherit (stdenv.targetPlatform.go) GOARCH; }) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index d61039eba543..db50761a4bbc 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -30,6 +30,30 @@ let targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; isCross = stdenv.buildPlatform != stdenv.targetPlatform; + + # go-default-pie.patch tries to enable position-independent codegen (PIE) only when the platform + # reports support (via BuildModeSupported(..., "pie", ...)). + # + # In order for buildmode=pie to work either Go's internal linker must know how + # to produce position-independent executables or Go must be using an external linker. + # + # That probe is not fully reliable: for example, `pkgsi686Linux.go` can fail during bootstrap + # with message 'default PIE binary requires external (cgo) linking, but cgo is not enabled' + # despite CGO being enabled. (we set `CGO_ENABLED=1`). + # + # To avoid such breakage, limit this patch to a small set of explicitly tested platforms + # rather than relying on the general BuildModeSupported("pie") check. + supportsDefaultPie = + let + hasPie = { + "amd64" = true; + "arm64" = true; + "ppc64le" = true; + "riscv64" = true; + }; + in + hasPie.${stdenv.hostPlatform.go.GOARCH} or false + && hasPie.${stdenv.targetPlatform.go.GOARCH} or false; in stdenv.mkDerivation (finalAttrs: { pname = "go"; @@ -75,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { ./remove-tools-1.11.patch ./go_no_vendor_checks-1.23.patch ./go-env-go_ldso.patch + ] + ++ lib.optionals supportsDefaultPie [ (replaceVars ./go-default-pie.patch { inherit (stdenv.targetPlatform.go) GOARCH; }) From a9d1b3ef25aeb10dc740a842ef15211c89b170fb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 9 Oct 2025 18:42:13 +0200 Subject: [PATCH 0117/2279] python3Packages.pytest-regressions: Disable borked tests on big-endian & i686 --- .../python-modules/pytest-regressions/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 18286d14fcd9..ac36a4ae5657 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -63,6 +64,13 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; + disabledTests = lib.optionals (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isBigEndian) [ + # https://github.com/ESSS/pytest-regressions/issues/156 + # i686-linux not listed in the report, but seems to have this issue as well + "test_different_data_types" + "test_common_case" # not listed in the issue, but fails after the above is skipped + ]; + pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" From e7fbed853bed8e57eef7aee93dafa955dd9a321f Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 7 Oct 2025 21:42:46 -0700 Subject: [PATCH 0118/2279] treewide: remove usages of obsolete pie hardening flag --- .../audio/magnetophonDSP/VoiceOfFaust/default.nix | 4 ---- pkgs/applications/networking/irc/weechat/default.nix | 2 -- pkgs/by-name/_2/_2ship2harkinian/package.nix | 3 --- pkgs/by-name/ba/bakelite/package.nix | 1 - pkgs/by-name/ch/chrony/package.nix | 2 -- pkgs/by-name/dn/dnsmasq/package.nix | 2 -- pkgs/by-name/fa/faustPhysicalModeling/package.nix | 4 ---- pkgs/by-name/ic/icecast/package.nix | 2 -- pkgs/by-name/is/isc-cron/package.nix | 2 -- pkgs/by-name/ke/kexec-tools/package.nix | 1 - pkgs/by-name/ke/keydb/package.nix | 2 -- pkgs/by-name/lw/lwan/package.nix | 2 -- pkgs/by-name/ly/lynx/package.nix | 2 -- pkgs/by-name/me/memcached/package.nix | 2 -- pkgs/by-name/ne/netclient/package.nix | 2 -- pkgs/by-name/nt/ntp/package.nix | 2 -- pkgs/by-name/po/postfix/package.nix | 1 - pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 2 -- pkgs/by-name/re/redict/package.nix | 2 -- pkgs/by-name/re/redis/package.nix | 2 -- pkgs/by-name/rs/rspamd/package.nix | 2 -- pkgs/by-name/sd/sdcc/package.nix | 4 ---- pkgs/by-name/se/seabios/package.nix | 1 - pkgs/by-name/sh/shncpd/package.nix | 2 -- pkgs/by-name/so/socat/package.nix | 2 -- pkgs/by-name/so/solo5/package.nix | 2 -- pkgs/by-name/ss/sshesame/package.nix | 2 -- pkgs/by-name/sy/syslinux/package.nix | 1 - pkgs/by-name/va/valgrind/package.nix | 1 - pkgs/by-name/va/valkey/package.nix | 2 -- pkgs/development/compilers/fpc/default.nix | 3 --- pkgs/development/compilers/gcc/default.nix | 1 - pkgs/development/compilers/ghc/9.0.2-binary.nix | 7 ------- pkgs/development/compilers/ghc/9.2.4-binary.nix | 7 ------- pkgs/development/compilers/ghc/9.6.3-binary.nix | 7 ------- pkgs/development/compilers/ghc/9.8.4-binary.nix | 7 ------- pkgs/development/compilers/ghc/common-hadrian.nix | 6 ------ .../compilers/ghc/common-make-native-bignum.nix | 6 ------ pkgs/development/compilers/ocaml/generic.nix | 3 +-- pkgs/development/compilers/yosys/plugins/symbiflow.nix | 1 - pkgs/development/haskell-modules/generic-builder.nix | 8 +------- pkgs/development/interpreters/clisp/default.nix | 5 ----- pkgs/development/interpreters/python/cpython/default.nix | 3 --- pkgs/development/libraries/gcc/libgcc/default.nix | 2 -- pkgs/development/libraries/glibc/default.nix | 3 +-- pkgs/development/ocaml-modules/wasm/default.nix | 3 --- pkgs/development/tools/buildah/default.nix | 3 --- pkgs/development/tools/misc/binutils/2.38/default.nix | 1 - pkgs/development/tools/misc/binutils/default.nix | 1 - pkgs/development/tools/ocaml/ocamlbuild/default.nix | 3 --- pkgs/os-specific/linux/busybox/default.nix | 1 - pkgs/os-specific/linux/kernel/manual-config.nix | 1 - pkgs/servers/http/nginx/generic.nix | 2 -- pkgs/servers/http/tengine/default.nix | 2 -- pkgs/servers/nosql/mongodb/mongodb.nix | 2 -- pkgs/servers/sql/postgresql/libpq.nix | 2 -- pkgs/test/cc-wrapper/hardening.nix | 2 -- pkgs/tools/networking/openssh/common.nix | 2 -- pkgs/tools/networking/privoxy/default.nix | 2 -- pkgs/tools/package-management/lix/common-lix.nix | 1 - pkgs/tools/package-management/nix/common-meson.nix | 2 -- .../nix/modular/packaging/components.nix | 1 - pkgs/tools/text/gawk/default.nix | 6 ------ 63 files changed, 3 insertions(+), 164 deletions(-) diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 8a2974b8517b..220d3fe68d53 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { faust2lv2 ]; - # ld: crtbegin.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object - # ld: failed to set dynamic section sizes: bad value - hardeningDisable = [ "pie" ]; - enableParallelBuilding = true; dontWrapQtApps = true; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 3cea1541e636..f7c4235b16a8 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -158,8 +158,6 @@ stdenv.mkDerivation rec { ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; - hardeningEnable = [ "pie" ]; - env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 628c25666d95..ae11ddc63bb3 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -150,9 +150,6 @@ stdenv.mkDerivation (finalAttrs: { # Linking fails without this hardeningDisable = [ "format" ]; - # Pie needs to be enabled or else it segfaults - hardeningEnable = [ "pie" ]; - preConfigure = '' # mirror 2ship's stb mkdir stb diff --git a/pkgs/by-name/ba/bakelite/package.nix b/pkgs/by-name/ba/bakelite/package.nix index 252f4b36a2da..2505599b78e1 100644 --- a/pkgs/by-name/ba/bakelite/package.nix +++ b/pkgs/by-name/ba/bakelite/package.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { hash = "sha256-rRJrtCcgfbqC/4qQiTVeUUcPqoJlNfitYRqIO58AmpA="; }; - hardeningEnable = [ "pie" ]; preBuild = '' # pipe2() is only exposed with _GNU_SOURCE # Upstream makefile explicitly uses -O3 to improve SHA-3 performance diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix index 602da83f6b2f..024e59cce880 100644 --- a/pkgs/by-name/ch/chrony/package.nix +++ b/pkgs/by-name/ch/chrony/package.nix @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - passthru.tests = { inherit (nixosTests) chrony chrony-ptp; }; diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix index 90dca5e23caf..b5f4872b0cdb 100644 --- a/pkgs/by-name/dn/dnsmasq/package.nix +++ b/pkgs/by-name/dn/dnsmasq/package.nix @@ -53,8 +53,6 @@ stdenv.mkDerivation rec { "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; - hardeningEnable = [ "pie" ]; - postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' make -C contrib/lease-tools ''; diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix index a2e928592842..cd88e6668e45 100644 --- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix +++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { bash ]; - # ld: /nix/store/*-gcc-14-20241116/lib/gcc/x86_64-unknown-linux-gnu/14.2.1/crtbegin.o: - # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object - hardeningDisable = [ "pie" ]; - dontWrapQtApps = true; buildPhase = '' diff --git a/pkgs/by-name/ic/icecast/package.nix b/pkgs/by-name/ic/icecast/package.nix index 5affabed1b52..7200b2e25c90 100644 --- a/pkgs/by-name/ic/icecast/package.nix +++ b/pkgs/by-name/ic/icecast/package.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { libopus ]; - hardeningEnable = [ "pie" ]; - meta = { description = "Server software for streaming multimedia"; mainProgram = "icecast"; diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix index 137273c9f393..fb9b58c586f7 100644 --- a/pkgs/by-name/is/isc-cron/package.nix +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: { "DESTROOT=$(out)" ]; - hardeningEnable = [ "pie" ]; - unpackCmd = '' mkdir cron pushd cron diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index d4afe126caa4..10c401086564 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { "format" "pic" "relro" - "pie" ]; # Prevent kexec-tools from using uname to detect target, which is wrong in diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix index c0fc9248be38..6d7bae68fc48 100644 --- a/pkgs/by-name/ke/keydb/package.nix +++ b/pkgs/by-name/ke/keydb/package.nix @@ -57,8 +57,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix index 2034caffd516..c564cff8490c 100644 --- a/pkgs/by-name/lw/lwan/package.nix +++ b/pkgs/by-name/lw/lwan/package.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { # Note: tcmalloc and mimalloc are also supported (and normal malloc) cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc"; - hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "pie"; - meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; mainProgram = "lwan"; diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix index c5e48d45e42f..9aedcccb6e81 100644 --- a/pkgs/by-name/ly/lynx/package.nix +++ b/pkgs/by-name/ly/lynx/package.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningEnable = [ "pie" ]; - configureFlags = [ "--enable-default-colors" "--enable-widec" diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix index dcce7f82a05e..ce401cc550f3 100644 --- a/pkgs/by-name/me/memcached/package.nix +++ b/pkgs/by-name/me/memcached/package.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { libevent ]; - hardeningEnable = [ "pie" ]; - env.NIX_CFLAGS_COMPILE = toString ( [ "-Wno-error=deprecated-declarations" ] ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-error" ); diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index aa368abda7c2..645aba44e5d1 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -21,8 +21,6 @@ buildGoModule rec { buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11; - hardeningEnabled = [ "pie" ]; - meta = { description = "Automated WireGuard® Management Client"; mainProgram = "netclient"; diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix index 3f1fb3134c68..fcf00bce2845 100644 --- a/pkgs/by-name/nt/ntp/package.nix +++ b/pkgs/by-name/nt/ntp/package.nix @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { libcap ]; - hardeningEnable = [ "pie" ]; - postInstall = '' rm -rf $out/share/doc ''; diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index e615ebd3568e..539b6e487a80 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { ++ lib.optional withTLSRPT libtlsrpt; hardeningDisable = [ "format" ]; - hardeningEnable = [ "pie" ]; patches = [ ./postfix-script-shell.patch diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index c08ca124feae..c7c579ad6f35 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -74,8 +74,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional gamemodeSupport gamemode; - hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ]; - cmakeFlags = [ # downstream branding (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs") diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix index eacfc8278357..636fe7882489 100644 --- a/pkgs/by-name/re/redict/package.nix +++ b/pkgs/by-name/re/redict/package.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 48eccfc821eb..bf25ebe52b1d 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -66,8 +66,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo"; # darwin currently lacks a pure `pgrep` which is extensively used here diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 3159e749318e..86ebff4bccfd 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -56,8 +56,6 @@ stdenv.mkDerivation rec { }) ]; - hardeningEnable = [ "pie" ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index 47921b2f3283..d96e7a988215 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -104,10 +104,6 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - # ${src}/support/cpp/gcc/Makefile.in states: - # We don't want to compile the compilers with -fPIE, it make PCH fail. - hardeningDisable = [ "pie" ]; - meta = { homepage = "https://sdcc.sourceforge.net/"; description = "Small Device C Compiler"; diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index a03cb8b0730c..b92735de1e73 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "fortify" "pic" - "pie" # ld: warning: creating DT_TEXTREL in a PIE (and more) "stackprotector" ]; diff --git a/pkgs/by-name/sh/shncpd/package.nix b/pkgs/by-name/sh/shncpd/package.nix index 787371f12112..248421cc4454 100644 --- a/pkgs/by-name/sh/shncpd/package.nix +++ b/pkgs/by-name/sh/shncpd/package.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation { sha256 = "1sj7a77isc2jmh7gw2naw9l9366kjx6jb909h7spj7daxdwvji8f"; }; - hardeningEnable = [ "pie" ]; - preConfigure = '' makeFlags=( "PREFIX=$out" ) ''; diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index e208234f2332..f3e1774f6c48 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { readline ]; - hardeningEnable = [ "pie" ]; - enableParallelBuilding = true; nativeCheckInputs = [ diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 7f92d9d08b15..dc8f60578612 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation { hash = "sha256-KbeY667Y/ZPUuRIGYOZMMAuVEVJ7Kn9UDUSThX5zfII="; }; - hardeningEnable = [ "pie" ]; - configurePhase = '' runHook preConfigure sh configure.sh --prefix=/ diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix index 1b0b5daf257d..6814abb0ef8a 100644 --- a/pkgs/by-name/ss/sshesame/package.nix +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -24,8 +24,6 @@ buildGoModule rec { "-w" ]; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/sy/syslinux/package.nix b/pkgs/by-name/sy/syslinux/package.nix index a77d8f66a2c0..abc948ed3321 100644 --- a/pkgs/by-name/sy/syslinux/package.nix +++ b/pkgs/by-name/sy/syslinux/package.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" - "pie" # MBR gets too big with PIE "stackprotector" "fortify" ]; diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix index f15572b5acbf..a736e1669331 100644 --- a/pkgs/by-name/va/valgrind/package.nix +++ b/pkgs/by-name/va/valgrind/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { ]; hardeningDisable = [ - "pie" "stackprotector" ]; diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index beb4b27c8f3e..9f8d6098eaa0 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -64,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); # darwin currently lacks a pure `pgrep` which is extensively used here diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 7ac3fc752443..7cef2840a902 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -80,9 +80,6 @@ stdenv.mkDerivation rec { "FPC=${startFPC}/bin/fpc" ]; - # disabled by default in fpcsrc/compiler/llvm/agllvm.pas - hardeningDisable = [ "pie" ]; - installFlags = [ "INSTALL_PREFIX=\${out}" ]; postInstall = '' diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index e6acca591005..1e1040c4372f 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -234,7 +234,6 @@ pipe hardeningDisable = [ "format" - "pie" "stackclashprotection" ]; diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index acf7effd7083..3ff091165b39 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -474,13 +474,6 @@ stdenv.mkDerivation { "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = [ "pie" ]; - doInstallCheck = true; installCheckPhase = '' # Sanity check, can ghc create executables? diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix index 44544744244a..ea9cf49efff2 100644 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -438,13 +438,6 @@ stdenv.mkDerivation { "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = [ "pie" ]; - doInstallCheck = true; installCheckPhase = '' # Sanity check, can ghc create executables? diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 2ca353f8ee21..fcfa43f64b24 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -417,13 +417,6 @@ stdenv.mkDerivation { "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = [ "pie" ]; - doInstallCheck = true; installCheckPhase = '' # Sanity check, can ghc create executables? diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index df3f507f33d8..7c5ad0030dac 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -432,13 +432,6 @@ stdenv.mkDerivation { "$out/bin/ghc-pkg" --package-db="$package_db" recache ''; - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = [ "pie" ]; - doInstallCheck = true; installCheckPhase = '' # Sanity check, can ghc create executables? diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 9de5636d43a3..60224a33d236 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -780,14 +780,8 @@ stdenv.mkDerivation ( checkTarget = "test"; - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "format" - "pie" ]; # big-parallel allows us to build with more than 2 cores on diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 401a65a11ded..1629828c4951 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -600,14 +600,8 @@ stdenv.mkDerivation ( checkTarget = "test"; - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 hardeningDisable = [ "format" - "pie" ]; # big-parallel allows us to build with more than 2 cores on diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 4d834f272740..f7cba3bda116 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -134,8 +134,7 @@ stdenv.mkDerivation ( ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = - lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" - ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow" + lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow" ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; # Older versions have some race: diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 4b6a8c3ecbd6..6e36efad1331 100644 --- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -39,7 +39,6 @@ let static_gtest = gtest.overrideAttrs (old: { dontDisableStatic = true; - disableHardening = [ "pie" ]; cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ]; }); diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 9e8953079690..7a4cb351a38f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -730,13 +730,7 @@ lib.fix ( # package specifies `hardeningDisable`. hardeningDisable = lib.optionals (args ? hardeningDisable) hardeningDisable - ++ lib.optional (ghc.isHaLVM or false) "all" - # Static libraries (ie. all of pkgsStatic.haskellPackages) fail to build - # because by default Nix adds `-pie` to the linker flags: this - # conflicts with the `-r` and `-no-pie` flags added by GHC (see - # https://gitlab.haskell.org/ghc/ghc/-/issues/19580). hardeningDisable - # changes the default Nix behavior regarding adding "hardening" flags. - ++ lib.optional enableStaticLibraries "pie"; + ++ lib.optional (ghc.isHaLVM or false) "all"; configurePhase = '' runHook preConfigure diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 7b2ef292fc42..1a09cdef7895 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -122,11 +122,6 @@ stdenv.mkDerivation { cd builddir ''; - # ;; Loading file ../src/defmacro.lisp ... - # *** - handle_fault error2 ! address = 0x8 not in [0x1000000c0000,0x1000000c0000) ! - # SIGSEGV cannot be cured. Fault address = 0x8. - hardeningDisable = [ "pie" ]; - doCheck = true; postInstall = lib.optionalString (withModules != [ ]) '' diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 58a2a5c4e2e6..8a724e597e14 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -584,9 +584,6 @@ stdenv.mkDerivation (finalAttrs: { export CFLAGS_NODIST="-fno-semantic-interposition" ''; - # Our aarch64-linux bootstrap files lack Scrt1.o, which fails the config test - hardeningEnable = lib.optionals (!withMinimalDeps && !stdenv.hostPlatform.isAarch64) [ "pie" ]; - setupHook = python-setup-hook sitePackages; postInstall = diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index 1085e9b301f6..022b766d9097 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -48,8 +48,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot=$(readlink -e "./libgcc") ''; - hardeningDisable = [ "pie" ]; - preConfigure = '' # Drop in libiberty, as external builds are not expected cd "$buildRoot" diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index bb876ba2ee1f..68ea0b1f0fb9 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -58,12 +58,11 @@ in makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") ''; - # The pie, stackprotector and fortify hardening flags are autodetected by + # The stackprotector and fortify hardening flags are autodetected by # glibc and enabled by default if supported. Setting it for every gcc # invocation does not work. hardeningDisable = [ "fortify" - "pie" "stackprotector" "strictflexarrays3" ]; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 5af0836ed2ca..24fe6fb00061 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -24,9 +24,6 @@ buildDunePackage rec { export sourceRoot=$PWD ''; - # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together - hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; - nativeBuildInputs = [ menhir odoc diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 836faaa40936..117f8fc9c3ab 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -35,9 +35,6 @@ buildGoModule (finalAttrs: { doCheck = false; - # /nix/store/.../bin/ld: internal/mkcw/embed/entrypoint_amd64.o: relocation R_X86_64_32S against `.rodata.1' can not be used when making a PIE object; recompile with -fPIE - hardeningDisable = [ "pie" ]; - nativeBuildInputs = [ go-md2man installShellFiles diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 4b3c8443dbbc..80a34de000ea 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -179,7 +179,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" - "pie" ]; configurePlatforms = [ diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 2dee9eb4f572..706489915c3f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -209,7 +209,6 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" - "pie" ]; configurePlatforms = [ diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 03460b3b5548..5458c9bfbf9c 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -31,9 +31,6 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; - # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together - hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; - configurePhase = '' runHook preConfigure diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index ed1f723d5ee2..06e713a9dacd 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" - "pie" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 33dcd77fcbb3..a41ae39b7eac 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -573,7 +573,6 @@ lib.makeOverridable ( "fortify" "stackprotector" "pic" - "pie" ]; makeFlags = [ diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index ac58212aed82..1545f9f5a05c 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -254,8 +254,6 @@ stdenv.mkDerivation { --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}" '' postPatch; - hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie"; - enableParallelBuilding = true; preInstall = '' diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 5a856b21c541..f949284f808d 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -137,8 +137,6 @@ stdenv.mkDerivation rec { preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); - hardeningEnable = optional (!stdenv.hostPlatform.isDarwin) "pie"; - enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index b847dfc278df..82713f60f66a 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -178,8 +178,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardeningEnable = [ "pie" ]; - meta = with lib; { description = "Scalable, high-performance, open source NoSQL database"; homepage = "http://www.mongodb.org"; diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 3048e467397b..79cb7e76360f 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -52,8 +52,6 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; - hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; - outputs = [ "out" "dev" diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix index c5ce7f3836ae..fae8d72c2989 100644 --- a/pkgs/test/cc-wrapper/hardening.nix +++ b/pkgs/test/cc-wrapper/hardening.nix @@ -696,7 +696,6 @@ nameDrvAfterAttrName ( relROExplicitDisabled = brokenIf true ( checkTestBin (f2exampleWithStdEnv stdenv { - hardeningDisable = [ "pie" ]; }) { ignoreRelRO = false; @@ -1202,7 +1201,6 @@ nameDrvAfterAttrName ( hardeningDisable = [ "all" ]; hardeningEnable = [ "fortify" - "pie" ]; }; in diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index ccf4964539cc..f08a9665e601 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -136,8 +136,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - hardeningEnable = [ "pie" ]; - doCheck = false; enableParallelChecking = false; nativeCheckInputs = [ diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 5d70b379e6ef..b55637e6649c 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { }) ]; - hardeningEnable = [ "pie" ]; - nativeBuildInputs = [ autoreconfHook w3m diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index a777fa228986..d34a4590823a 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -373,7 +373,6 @@ stdenv.mkDerivation (finalAttrs: { # fortify breaks the build with lto and musl for some reason ++ lib.optional stdenv.hostPlatform.isMusl "fortify"; - # hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic; enableParallelBuilding = true; diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 66a221c55521..40094ecac21b 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -101,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ]; - hardeningDisable = [ "shadowstack" ] diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index 2a8b5e12a4c4..df8ee0671382 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -150,7 +150,6 @@ let pkg-config ]; separateDebugInfo = !stdenv.hostPlatform.isStatic; - hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; }; mesonLibraryLayer = finalAttrs: prevAttrs: { diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 6bc745fe88b7..015b2409e115 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -32,12 +32,6 @@ stdenv.mkDerivation rec { hash = "sha256-+MNIZQnecFGSE4sA7ywAu73Q6Eww1cB9I/xzqdxMycw="; }; - # PIE is incompatible with the "persistent malloc" ("pma") feature. - # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld` - # wrapped still passes `-pie` flag to linker and breaks linkage. - # Let's disable "pie" until `ld` is fixed to do the right thing. - hardeningDisable = [ "pie" ]; - # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" From 6eac86d4992a22c3a162c2d9986574f6b3a1f124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Oct 2025 11:44:41 -0700 Subject: [PATCH 0119/2279] python3Packages.libpass: 1.9.2 -> 1.9.3 Diff: https://github.com/ThirVondukr/passlib/compare/1.9.2...1.9.3 Changelog: https://github.com/ThirVondukr/passlib/blob/1.9.3/CHANGELOG.md --- pkgs/development/python-modules/libpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix index 834d0b512b9e..baffb02b134e 100644 --- a/pkgs/development/python-modules/libpass/default.nix +++ b/pkgs/development/python-modules/libpass/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "libpass"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; src = fetchFromGitHub { owner = "ThirVondukr"; repo = "passlib"; tag = version; - hash = "sha256-xL+92LdZxCH+yu2vz2AC44b4EYiGJbWfPkoSO3mSSjw="; + hash = "sha256-fzI9HpGE3wNK41ZSOeA5NAr5T4r3Jzdqe5+SHoWVXUs="; }; build-system = [ hatchling ]; From 375da609d8cf5958440b45bfc37eea2e294709ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 1 Oct 2025 14:54:26 -0700 Subject: [PATCH 0120/2279] python3Packages.bcrypt: 4.3.0 -> 5.0.0 Diff: https://github.com/pyca/bcrypt/compare/4.3.0...5.0.0 Changelog: https://github.com/pyca/bcrypt/blob/5.0.0/README.rst#changelog --- .../python-modules/bcrypt/default.nix | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index e900f539fc97..3c279c73bff7 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -5,12 +5,9 @@ rustPlatform, rustc, setuptools, - setuptoolsRustBuildHook, - fetchPypi, - pythonOlder, + setuptools-rust, + fetchFromGitHub, pytestCheckHook, - libiconv, - stdenv, # for passthru.tests asyncssh, django_4, @@ -21,14 +18,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.3.0"; - format = "pyproject"; + version = "5.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg="; + src = fetchFromGitHub { + owner = "pyca"; + repo = "bcrypt"; + tag = version; + hash = "sha256-7Dp07xoq6h+fiP7d7/TRRoYszWsyQF1c4vuFUpZ7u6U="; }; cargoRoot = "src/_bcrypt"; @@ -39,20 +36,20 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA="; + hash = "sha256-hYMJlwxnXA0ZOJiyZ8rDp9govVcc1SGkDfqUVngnUPQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools - setuptoolsRustBuildHook + setuptools-rust + ]; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo rustc ]; - # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bcrypt" ]; @@ -67,10 +64,11 @@ buildPythonPackage rec { ; }; - meta = with lib; { + meta = { + changelog = "https://github.com/pyca/bcrypt/blob/${src.tag}/CHANGELOG.rst"; description = "Modern password hashing for your software and your servers"; homepage = "https://github.com/pyca/bcrypt/"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } From 1bbe4fe35d6b5736e0dba5c5cf8acb7881e922c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 1 Oct 2025 15:09:26 -0700 Subject: [PATCH 0121/2279] python3Packages.bcrypt: add dotlambda to maintainers --- pkgs/development/python-modules/bcrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 3c279c73bff7..b50cb3faef22 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "Modern password hashing for your software and your servers"; homepage = "https://github.com/pyca/bcrypt/"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ lib.maintainers.dotlambda ]; }; } From a8fc9df4d3ee8ecb83a2d54337d74d8bee415002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Oct 2025 13:05:09 -0700 Subject: [PATCH 0122/2279] python3Packages.libpass: skip tests broken by bcrypt 5.0.0 --- pkgs/development/python-modules/libpass/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix index baffb02b134e..5f02a27cc3a3 100644 --- a/pkgs/development/python-modules/libpass/default.nix +++ b/pkgs/development/python-modules/libpass/default.nix @@ -41,6 +41,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "passlib" ]; + disabledTestPaths = [ + # https://github.com/notypecheck/passlib/issues/18 + "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_70_hashes" + "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_77_fuzz_input" + "tests/test_handlers_django.py::django_bcrypt_test::test_77_fuzz_input" + "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_secret_w_truncate_size" + "tests/test_handlers_django.py::django_bcrypt_test::test_secret_w_truncate_size" + ]; + disabledTests = [ # timming sensitive "test_dummy_verify" From 9d52e9b87a93db6ee5a21a91b042f185bee7c933 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 10 Oct 2025 05:05:10 +0900 Subject: [PATCH 0123/2279] somo: 1.2.0 -> 1.3.0 Diff: https://github.com/theopfr/somo/compare/v1.2.0...v1.3.0 --- pkgs/by-name/so/somo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix index d4cc7c9c9903..b12fd045d89b 100644 --- a/pkgs/by-name/so/somo/package.nix +++ b/pkgs/by-name/so/somo/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "somo"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "theopfr"; repo = "somo"; tag = "v${finalAttrs.version}"; - hash = "sha256-QTW+hsoj8Wrv3BbFCB2aibR27Wu1MA/1gWzAXtPKWsM="; + hash = "sha256-k7PDCylA6KR/S1dQDSMIoOELPYwJ25dz1u+PM6ITGKg="; }; - cargoHash = "sha256-xlAdEo11UV1Y49D1LjxH5Oykf/RUoe1w6ZcQpGhfqkk="; + cargoHash = "sha256-i3GmdBqCWPeslpr2zzOR4r8PgMP7EkC1mNFI7jSWO34="; nativeBuildInputs = [ installShellFiles From 38202296686b488c24594f3c28b78b862ecd187d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Oct 2025 21:19:55 +0100 Subject: [PATCH 0124/2279] libunistring: 1.4 -> 1.4.1 Changes: https://gitweb.git.savannah.gnu.org/gitweb/?p=libunistring.git;a=blob;f=NEWS;h=973566436fc861b39ddb40f0d802ccae66e6a7e0;hb=7c6a0c1811b01d3fee66f4c533c77509536fd3ee --- pkgs/development/libraries/libunistring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 43db16eb28f6..5e74e9ec0e9b 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "libunistring"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz"; - hash = "sha256-9+Od3soYhY7N0Cxg0dU3T83LvNtraKOR+El8scss8/c="; + hash = "sha256-ElQq12GUcO/ZWmIxdNzUs2TySDyvcIxr7oN8tTpUy50="; }; outputs = [ From d74462059b9c050934fc106afaedba017f21fdf6 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Fri, 5 Sep 2025 13:17:50 +0200 Subject: [PATCH 0125/2279] python3Packages.inline-snapshot: 0.24.0 -> 0.28.0 --- pkgs/development/python-modules/inline-snapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index bff769ab1ec5..3e2c78c98cce 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.24.0"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { owner = "15r10nk"; repo = "inline-snapshot"; tag = version; - hash = "sha256-UiVxG9W1lwvvoflVey4250iL8gL8Tm41LBo0ab0tTqk="; + hash = "sha256-f572H7jeolv9nONuRBtZR/pcVDs5oX/dOiEjXlJyiio="; }; build-system = [ hatchling ]; From 724b8f5bf7cb2107d8792994aff09aa1a13b674d Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Fri, 5 Sep 2025 13:18:58 +0200 Subject: [PATCH 0126/2279] python3Packages.mkdocstrings-python: 1.16.12 -> 1.18.2 --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index d0132580ed36..3287ac61d725 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.16.12"; + version = "1.18.2"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; tag = version; - hash = "sha256-NL5gn8HgT0hvIlUDs//sErAaSVXvxLDJGT7nZX65ZVU="; + hash = "sha256-BdUNj7EJAbOs8Ff+IGbd7be+lRG6MQCIgNAi5oH9OgA="; }; build-system = [ pdm-backend ]; From 5518f1e35f24b472d74253445b1fe88d7e5f13a1 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Fri, 5 Sep 2025 13:21:17 +0200 Subject: [PATCH 0127/2279] netbox_4_4: init at 4.4.2 Release notes: https://github.com/netbox-community/netbox/releases/tag/v4.4.2 Full changelog: https://github.com/netbox-community/netbox/compare/v4.3.7...v4.4.2 --- doc/release-notes/rl-2511.section.md | 7 +- nixos/modules/services/web-apps/netbox.nix | 4 +- nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/netbox-upgrade.nix | 4 +- nixos/tests/web-apps/netbox/testScript.py | 2 +- .../ne/netbox_4_4/custom-static-root.patch | 13 ++ pkgs/by-name/ne/netbox_4_4/package.nix | 132 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/ne/netbox_4_4/custom-static-root.patch create mode 100644 pkgs/by-name/ne/netbox_4_4/package.nix diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index fe665e3a7026..3274ff04df59 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -183,9 +183,10 @@ - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`. Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md. -- NetBox was updated to `>= 4.3.0`. Have a look at the breaking changes - of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), - make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration. +- NetBox was updated to `>= 4.4.0`. Have a look at the breaking changes + of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.3.0) + and the [4.4 release](https://github.com/netbox-community/netbox/releases/tag/v4.4.0), + make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_4;` in your configuration. - `pkgs.nextcloud30` has been removed since it's out of support upstream. diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index abba24d1e430..665d06011cba 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -110,14 +110,14 @@ in type = lib.types.package; default = if lib.versionAtLeast config.system.stateVersion "25.11" then - pkgs.netbox_4_3 + pkgs.netbox_4_4 else if lib.versionAtLeast config.system.stateVersion "25.05" then pkgs.netbox_4_2 else pkgs.netbox_4_1; defaultText = lib.literalExpression '' if lib.versionAtLeast config.system.stateVersion "25.11" - then pkgs.netbox_4_3 + then pkgs.netbox_4_4 else if lib.versionAtLeast config.system.stateVersion "25.05" then pkgs.netbox_4_2 else pkgs.netbox_4_1; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e471baaf7849..3a960ab7554f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -985,6 +985,7 @@ in netbox_4_1 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_1; }; netbox_4_2 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_2; }; netbox_4_3 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_3; }; + netbox_4_4 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_4; }; netdata = runTest ./netdata.nix; networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; }; networking.networkmanager = handleTest ./networking/networkmanager.nix { }; diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix index 29b553829dcb..5b60e8939ccb 100644 --- a/nixos/tests/web-apps/netbox-upgrade.nix +++ b/nixos/tests/web-apps/netbox-upgrade.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: let - oldNetbox = "netbox_4_2"; - newNetbox = "netbox_4_3"; + oldNetbox = "netbox_4_3"; + newNetbox = "netbox_4_4"; apiVersion = version: diff --git a/nixos/tests/web-apps/netbox/testScript.py b/nixos/tests/web-apps/netbox/testScript.py index 7d0f9bff10c7..f6c2c9821e12 100644 --- a/nixos/tests/web-apps/netbox/testScript.py +++ b/nixos/tests/web-apps/netbox/testScript.py @@ -61,7 +61,7 @@ def compare(a: str, b: str): return 0 with subtest("Home screen loads"): - machine.succeed( + machine.wait_until_succeeds( "curl -sSfL http://[::1]:8001 | grep 'Home | NetBox'" ) diff --git a/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch b/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch new file mode 100644 index 000000000000..c9219fa2b871 --- /dev/null +++ b/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch @@ -0,0 +1,13 @@ +diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py +index 2de06dd10..00406af48 100644 +--- a/netbox/netbox/settings.py ++++ b/netbox/netbox/settings.py +@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True + X_FRAME_OPTIONS = 'SAMEORIGIN' + + # Static files (CSS, JavaScript, Images) +-STATIC_ROOT = BASE_DIR + '/static' ++STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/') + STATIC_URL = f'/{BASE_PATH}static/' + STATICFILES_DIRS = ( + os.path.join(BASE_DIR, 'project-static', 'dist'), diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix new file mode 100644 index 000000000000..cd59bfeae268 --- /dev/null +++ b/pkgs/by-name/ne/netbox_4_4/package.nix @@ -0,0 +1,132 @@ +{ + lib, + fetchFromGitHub, + python3, + plugins ? _ps: [ ], + nixosTests, + nix-update-script, +}: +let + py = python3.override { + self = py; + packageOverrides = _final: prev: { django = prev.django_5_2; }; + }; + + extraBuildInputs = plugins py.pkgs; +in +py.pkgs.buildPythonApplication rec { + pname = "netbox"; + version = "4.4.2"; + pyproject = false; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox"; + tag = "v${version}"; + hash = "sha256-1POwxp7BTCZo7JlGrLVGNzBGCplmhZ0Y6wujunIVGsA="; + }; + + patches = [ + ./custom-static-root.patch + ]; + + dependencies = + ( + with py.pkgs; + [ + colorama + django + django-cors-headers + django-debug-toolbar + django-filter + django-graphiql-debug-toolbar + django-htmx + django-mptt + django-pglocks + django-prometheus + django-redis + django-rq + django-storages + django-tables2 + django-taggit + django-timezone-field + djangorestframework + drf-spectacular + drf-spectacular-sidecar + feedparser + jinja2 + markdown + netaddr + nh3 + pillow + psycopg + pyyaml + requests + social-auth-core + social-auth-app-django + sorl-thumbnail + strawberry-graphql + strawberry-django + svgwrite + tablib + + # Optional dependencies, kept here for backward compatibility + + # for the S3 data source backend + boto3 + # for Git data source backend + dulwich + # for error reporting + sentry-sdk + ] + ++ psycopg.optional-dependencies.c + ++ psycopg.optional-dependencies.pool + ++ social-auth-core.optional-dependencies.openidconnect + ) + ++ extraBuildInputs; + + nativeBuildInputs = with py.pkgs; [ + mkdocs-material + mkdocs-material-extensions + mkdocstrings + mkdocstrings-python + ]; + + postBuild = '' + PYTHONPATH=$PYTHONPATH:netbox/ + ${py.interpreter} -m mkdocs build + ''; + + installPhase = '' + mkdir -p $out/opt/netbox + cp -r . $out/opt/netbox + chmod +x $out/opt/netbox/netbox/manage.py + makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + passthru = { + python = py; + # PYTHONPATH of all dependencies used by the package + pythonPath = py.pkgs.makePythonPath dependencies; + inherit (py.pkgs) gunicorn; + tests = { + netbox = nixosTests.netbox_4_3; + inherit (nixosTests) netbox-upgrade; + }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://github.com/netbox-community/netbox"; + changelog = "https://github.com/netbox-community/netbox/blob/${src.tag}/docs/release-notes/version-${lib.versions.majorMinor version}.md"; + description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool"; + mainProgram = "netbox"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + minijackson + raitobezarius + transcaffeine + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5adef68001c3..4304b52edbde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3533,7 +3533,7 @@ with pkgs; }; # Not in aliases because it wouldn't get picked up by callPackage - netbox = netbox_4_3; + netbox = netbox_4_4; netcap-nodpi = callPackage ../by-name/ne/netcap/package.nix { withDpi = false; From 497793b53596cadf0d1171a712f34a206407a14b Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Fri, 5 Sep 2025 13:47:24 +0200 Subject: [PATCH 0128/2279] netbox_4_3: mark as EOL --- pkgs/by-name/ne/netbox_4_3/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix index 81af0510f3ae..dc5807639598 100644 --- a/pkgs/by-name/ne/netbox_4_3/package.nix +++ b/pkgs/by-name/ne/netbox_4_3/package.nix @@ -121,6 +121,9 @@ py.pkgs.buildPythonApplication rec { description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool"; mainProgram = "netbox"; license = lib.licenses.asl20; + knownVulnerabilities = [ + "Netbox Version ${version} is EOL; please upgrade by following the current release notes instructions" + ]; maintainers = with lib.maintainers; [ minijackson raitobezarius From 5cac837a94939881f389c75bf7d55c301f86b739 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 13 Sep 2025 14:39:46 +0200 Subject: [PATCH 0129/2279] chromaprint: test only hash Fixes issue with the length sometimes being rounded differently --- pkgs/by-name/ch/chromaprint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index d0c7fe4bbef4..873dab81da50 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation (finalAttrs: { }; # sha256 because actual output of fpcalc is quite long - expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac"; + expectedHash = "e2895130bcbe7190184379021daa60c5f5d476da4a2fecb06df7160819662e20"; in '' runHook preCheck tests/all_tests - ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} + ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc -plain ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} runHook postCheck ''; From f155a3942c67133577fd6fb6cd22482bc5dcecf1 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Oct 2025 22:35:16 +0200 Subject: [PATCH 0130/2279] opencv: pin to ffmpeg_7 --- pkgs/by-name/ml/mlt/package.nix | 8 ++++---- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index 41e7af71554e..ae965a28077c 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -6,7 +6,7 @@ cmake, pkg-config, which, - ffmpeg, + ffmpeg_7, fftw, frei0r, libdv, @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (opencv4.override { inherit ffmpeg; }) - ffmpeg + (opencv4.override { inherit ffmpeg_7; }) + ffmpeg_7 fftw frei0r libdv @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit ffmpeg; + ffmpeg = ffmpeg_7; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 532513e1fe42..93f093e316d6 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -58,7 +58,7 @@ enableVtk ? false, vtk, enableFfmpeg ? true, - ffmpeg, + ffmpeg_7, enableGStreamer ? true, elfutils, gst_all_1, @@ -369,7 +369,7 @@ effectiveStdenv.mkDerivation { openjpeg ] ++ optionals enableFfmpeg [ - ffmpeg + ffmpeg_7 ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [ elfutils From 130c99296179d0b3e2f6a6f7b0742659d32139ec Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 9 Oct 2025 22:36:28 +0200 Subject: [PATCH 0131/2279] ffmpeg: switch default to ffmpeg_8 --- pkgs/development/libraries/ffmpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index cc0332510307..1db45f0d2feb 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -65,7 +65,7 @@ rec { # unversioned aliases to allow for quicker migration to new releases, # but can pin one of the versioned variants if they do not work with # the current default version. - ffmpeg = ffmpeg_7; - ffmpeg-headless = ffmpeg_7-headless; - ffmpeg-full = ffmpeg_7-full; + ffmpeg = ffmpeg_8; + ffmpeg-headless = ffmpeg_8-headless; + ffmpeg-full = ffmpeg_8-full; } From cf45eef8ecf8fe50b44aab0b8b4f651a85de02aa Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 0132/2279] lib.systems.darwinSdkVersion: 11.3 -> 14.4 --- lib/systems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 7e78ceb4827a..ee3ad9c0e649 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -360,7 +360,7 @@ let null; # The canonical name for this attribute is darwinSdkVersion, but some # platforms define the old name "sdkVer". - darwinSdkVersion = final.sdkVer or "11.3"; + darwinSdkVersion = final.sdkVer or "14.4"; darwinMinVersion = final.darwinSdkVersion; darwinMinVersionVariable = if final.isMacOS then From 2ab175889abbb1a8cff9f5ff4a23f33e8eefdf19 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 0133/2279] lib.systems.darwinMinVersion: 11.3 -> 14.0 --- lib/systems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ee3ad9c0e649..513f9250a1ac 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -361,7 +361,7 @@ let # The canonical name for this attribute is darwinSdkVersion, but some # platforms define the old name "sdkVer". darwinSdkVersion = final.sdkVer or "14.4"; - darwinMinVersion = final.darwinSdkVersion; + darwinMinVersion = "14.0"; darwinMinVersionVariable = if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" From 56ac9bffa3b56b30fe01cd177bf04372dbf907c8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 9 Oct 2025 18:00:10 -0400 Subject: [PATCH 0134/2279] doc/stdenv/platform-notes: update Xcode version to SDK version table --- doc/stdenv/platform-notes.chapter.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index a6174b3e2008..99d7cf33fa48 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -117,13 +117,10 @@ The following is a list of Xcode versions, the SDK version in Nixpkgs, and the a Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use. Generally, only the last SDK release for a major version is packaged. -| Xcode version | SDK version | Nixpkgs attribute | -|--------------------|--------------------|------------------------------| -| 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` | -| 13.0–13.4.1 | 12.3 | `apple-sdk_12` | -| 14.0–14.3.1 | 13.3 | `apple-sdk_13` | -| 15.0–15.4 | 14.4 | `apple-sdk_14` | -| 16.0 | 15.0 | `apple-sdk_15` | +| Xcode version | SDK version | Nixpkgs attribute | +|--------------------|--------------------|-------------------------------| +| 15.0–15.4 | 14.4 | `apple-sdk_14` / `apple-sdk` | +| 16.0 | 15.0 | `apple-sdk_15` | #### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults} From c422ce6874c303100d6b80f862a31329a12d0dc9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 29 Sep 2025 21:39:09 -0400 Subject: [PATCH 0135/2279] doc/release-notes-25.11: add note about Darwin platform updates --- doc/release-notes/rl-2511.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1d32eabf6ea8..21ffab0b5009 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -16,6 +16,11 @@ If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target. See the Darwin platform documentation for more details. +- **This release of Nixpkgs requires macOS Sonoma 14.0 or newer, as announced in the 25.05 release notes.** + The default SDK is now 14.4, but the minimum version is 14.0. + cc-wrapper will enforce that availability annotations are used or an appropriate deployment target is set. + See the Darwin platform notes for details. + - LLVM has been updated from 19 to 21. ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities} From e99a7321592fb8111513a6e1422f04e470f46c5d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0136/2279] _1fps: use default SDK on Darwin (14.4) --- pkgs/by-name/_1/_1fps/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix index 305b2f3ae821..90fef1a29cbb 100644 --- a/pkgs/by-name/_1/_1fps/package.nix +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -4,7 +4,6 @@ buildGoModule, xorg, stdenv, - apple-sdk_14, }: buildGoModule rec { pname = "1fps"; @@ -25,8 +24,7 @@ buildGoModule rec { xorg.libX11 xorg.libXtst xorg.libXi - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14; + ]; meta = { description = "Encrypted Screen Sharing"; From b572ad29440e7742a57e79157ba2b3c5aaa4b291 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0137/2279] ares: use default SDK on Darwin (14.4) --- pkgs/by-name/ar/ares/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 39d4bb316fba..de25382b4cbc 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -1,7 +1,7 @@ { lib, alsa-lib, - apple-sdk_14, + apple-sdk, cmake, fetchFromGitHub, gtk3, @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 moltenvk ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (replaceVars ./darwin-build-fixes.patch { - sdkVersion = apple-sdk_14.version; + sdkVersion = apple-sdk.version; }) ]; From 8e6ef95a4bdcc1019b4d9e7bb53670ae209692e4 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0138/2279] azahar: use default SDK on Darwin (14.4) --- pkgs/by-name/az/azahar/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 4b79ea2a4a9f..ca9c4a46a59c 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -42,8 +42,6 @@ gamemode, enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode, nix-update-script, - darwinMinVersionHook, - apple-sdk_12, }: let inherit (lib) @@ -122,10 +120,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals stdenv.hostPlatform.isDarwin [ moltenvk - - # error: 'lowPowerModeEnabled' is unavailable: not available on macOS - apple-sdk_12 - (darwinMinVersionHook "12.0") ]; postPatch = '' From 7dffcb50385a7212d70837d9b52c88c4544a9ed5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0139/2279] balena-cli: use default SDK on Darwin (14.4) --- pkgs/by-name/ba/balena-cli/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index be730490549b..745f493d19cf 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -9,7 +9,6 @@ python3, udev, cctools, - apple-sdk_12, }: let @@ -44,13 +43,9 @@ buildNpmPackage' rec { cctools ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/balena"; From 1fd0904a41466d7672fb500652bc2f883c2390bb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0140/2279] bespokesynth: use default SDK on Darwin (14.4) --- pkgs/by-name/be/bespokesynth/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 38c057312fb1..ee2b22f4817f 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, gitUpdater, - apple-sdk_11, cmake, pkg-config, ninja, @@ -120,9 +119,6 @@ stdenv.mkDerivation (finalAttrs: { xcb-util-cursor pcre mount - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 ]; postInstall = From e001ae3c6346e20dd64e43635c913cf022db410a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0141/2279] bitwarden-desktop: use default SDK on Darwin (14.4) --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index c71124bd9ce4..c9c9bba63e7a 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -1,6 +1,5 @@ { lib, - apple-sdk_14, buildNpmPackage, cargo, copyDesktopItems, @@ -124,10 +123,6 @@ buildNpmPackage' rec { darwin.autoSignDarwinBinariesHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - ]; - preBuild = '' if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' From f2895523473dab52d67d77779511177d288fab61 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0142/2279] build-support/build-mozzila-mach: drop SDK version workaround patch The 15.5 SDK is available in nixpkgs, so this patch is no longer needed. --- .../build-mozilla-mach/142-relax-apple-sdk.patch | 13 ------------- pkgs/build-support/build-mozilla-mach/default.nix | 9 --------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch diff --git a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch deleted file mode 100644 index c6e28f11be2f..000000000000 --- a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 37c00230c853..dd89bea24392 100644 ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx): - ) - - def mac_sdk_min_version(): -- return "15.5" -+ return "15.2" - - @depends( - "--with-macos-sdk", diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 834654bee746..75948f8779cd 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -315,15 +315,6 @@ buildStdenv.mkDerivation { # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9 ./139-wayland-drag-animation.patch ] - ++ - lib.optionals - ( - lib.versionAtLeast version "141.0.2" - || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0") - ) - [ - ./142-relax-apple-sdk.patch - ] ++ extraPatches; postPatch = '' From e5fd8d4c6164ef92ce5f3af460626de96a36992e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0143/2279] choose-gui: use default SDK on Darwin (14.4) --- pkgs/by-name/ch/choose-gui/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix index 04a74c40d901..7a36bdfd60f8 100644 --- a/pkgs/by-name/ch/choose-gui/package.nix +++ b/pkgs/by-name/ch/choose-gui/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, xcbuild, - apple-sdk_11, }: stdenv.mkDerivation rec { @@ -19,8 +18,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xcbuild ]; - buildInputs = [ apple-sdk_11 ]; - buildPhase = '' runHook preBuild xcodebuild -configuration Release SYMROOT="./output" HOME="$(mktemp -d)" build From 7b4d6379222bfaf613b1b0a85d842d8a36fe2c21 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0144/2279] darwin.PowerManagement: fix build with 14.4 SDK --- .../darwin/apple-source-releases/PowerManagement/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix index 231d0ffb562f..02dfecec7b9e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix @@ -13,7 +13,8 @@ let buildCommand = '' install -D -t "$out/include/IOKit/pwr_mgt" \ - '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h' + '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h' \ + '${iokitUser}/pwr_mgt.subproj/IOPMAssertionCategories.h' ''; }; in From b68b26b3ba6e3c0f6e9d2e54b11e6317a8880948 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0145/2279] darwin.bootstrap_cmds: use default SDK on Darwin (14.4) --- .../darwin/apple-source-releases/bootstrap_cmds/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix index 0f5e1f77dd1a..ca416bc65934 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - apple-sdk_12, bison, buildPackages, flex, @@ -14,10 +13,7 @@ let Libc = apple-sdk.sourceRelease "Libc"; - - # Older versions of xnu are missing required headers. The one for the 11.3 SDK doesn’t define a needed function - # that was added in 11.3. This version of xnu has everything that’s needed. - xnu = apple-sdk_12.sourceRelease "xnu"; + xnu = apple-sdk.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "adv_cmds-deps-private-headers"; From 29b634dd2c7c70fb0f83537aef6c677be7060122 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0146/2279] darwin.copyfile: drop workaround for older Clang versions --- .../darwin/apple-source-releases/copyfile/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix index b2c02c05e624..413e6532b3a6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix @@ -71,15 +71,6 @@ mkAppleDerivation { xcodeHash = "sha256-SYW6pBlCQkcbkBqCq+W/mDYZZ7/co2HlPZwXzgh/LnI="; - postPatch = '' - # Disable experimental bounds safety stuff that’s not available in LLVM 16. - for header in copyfile.h xattr_flags.h; do - substituteInPlace "$header" \ - --replace-fail '__ptrcheck_abi_assume_single()' "" \ - --replace-fail '__unsafe_indexable' "" - done - ''; - env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; meta.description = "Darwin file copying library"; From 674bfaab7038d1d28d5f1a9151c02cdedaddaa49 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0147/2279] darwin.dyld: work around lack of LLVM 21 support in Meson --- pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix index 869d4b3ea9da..b034abb7d01f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix @@ -6,6 +6,7 @@ cmake, llvmPackages, openssl, + pkgsBuildHost, pkg-config, stdenvNoCC, fetchurl, @@ -162,6 +163,7 @@ mkAppleDerivation { nativeBuildInputs = [ cmake # CMake is required for Meson to find LLVM as a dependency. + (lib.getDev pkgsBuildHost.llvm) # Workaround Meson limitations with LLVM 21. pkg-config ]; From 55f32f567c1e8e9e1ac3adb56467cce6687756ce Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0148/2279] darwin.dyld: use default SDK on Darwin (14.4) --- .../apple-source-releases/dyld/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix index b034abb7d01f..c2e50c4f8a2d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix @@ -1,10 +1,10 @@ { lib, - apple-sdk_12, + apple-sdk, ld64, mkAppleDerivation, cmake, - llvmPackages, + llvm, openssl, pkgsBuildHost, pkg-config, @@ -20,11 +20,11 @@ let hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk="; }; - launchd = apple-sdk_12.sourceRelease "launchd"; - Libc = apple-sdk_12.sourceRelease "Libc"; - libplatform = apple-sdk_12.sourceRelease "libplatform"; - libpthread = apple-sdk_12.sourceRelease "libpthread"; - xnu = apple-sdk_12.sourceRelease "xnu"; + launchd = apple-sdk.sourceRelease "launchd"; + Libc = apple-sdk.sourceRelease "Libc"; + libplatform = apple-sdk.sourceRelease "libplatform"; + libpthread = apple-sdk.sourceRelease "libpthread"; + xnu = apple-sdk.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "dyld-deps-private-headers"; @@ -156,8 +156,7 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; buildInputs = [ - apple-sdk_12 # Needed for `PLATFORM_FIRMWARE` and `PLATFORM_SEPOS` defines in `mach-o/loader.h`. - llvmPackages.llvm + llvm openssl ]; From c8a5838007a96c18ac113e7a98519c3fec1303ac Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0149/2279] darwin.file_cmds: update build for the 14.4 SDK --- .../darwin/apple-source-releases/file_cmds/meson.build.in | 3 +++ .../darwin/apple-source-releases/file_cmds/package.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in index 638742f978c2..9919a3d90b3a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in @@ -4,7 +4,10 @@ # Project settings project('file_cmds', 'c', version : '@version@') add_global_arguments( + # These are not defined automatically by Clang. Not having them defined causes compilation failures. '-DTARGET_OS_BRIDGE=0', + '-DTARGET_OS_EXCLAVECORE=0', + '-DTARGET_OS_EXCLAVEKIT=0', language : 'c', ) diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix index 584d2a312a60..7961a0125ae5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix @@ -53,6 +53,8 @@ let uint64_t xdi_xdtream_obj_id; }; #define APFS_CLEAR_PURGEABLE 0 + #define APFS_PURGEABLE_FLAGS_MASK 0xFFFF + #define APFSIOC_GET_PURGEABLE_FILE_FLAGS _IOR('J', 71, uint64_t) #define APFSIOC_MARK_PURGEABLE _IOWR('J', 68, uint64_t) #define APFSIOC_XDSTREAM_OBJ_ID _IOWR('J', 53, struct xdstream_obj_id) EOF From 006f7e4234429230409904dcc60afa87c3dc589f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0150/2279] darwin.libresolv: update build for the 14.4 SDK --- .../libresolv/meson.build.in | 8 +++++ .../libresolv/package.nix | 34 ++++++++++++++----- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in index 6a7c523a164c..2d96b556bbc8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in @@ -3,6 +3,12 @@ # Project settings project('libresolv', 'c', version : '@version@') +add_project_arguments( + '-DCOMMON_DIGEST_FOR_RFC_1321', # To enable legacy `MD5` APIs in CommonCrypto. + # This is not defined automatically by Clang. Not having them defined causes compilation failures. + '-DTARGET_OS_BRIDGE=0', + language : 'c', +) # Dependencies @@ -46,10 +52,12 @@ libresolv = library( soversion : '9' ) install_headers( + 'arpa/nameser_compat.h', 'dns.h', 'dns_util.h', 'nameser.h', 'resolv.h', + preserve_path : true, ) install_man( 'resolver.3', diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix index 158317c22c80..9e63efb55228 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix @@ -2,14 +2,31 @@ lib, apple-sdk, mkAppleDerivation, + stdenvNoCC, }: let configd = apple-sdk.sourceRelease "configd"; + dyld = apple-sdk.sourceRelease "dyld"; Libinfo = apple-sdk.sourceRelease "Libinfo"; + Libnotify = apple-sdk.sourceRelease "Libnotify"; + xnu = apple-sdk.sourceRelease "xnu"; # `arpa/nameser_compat.h` is included in the Libc source release instead of libresolv. Libc = apple-sdk.sourceRelease "Libc"; + + privateHeaders = stdenvNoCC.mkDerivation { + name = "libresolv-deps-private-headers"; + + buildCommand = '' + install -D -t "$out/include/mach-o" \ + '${dyld}/include/mach-o/dyld_priv.h' + + substituteInPlace "$out/include/mach-o/dyld_priv.h" \ + --replace-fail ', bridgeos(3.0)' "" \ + --replace-fail '//@VERSION_DEFS@' 'const dyld_build_version_t dyld_2024_SU_E_os_versions = { 1 /* macOS */, 150400 };' + ''; + }; in mkAppleDerivation { releaseName = "libresolv"; @@ -20,19 +37,18 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY="; - - postUnpack = '' - mkdir -p "$sourceRoot/arpa" - ln -s "$NIX_BUILD_TOP/$sourceRoot/nameser.h" "$sourceRoot/arpa/nameser.h" + postPatch = '' + mkdir arpa + cp ${Libc}/include/arpa/nameser_compat.h arpa/nameser_compat.h + cp nameser.h arpa ''; - env.NIX_CFLAGS_COMPILE = "-I${configd}/dnsinfo -I${Libinfo}/lookup.subproj"; + xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY="; + + env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}"; postInstall = '' - mkdir -p "$out/include/arpa" - ln -s ../nameser.h "$out/include/arpa" - cp ${Libc}/include/arpa/nameser_compat.h "$out/include/arpa" + ln -s ../nameser.h "''${!outputDev}/include/arpa" ''; meta = { From 4d961ec1504fb112c76b8fe7f684d739fe5ffe03 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0151/2279] darwin.libutil: use default SDK on Darwin (14.4) --- .../apple-source-releases/libutil/package.nix | 7 ----- .../0001-Conditionally-pre-condition.patch | 26 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix index 95f35054e026..a0afe4511d53 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_14, copyfile, mkAppleDerivation, }: @@ -15,13 +14,7 @@ mkAppleDerivation { xcodeHash = "sha256-LwR9fmvcdJ/QYlOx+7ffhV4mKvjkwN3rX3+yHSCovKQ="; - patches = [ - # The only change from macOS 13 to 14 was setting this flag. Check at runtime and only set if supported. - ./patches/0001-Conditionally-pre-condition.patch - ]; - buildInputs = [ - (apple-sdk_14.override { enableBootstrap = true; }) copyfile ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch b/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch deleted file mode 100644 index 27f5faee7cda..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca796729722da704e8a9c64c7a201cbe0a9cb9be Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Mon, 5 Aug 2024 22:21:47 -0400 -Subject: [PATCH] Conditionally pre-condition - ---- - wipefs.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wipefs.cpp b/wipefs.cpp -index d8e6339..6cb7963 100644 ---- a/wipefs.cpp -+++ b/wipefs.cpp -@@ -391,7 +391,9 @@ wipefs_wipe(wipefs_ctx handle) - // Since we always issue a a single extent, set the kIOStorageUnmapOptionWhole - // option flag for drive pre-conditioning. - // -- unmap.options = kIOStorageUnmapOptionWhole; -+ if (__builtin_available(macOS 14.0, *)) { -+ unmap.options = kIOStorageUnmapOptionWhole; -+ } - - // - // Don't bother to check the return value since this is mostly --- -2.44.1 From 0ba2bde18f3ad4441a7e72bb552394619c8d10dc Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0152/2279] darwin.network_cmds: use default SDK on Darwin (14.4) --- .../network_cmds/meson.build.in | 56 +++--- .../network_cmds/package.nix | 159 ++++++++---------- 2 files changed, 98 insertions(+), 117 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in index f0dc469eb142..926175715775 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in @@ -14,6 +14,10 @@ add_global_arguments( '-DUSE_RFC2292BIS=1', '-D__APPLE_USE_RFC_3542=1', '-D__APPLE_API_OBSOLETE=1', + # Define flexible array member attribute macros as nothing. Unfortunately, Apple’s usage does not work with + # the C23 attributes supported by Clang. + '-D__counted_by_or_null(N)=', + '-D__sized_by_or_null(N)=', language : 'c', ) @@ -23,6 +27,8 @@ cc = meson.get_compiler('c') libipsec = cc.find_library('ipsec') libresolv = cc.find_library('resolv') +libutil = cc.find_library('util') + libpcap = dependency('pcap') openssl = dependency('openssl') @@ -200,7 +206,7 @@ executable( dependencies : [ libnetwork_cmds ], install : true, sources : [ - # 'netstat.tproj/bpf.c', + 'netstat.tproj/bpf.c', 'netstat.tproj/data.c', 'netstat.tproj/if.c', 'netstat.tproj/inet.c', @@ -276,29 +282,31 @@ executable( ) install_man('route.tproj/route.8') -# Depends on a bunch of IPv6 stuff from later SDKs (>11.3). Package once those become the default. -# executable( -# 'rtadvd', -# c_args : [ -# '-DINET6', -# '-DHAVE_GETIFADDRS', -# ], -# install : true, -# sources : [ -# 'rtadvd.tproj/advcap.c', -# 'rtadvd.tproj/config.c', -# 'rtadvd.tproj/dump.c', -# 'rtadvd.tproj/if.c', -# 'rtadvd.tproj/rrenum.c', -# 'rtadvd.tproj/rtadvd.c', -# 'rtadvd.tproj/rtadvd_logging.c', -# 'rtadvd.tproj/timer.c', -# ], -# ) -# install_man( -# 'rtadvd.tproj/rtadvd.8', -# 'rtadvd.tproj/rtadvd.conf.5', -# ) +executable( + 'rtadvd', + c_args : [ + '-DINET6', + '-DHAVE_GETIFADDRS', + # Required for `_COMM_PAGE_CPU_CAPABILITIES` in + '-DPRIVATE', + ], + dependencies : libutil, + install : true, + sources : [ + 'rtadvd.tproj/advcap.c', + 'rtadvd.tproj/config.c', + 'rtadvd.tproj/dump.c', + 'rtadvd.tproj/if.c', + 'rtadvd.tproj/rrenum.c', + 'rtadvd.tproj/rtadvd.c', + 'rtadvd.tproj/rtadvd_logging.c', + 'rtadvd.tproj/timer.c', + ], +) +install_man( + 'rtadvd.tproj/rtadvd.8', + 'rtadvd.tproj/rtadvd.conf.5', +) executable( 'rtsol', diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix index f6bb8f551c9b..a89dd162d3cc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix @@ -1,9 +1,10 @@ { lib, - apple-sdk, + apple-sdk_15, fetchurl, libpcap, libresolv, + libutil, mkAppleDerivation, openssl, pkg-config, @@ -12,61 +13,7 @@ }: let - # Newer releases of ifconfig use `ioctls` and undocumented APIs newer than 11.x. - # Use files from an older release for now. - old_ifconfig = { - ifconfig = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/ifconfig.c"; - hash = "sha256-yuUpdRHRwYLnivuaQuh8HJdLj/8ppq+K1NFqA8Bg+1k="; - }; - af_inet = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet.c"; - hash = "sha256-sqcCEzhTur43DG6Ac/1Rt8Kx0umWhDzlV58t+6FlzNU="; - }; - af_inet6 = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet6.c"; - hash = "sha256-jp0R0Ncwvp9G/lIzKW6wBTAiO8yNyII5c49feTanbIo="; - }; - af_link = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_link.c"; - hash = "sha256-5rXJg5azy9SjK675Djt4K1PaczsoVjQ/Lls/u5Kk1+A="; - }; - }; - - # Newer releases of netstat use struct members that aren’t present with the 11.x headers. - # Use files from an older release for now. - old_netstat = { - "if.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/if.c"; - hash = "sha256-P87rexLkoV1BCyUghVrkGoG6r9rAoWynfpvlwIj7A40="; - }; - "main.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/main.c"; - hash = "sha256-e3n54l6Wo+G5koMhGMfOTo8+QIkJRurr2fBOjg/nFgI="; - }; - "inet.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet.c"; - hash = "sha256-X1+dz+D6xR2Xqoxypjmy65pKBCh4iGVfByJGI0wVGO0="; - }; - "inet6.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet6.c"; - hash = "sha256-av5K1UQE3edUbzKN9FIn/DOeibsJaTZc0xJzDu9VZ5Q="; - }; - "netstat.h" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/netstat.h"; - hash = "sha256-UYi3lmA8G0wRJqVA2NYyMj0yCBUlxu0gMoMYW7NauJg="; - }; - "unix.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/unix.c"; - hash = "sha256-txs/mnR4WK8JAUN3PtqZsp6q2h+nx5VFKxI/itCTBNo="; - }; - "systm.c" = fetchurl { - url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/systm.c"; - hash = "sha256-bISSIsA6OYfkHNOKB4dj9KNLBHfcelGVzwGiYiVqnRM="; - }; - }; - - xnu = apple-sdk.sourceRelease "xnu"; + xnu = apple-sdk_15.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "network_cmds-deps-private-headers"; @@ -84,27 +31,51 @@ let install -D -t "$out/include" \ '${xnu}/osfmk/kern/cs_blobs.h' - install -D -t "$out/firehose" \ + install -D -t "$out/include/firehose" \ + '${xnu}/libkern/firehose/firehose_types_private.h' \ '${xnu}/libkern/firehose/tracepoint_private.h' + for dir in arm i386 machine; do + mkdir -p "$out/include/$dir" + for file in '${xnu}/osfmk/'$dir/*; do + name=$(basename "$file") + # Skip copying `endian.h` because it conflicts with the SDK, breaking the build on x86_64-darwin. + test "$name" != endian.h && cp -r "$file" "$out/include/$dir/$name" + done + done + install -D -t "$out/include/net" \ + '${xnu}/bsd/net/droptap.h' \ '${xnu}/bsd/net/if_bond_internal.h' \ '${xnu}/bsd/net/if_bond_var.h' \ '${xnu}/bsd/net/if_fake_var.h' \ + '${xnu}/bsd/net/if_mib_private.h' \ + '${xnu}/bsd/net/if_var_private.h' \ '${xnu}/bsd/net/if_vlan_var.h' \ '${xnu}/bsd/net/lacp.h' \ '${xnu}/bsd/net/net_perf.h' mkdir -p "$out/include/net/classq" "$out/include/net/pktsched" + cat < "$out/include/net/bpf.h" + #pragma once + #include_next + #include + $(sed -n \ + -e '/^#define BPF_D_/p' \ + -e '/^struct xbpf_d\s*{/,/^};/p' \ + '${xnu}/bsd/net/bpf.h') + EOF + # IFNET constants are defined as enums, so they have to be pre-processed and grepped from the file. cat < "$out/include/net/if.h" #pragma once #include $(sed \ -e 's/^\s*\(IFNET_[^=]*\)=\s*\([^,]*\),*/#define \1\2/' \ - '${xnu}/bsd/net/if.h' | grep '^#define IFNET_') + '${xnu}/bsd/net/if_private.h' | grep '^#define IFNET_') #include_next #include + typedef void* ifnet_t; #define ifreq ifreq_private $(sed -n \ -e '/^#define IFEF_TXSTART/p' \ @@ -130,10 +101,9 @@ let -e '/^struct if_throttlereq\s*{/,/^};/p' \ -e '/^struct ipv6_prefix\s*{/,/^};/p' \ -e '/^struct ifreq\s*{/,/^};/p' \ - '${xnu}/bsd/net/if.h') + '${xnu}/bsd/net/if_private.h') #undef ifreq EOF - unifdef -x 1 -DPRIVATE -m "$out/include/net/if.h" cat < "$out/include/net/content_filter.h" #pragma once @@ -143,21 +113,10 @@ let cat < "$out/include/net/if_var.h" #pragma once + #include + #define IF_NETEM_MODEL_IOD 2 + #define IF_NETEM_MODEL_FPD 3 #include_next - $(sed -n \ - -e '/^#define IFNAMSIZ\s/p' \ - -e '/^#define IF_NETEM/p' \ - -e '/^struct if_bandwidths\s*{/,/^};/p' \ - -e '/^struct if_data_extended\s*{/,/^};/p' \ - -e '/^struct if_interface_state\s*{/,/^};/p' \ - -e '/^struct if_latencies\s*{/,/^};/p' \ - -e '/^struct if_linkparamsreq\s*{/,/^};/p' \ - -e '/^struct if_netem_params\s*{/,/^};/p' \ - -e '/^struct if_netif_stats\s*{/,/^};/p' \ - -e '/^struct if_packet_stats\s*{/,/^};/p' \ - -e '/^struct if_rxpoll_stats\s*{/,/^};/p' \ - -e '/^struct if_traffic_class\s*{/,/^};/p' \ - '${xnu}/bsd/net/if_var.h') EOF cat < "$out/include/net/route.h" @@ -166,11 +125,13 @@ let $(sed -n \ -e '/^struct rt_msghdr_ext\s*{/,/^};/p' \ -e '/^struct rt_reach_info\s*{/,/^};/p' \ - '${xnu}/bsd/net/route.h') + -e '/^struct rtstat_64\s*{/,/^};/p' \ + '${xnu}/bsd/net/route_private.h') EOF ln -s "$out/include/net/route.h" "$out/include/net/route_private.h" install -D -t "$out/include/netinet" \ + '${xnu}/bsd/netinet/icmp6.h' \ '${xnu}/bsd/netinet/ip_flowid.h' cat < "$out/include/netinet/in.h" @@ -180,7 +141,7 @@ let -e '/^#define _DSCP/p' \ -e '/^#define IP_NO/p' \ -e '/^union sockaddr_in_4_6\s*{/,/^};/p' \ - '${xnu}/bsd/netinet/in.h') + '${xnu}/bsd/netinet/in_private.h') #include EOF @@ -190,7 +151,7 @@ let -e '/^struct tcp_info\s*{/,/^};/p' \ -e '/^struct tcp_conn_status\s*{/,/^};/p' \ -e '/^typedef struct conninfo_tcp\s*{/,/} conninfo_tcp_t;/p' \ - '${xnu}/bsd/netinet/tcp.h') + '${xnu}/bsd/netinet/tcp_private.h') #include_next EOF @@ -202,7 +163,7 @@ let #pragma once $(sed -n \ -e '/^#define IPV6_/p' \ - '${xnu}/bsd/netinet6/in6.h') + '${xnu}/bsd/netinet6/in6_private.h') #include_next EOF @@ -228,6 +189,9 @@ let EOF install -D -t "$out/include/os" \ + '${xnu}/libkern/os/atomic_private.h' \ + '${xnu}/libkern/os/atomic_private_arch.h' \ + '${xnu}/libkern/os/atomic_private_impl.h' \ '${xnu}/libkern/os/log_private.h' declare -a privateHeaders=( @@ -286,25 +250,28 @@ let #pragma once #include #include + $(sed -n \ + -e '/^typedef.*sae_associd_t/p' \ + -e '/^typedef.*sae_connid_t/p' \ + '${xnu}/bsd/sys/socket.h') $(sed -n \ -e '/^#define AF_MULTIPATH\s/p' \ -e '/^#define CIAUX_TCP\s/p' \ -e '/^#define NET_RT_/p' \ -e '/^#define SO_RECV/p' \ -e '/^#define SO_TRAFFIC_CLASS\s/,/^#define SO_TC_MAX/p' \ - -e '/^typedef.*sae_associd_t/p' \ - -e '/^typedef.*sae_connid_t/p' \ -e '/^struct so_aidreq\s*{/,/^};/p' \ -e '/^struct so_cidreq\s*{/,/^};/p' \ -e '/^struct so_cinforeq\s*{/,/^};/p' \ -e '/^struct so_cordreq\s*{/,/^};/p' \ - '${xnu}/bsd/sys/socket.h') + '${xnu}/bsd/sys/socket_private.h') #include_next EOF cat < "$out/include/sys/socketvar.h" #pragma once $(sed -n \ + -e '/^#define SO_STATS_/p' \ -e '/^#define SO_TC_STATS_MAX\s/p' \ -e '/^#define XSO_/p' \ -e '/^struct data_stats\s*{/,/^};/p' \ @@ -312,6 +279,7 @@ let -e '/^struct xsocket_n\s*{/,/^};/p' \ -e '/^struct xsockbuf_n\s*{/,/^};/p' \ -e '/^struct xsockstat_n\s*{/,/^};/p' \ + -e '/^typedef.*so_gen_t;/p' \ '${xnu}/bsd/sys/socketvar.h') #include_next EOF @@ -343,12 +311,15 @@ let -e '/^#define SIOCGIFTIMESTAMPENABLED\s/p' \ -e '/^#define SIOCGIFTYPE\s/p' \ -e '/^#define SIOCGIFXFLAGS\s/p' \ + -e '/^#define SIOCGQOSMARKINGENABLED\s/p' \ + -e '/^#define SIOCGQOSMARKINGMODE\s/p' \ -e '/^#define SIOCGSTARTDELAY\s/p' \ -e '/^#define SIOCSECNMODE\s/p' \ -e '/^#define SIOCSETROUTERMODE\s/p' \ -e '/^#define SIOCSFASTLANECAPABLE\s/p' \ -e '/^#define SIOCSFASTLEENABLED\s/p' \ -e '/^#define SIOCSIF2KCL\s/p' \ + -e '/^#define SIOCSIFCONSTRAINED\s/p' \ -e '/^#define SIOCSIFDESC\s/p' \ -e '/^#define SIOCSIFDISABLEOUTPUT\s/p' \ -e '/^#define SIOCSIFEXPENSIVE\s/p' \ @@ -356,7 +327,11 @@ let -e '/^#define SIOCSIFLINKPARAMS\s/p' \ -e '/^#define SIOCSIFLOG\s/p' \ -e '/^#define SIOCSIFLOWPOWER\s/p' \ + -e '/^#define SIOCSIFMARKWAKEPKT\s/p' \ -e '/^#define SIOCSIFMPKLOG\s/p' \ + -e '/^#define SIOCSIFNOACKPRIO\s/p' \ + -e '/^#define SIOCSIFNOTRAFFICSHAPING\s/p' \ + -e '/^#define SIOCSIFDISABLEINPUT\s/p' \ -e '/^#define SIOCSIFPROBECONNECTIVITY\s/p' \ -e '/^#define SIOCSIFSUBFAMILY\s/p' \ -e '/^#define SIOCSIFTHROTTLE\s/p' \ @@ -364,7 +339,7 @@ let -e '/^#define SIOCSIFTIMESTAMPENABLE\s/p' \ -e '/^#define SIOCSQOSMARKINGENABLED\s/p' \ -e '/^#define SIOCSQOSMARKINGMODE\s/p' \ - '${xnu}/bsd/sys/sockio.h') + '${xnu}/bsd/sys/sockio_private.h') #undef ifreq #include_next EOF @@ -388,10 +363,16 @@ let cat < "$out/include/sys/unpcb.h" #pragma once #include_next + #define KERNEL + #ifdef KERNEL + $(sed -n \ + -e '/^struct unpcb_compat\s*{/,/^};/p' \ + '${xnu}/bsd/sys/unpcb.h') + #undef KERNEL $(sed -n \ -e '/^#define xu_addr/p' \ - -e '/^struct xunpcb64_list_entry\s*{/,/^};/p' \ - -e '/^struct xunpcb64\s*{/,/^};/p' \ + -e '/^struct *xunpcb\(64\|_n\)_list_entry\s*{/,/^};/p' \ + -e '/^struct *xunpcb\(64\|_n\)\s*{/,/^};/p' \ '${xnu}/bsd/sys/unpcb.h') ''; }; @@ -416,15 +397,6 @@ mkAppleDerivation { # Fix invalid pointer conversion error from trying to pass `NULL` to a `size_t`. substituteInPlace ndp.tproj/ndp.c --replace-fail 'NULL, NULL);' 'NULL, 0);' - # Copy older files that are more compatible with the current SDK. - ${lib.concatLines ( - lib.mapAttrsToList (name: path: "cp '${path}' 'ifconfig.tproj/${name}.c'") old_ifconfig - )} - - ${lib.concatLines ( - lib.mapAttrsToList (name: path: "cp '${path}' 'netstat.tproj/${name}'") old_netstat - )} - # Use private struct ifreq instead of the one defined in the system header. substituteInPlace ifconfig.tproj/ifconfig.c \ --replace-fail $'struct\tifreq' 'struct ifreq' \ @@ -449,6 +421,7 @@ mkAppleDerivation { buildInputs = [ libpcap libresolv + libutil openssl ]; From 8010c610db660c8e607fc09348c80711b497ac6b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0153/2279] darwin.removefile: drop workaround for older Clang versions --- .../darwin/apple-source-releases/removefile/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix index ab9f28605b5a..24cd68ead681 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix @@ -39,13 +39,6 @@ mkAppleDerivation { xcodeHash = "sha256-pE92mVI0KTHOVKBA4T5R1rHy5//uipOimas7DaTVe0U="; - postPatch = '' - # Disable experimental bounds safety stuff that’s not available in LLVM 16. - substituteInPlace removefile.h \ - --replace-fail '__ptrcheck_abi_assume_single()' "" \ - --replace-fail '__unsafe_indexable' "" - ''; - env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; meta.description = "Darwin file removing library"; From 13be5191fb933f9ca8b773a7e9ed4ff352cc0cb5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0154/2279] darwin.system_cmds: use default SDK on Darwin (14.4) --- .../system_cmds/meson.build.in | 47 ++++++------------- .../system_cmds/meson.options | 1 - .../system_cmds/package.nix | 38 +++++++++++---- 3 files changed, 44 insertions(+), 42 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in index f12b3fe41b92..3263cdb2837c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in @@ -15,9 +15,11 @@ add_project_arguments( '-DPRIVATE=1', # From bsd/sys/private_event.h in xnu '-Dkqueue_id_t=uint64_t', + # These are not defined automatically by Clang. Not having them defined causes compilation failures. + '-DTARGET_OS_EXCLAVECORE=0', + '-DTARGET_OS_EXCLAVEKIT=0', language : 'c', ) -sdk_version = get_option('sdk_version') # Dependencies @@ -39,15 +41,7 @@ dbm = cc.find_library('dbm') ncurses = dependency('ncurses') openbsm = cc.find_library('bsm') pam = cc.find_library('pam') - -# Feature Tests -if sdk_version.version_compare('<12') - add_project_arguments( - '-DIOMainPort=IOMasterPort', - '-DkIOMainPortDefault=kIOMasterPortDefault', - language : 'c' - ) -endif +util = cc.find_library('util') # Generators @@ -278,14 +272,11 @@ executable( executable( 'latency', - build_by_default : sdk_version.version_compare('>=12'), - dependencies : [ ncurses ], - install : sdk_version.version_compare('>=12'), + dependencies : [ util, ncurses ], + install : true, sources : 'latency/latency.c', ) -if sdk_version.version_compare('>=12') - install_man('latency/latency.1') -endif +install_man('latency/latency.1') executable( 'login', @@ -303,27 +294,21 @@ executable( executable( 'lskq', - build_by_default : sdk_version.version_compare('>=12'), - install : sdk_version.version_compare('>=12'), + install : true, sources : 'lskq/lskq.c', ) -if sdk_version.version_compare('>=12') - install_man('lskq/lskq.1') -endif +install_man('lskq/lskq.1') executable( 'lsmp', - build_by_default : sdk_version.version_compare('>=12'), - install : sdk_version.version_compare('>=12'), + install : true, sources : [ 'lsmp/lsmp.c', 'lsmp/port_details.c', 'lsmp/task_details.c' ] ) -if sdk_version.version_compare('>=12') - install_man('lsmp/lsmp.1') -endif +install_man('lsmp/lsmp.1') executable( 'ltop', @@ -469,14 +454,11 @@ install_man('sa/sa.8') executable( 'sc_usage', - build_by_default : sdk_version.version_compare('>=12'), - dependencies : ncurses, - install : sdk_version.version_compare('>=12'), + dependencies : [ncurses, util], + install : true, sources : 'sc_usage/sc_usage.c', ) -if sdk_version.version_compare('>=12') - install_man('sc_usage/sc_usage.1') -endif +install_man('sc_usage/sc_usage.1') executable('shutdown', # Requires IOKitUser kext APIs @@ -599,4 +581,3 @@ executable( sources : 'zprint/zprint.c', ) # install_man('zprint/zprint.1') - diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options deleted file mode 100644 index 8c4ce874c64c..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options +++ /dev/null @@ -1 +0,0 @@ -option('sdk_version', type : 'string') diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index 5e2b5ea0f834..a300bd1534ef 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -1,7 +1,7 @@ { lib, apple-sdk, - apple-sdk_12, + libutil, mkAppleDerivation, ncurses, openpam, @@ -13,12 +13,12 @@ let libdispatch = apple-sdk.sourceRelease "libdispatch"; # Has to match the version of the SDK - Libc = apple-sdk_12.sourceRelease "Libc"; - libmalloc = apple-sdk_12.sourceRelease "libmalloc"; - OpenDirectory = apple-sdk_12.sourceRelease "OpenDirectory"; + Libc = apple-sdk.sourceRelease "Libc"; + libmalloc = apple-sdk.sourceRelease "libmalloc"; + OpenDirectory = apple-sdk.sourceRelease "OpenDirectory"; - libplatform = apple-sdk_12.sourceRelease "libplatform"; - xnu = apple-sdk_12.sourceRelease "xnu"; + libplatform = apple-sdk.sourceRelease "libplatform"; + xnu = apple-sdk.sourceRelease "xnu"; privateHeaders = stdenvNoCC.mkDerivation { name = "system_cmds-deps-private-headers"; @@ -43,6 +43,7 @@ let install -D -t "$out/include" \ '${libmalloc}/private/stack_logging.h' \ '${libplatform}/private/_simple.h' \ + '${xnu}/libsyscall/wrappers/libproc/libproc_private.h' \ '${xnu}/libsyscall/wrappers/spawn/spawn_private.h' touch "$out/include/btm.h" @@ -71,13 +72,29 @@ let install -D -t "$out/include/sys" \ '${xnu}/bsd/sys/csr.h' \ + '${xnu}/bsd/sys/event_private.h' \ '${xnu}/bsd/sys/pgo.h' \ + '${xnu}/bsd/sys/kdebug_private.h' \ '${xnu}/bsd/sys/kern_memorystatus.h' \ + '${xnu}/bsd/sys/proc_info_private.h' \ '${xnu}/bsd/sys/reason.h' \ '${xnu}/bsd/sys/resource.h' \ + '${xnu}/bsd/sys/resource_private.h' \ '${xnu}/bsd/sys/spawn_internal.h' \ '${xnu}/bsd/sys/stackshot.h' + cat < "$out/include/sys/kdebug.h" + #pragma once + #include_next + #include + EOF + + cat < "$out/include/sys/proc_info.h" + #pragma once + #include_next + #include + EOF + # Older source releases depend on CrashReporterClient.h, but it’s not publicly available. touch "$out/include/CrashReporterClient.h" ''; @@ -94,6 +111,12 @@ mkAppleDerivation { # Requires BackgroundTaskManagement.framework headers. sed -e '/ if (os_feature_enabled(cronBTMToggle, cronBTMCheck))/,/ }/d' -i atrun/atrun.c + + # Fix format security errors + for src in latency/latency.c sc_usage/sc_usage.c; do + substituteInPlace $src \ + --replace-fail 'printw(tbuf)' 'printw("%s", tbuf);' + done ''; preConfigure = '' @@ -104,13 +127,12 @@ mkAppleDerivation { buildInputs = [ apple-sdk.privateFrameworksHook + libutil ncurses openpam ]; nativeBuildInputs = [ pkg-config ]; - mesonFlags = [ (lib.mesonOption "sdk_version" stdenv.hostPlatform.darwinSdkVersion) ]; - meta.description = "System commands for Darwin"; } From ea758132a153f61df781c98ef0929fd5370a86a0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0155/2279] darwin.text_cmds: use default SDK on Darwin (14.4) --- .../apple-source-releases/text_cmds/package.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix index b640edb096b8..b4b31530895d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - apple-sdk_13, bzip2, libmd, libresolv, @@ -18,7 +17,6 @@ let Libc = apple-sdk.sourceRelease "Libc"; - Libc_13 = apple-sdk_13.sourceRelease "Libc"; CommonCrypto = apple-sdk.sourceRelease "CommonCrypto"; libplatform = apple-sdk.sourceRelease "libplatform"; @@ -30,7 +28,7 @@ let buildCommand = '' install -D -t "$out/include" \ '${libplatform}/private/_simple.h' \ - '${Libc_13}/include/vis.h' + '${Libc}/include/vis.h' install -D -t "$out/include/os" \ '${Libc}/os/assumes.h' \ '${xnu}/libkern/os/base_private.h' @@ -60,18 +58,6 @@ mkAppleDerivation { --replace-fail SHA224_CTX SHA2_CTX \ --replace-fail '' '' \ --replace-fail 'const void *, unsigned int, char *' 'const uint8_t *, size_t, char *' - '' - + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "13.0") '' - # Backport vis APIs from the 13.3 SDK (needed by vis). - cp '${Libc_13}/gen/FreeBSD/vis.c' vis/vis-libc.c - # Backport errx APIs from the 13.3 SDK (needed by lots of things). - mkdir sys - cp '${Libc_13}/gen/FreeBSD/err.c' err-libc.c - cp '${Libc_13}/include/err.h' err.h - cp '${Libc_13}/fbsdcompat/sys/cdefs.h' sys/cdefs.h - substituteInPlace err.h \ - --replace-fail '__cold' "" - touch namespace.h un-namespace.h libc_private.h ''; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; From 2fbd3f4aab2e22a468704feef1d4a65c7761972e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0156/2279] dotnetCorePackages.dotnet_{8,9,10}.vmr: use default SDK on Darwin (14.4) --- pkgs/development/compilers/dotnet/vmr.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 5f1882e777eb..04562acd3120 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -18,7 +18,6 @@ darwin, xcbuild, swiftPackages, - apple-sdk_13, openssl, getconf, python3, @@ -112,15 +111,12 @@ stdenv.mkDerivation rec { krb5 lttng-ust_2_12 ] - ++ lib.optionals isDarwin ( - [ - xcbuild - swift - krb5 - sigtool - ] - ++ lib.optional (lib.versionAtLeast version "10") apple-sdk_13 - ); + ++ lib.optionals isDarwin [ + xcbuild + swift + krb5 + sigtool + ]; # This is required to fix the error: # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. From 20e89e336ebc3ffca4abdd59e01cc387c133f717 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0157/2279] drawterm: use default SDK on Darwin (14.4) --- pkgs/by-name/dr/drawterm/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index ea7893024b3c..4e1411206978 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -5,7 +5,6 @@ unstableGitUpdater, installShellFiles, makeWrapper, - apple-sdk_13, xorg, pkg-config, wayland-scanner, @@ -54,8 +53,7 @@ stdenv.mkDerivation { ++ lib.optionals withXorg [ xorg.libX11 xorg.libXt - ] - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13; + ]; makeFlags = lib.optional withWayland "CONF=linux" From 72289dfaa66cff3c7d42f25b41e1abb2ffbf6695 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0158/2279] ghostunnel: use default SDK on Darwin (14.4) --- pkgs/by-name/gh/ghostunnel/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix index ed4cc9f9c7a5..6b90c1acb688 100644 --- a/pkgs/by-name/gh/ghostunnel/package.nix +++ b/pkgs/by-name/gh/ghostunnel/package.nix @@ -5,8 +5,6 @@ lib, nixosTests, ghostunnel, - apple-sdk_12, - darwinMinVersionHook, writeScript, runtimeShell, }: @@ -26,11 +24,6 @@ buildGoModule rec { deleteVendor = true; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - (darwinMinVersionHook "12.0") - ]; - # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain # which doesn't work from a nix build. Presumably other platform implementations of the # certstore would have similar issues, so it probably makes sense to skip them in From 7da765f439b2a8f03e07b094503cb0bc3a0b7d1d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0159/2279] go: use default SDK on Darwin (14.4) --- pkgs/development/compilers/go/1.25.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index db50761a4bbc..d7eff664fa04 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - apple-sdk_12, tzdata, replaceVars, iana-etc, @@ -70,10 +69,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ - apple-sdk_12 - ]; - depsBuildTarget = lib.optional isCross targetCC; depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package; From 1557189e93c847e74c0d4eb271cff5eed790ff68 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0160/2279] gopass: use default SDK on Darwin (14.4) --- pkgs/tools/security/gopass/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 5028d1096e32..c10aabed38aa 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -10,7 +10,6 @@ xclip, wl-clipboard, passAlias ? false, - apple-sdk_14, nix-update-script, versionCheckHook, }: @@ -36,11 +35,6 @@ buildGoModule (finalAttrs: { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365 - apple-sdk_14 - ]; - src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass"; From a148418ba6a611637ac4b483853c184900736237 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0161/2279] gopass-jsonapi: use default SDK on Darwin (14.4) --- pkgs/by-name/go/gopass-jsonapi/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix index 91a8baccd8a1..b3f594155695 100644 --- a/pkgs/by-name/go/gopass-jsonapi/package.nix +++ b/pkgs/by-name/go/gopass-jsonapi/package.nix @@ -8,7 +8,6 @@ jq, gnupg, gopass, - apple-sdk_14, }: let @@ -45,11 +44,6 @@ buildGoModule rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365 - apple-sdk_14 - ]; - ldflags = [ "-s" "-w" From 4c07c99f2b30aecbe150d6af3a948ce09c867f5b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0162/2279] gst_all_1: use default SDK on Darwin (14.4) --- pkgs/development/libraries/gstreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 760ec0610dee..a33b23e18275 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -4,11 +4,11 @@ callPackage, ipu6ep-camera-hal, ipu6epmtl-camera-hal, - apple-sdk_13, + apple-sdk, }: let - apple-sdk_gstreamer = apple-sdk_13; + apple-sdk_gstreamer = apple-sdk; in { inherit apple-sdk_gstreamer; From 8d2b795e205e61af108559c526a2dae2f040a328 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0163/2279] kanata: use default SDK on Darwin (14.4) --- pkgs/by-name/ka/kanata/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 509fc4cd0a21..73f0b9eeeb64 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -1,8 +1,6 @@ { stdenv, lib, - apple-sdk_13, - darwinMinVersionHook, rustPlatform, fetchFromGitHub, versionCheckHook, @@ -23,14 +21,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LfjuQHR3vVUr2e0efVymnfCnyYkFRx7ZiNdSIjBZc5s="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_13 - (darwinMinVersionHook "13.0") - ]; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ (writeShellScriptBin "sw_vers" '' - echo 'ProductVersion: 13.0' + echo 'ProductVersion: ${stdenv.hostPlatform.darwinMinVersion}' '') ]; From b9eab368aff3a451cbbf0f189b05de04ecb26046 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0164/2279] koboldcpp: use default SDK on Darwin (14.4) --- pkgs/by-name/ko/koboldcpp/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 8069cd12f86e..a617042d71a0 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -7,8 +7,6 @@ tk, addDriverRunpath, - apple-sdk_12, - koboldLiteSupport ? true, config, @@ -63,7 +61,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { tk ] ++ finalAttrs.pythonInputs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals cublasSupport [ cudaPackages.libcublas cudaPackages.cuda_nvcc From 58a2ab47bea9fd9ed7345074d8c7c44370f25a0d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0165/2279] ladybird: use default SDK on Darwin (14.4) --- pkgs/by-name/la/ladybird/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 5c558f5eea40..e671ade25980 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -27,7 +27,6 @@ skia, nixosTests, unstableGitUpdater, - apple-sdk_14, libtommath, sdl3, }: @@ -107,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.hostPlatform.isLinux [ libpulseaudio.dev qt6Packages.qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 ]; cmakeFlags = [ From 5f5b7dc7d2ec2eb9c4c4e0c9d1f6a1fc0d0ed5bf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0166/2279] livkit-webrtc: use default SDK on Darwin (14.4) --- pkgs/by-name/li/livekit-libwebrtc/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix index fe5235d5b492..89fbc8ec6f11 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/package.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix @@ -9,7 +9,6 @@ xcbuild, python3, ninja, - apple-sdk_14, darwinMinVersionHook, git, cpio, @@ -191,11 +190,7 @@ stdenv.mkDerivation { glib alsa-lib pulseaudio - ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - (darwinMinVersionHook "12.3") - ]; + ]); preConfigure = '' echo "generate_location_tags = true" >> build/config/gclient_args.gni @@ -234,7 +229,7 @@ stdenv.mkDerivation { "is_clang=false" ]) ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - ''mac_deployment_target="12.3"'' + ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"'' "rtc_enable_symbol_export=true" "rtc_enable_objc_symbol_export=true" "rtc_include_dav1d_in_internal_decoder_factory=true" From 51370732ee2db2cb3abea953eb74edf31a2b7a67 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0167/2279] llama-cpp: use default SDK on Darwin (14.4) --- pkgs/by-name/ll/llama-cpp/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 626336395493..548a03c70233 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -30,7 +30,6 @@ metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport, vulkanSupport ? false, rpcSupport ? false, - apple-sdk_14, curl, llama-cpp, shaderc, @@ -121,7 +120,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] ++ optionals vulkanSupport vulkanBuildInputs - ++ optionals metalSupport [ apple-sdk_14 ] ++ [ curl ]; preConfigure = '' From d068cfff50fcb0833879d1d75e6380397685a216 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 9 Oct 2025 17:57:13 -0400 Subject: [PATCH 0168/2279] nchat: use default SDK on Darwin (14.4) --- pkgs/by-name/nc/nchat/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 8ee45785f8cd..8f544f0d79a5 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -13,7 +13,6 @@ gperf, nix-update-script, withWhatsApp ? true, - apple-sdk_12, }: let @@ -88,10 +87,6 @@ stdenv.mkDerivation rec { readline sqlite zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # For SecTrustCopyCertificateChain, see https://github.com/NixOS/nixpkgs/pull/445063#pullrequestreview-3261846621 - apple-sdk_12 ]; cmakeFlags = [ From a0686081fe12cdbdf3260c0ade2cb391a03a5d73 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0169/2279] nvtopPackages.apple: use default SDK on Darwin (14.4) --- pkgs/tools/system/nvtop/build-nvtop.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 79721da656b4..df66ef58e24a 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -9,7 +9,6 @@ ncurses, testers, udev, - apple-sdk_12, addDriverRunpath, amd ? false, intel ? false, @@ -77,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ncurses ] ++ lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12 ++ lib.optional nvidia cudatoolkit ++ lib.optional needDrm libdrm; From f02b8cf7b9c10e652b55dc2f4b322e657759ee84 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0170/2279] ponyc: use default SDK on Darwin (14.4) --- pkgs/by-name/po/ponyc/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix index d2c126c78aae..cad3e1446b8e 100644 --- a/pkgs/by-name/po/ponyc/package.nix +++ b/pkgs/by-name/po/ponyc/package.nix @@ -2,10 +2,9 @@ lib, stdenv, fetchFromGitHub, - apple-sdk_13, + apple-sdk, cmake, coreutils, - darwinMinVersionHook, libxml2, lto ? true, makeWrapper, @@ -58,9 +57,6 @@ stdenv.mkDerivation rec { git ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Keep in sync with `PONY_OSX_PLATFORM`. - apple-sdk_13 - (darwinMinVersionHook "13.0") cctools.libtool ]; @@ -76,7 +72,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (replaceVars ./fix-darwin-build.patch { - apple-sdk = apple-sdk_13; + inherit apple-sdk; }) ]; From ccd7288e2604d32f6c535405fe1f0f992aa2f7bb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0171/2279] python3Packages.materialx: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/materialx/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 5d9a744079c3..96d3995259cd 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -11,7 +11,6 @@ openimageio, imath, python, - apple-sdk_14, }: buildPythonPackage rec { @@ -36,9 +35,6 @@ buildPythonPackage rec { openimageio imath ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXt @@ -46,6 +42,7 @@ buildPythonPackage rec { ]; cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) (lib.cmakeBool "MATERIALX_BUILD_SHARED_LIBS" true) (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) From e2f070607421f89eb89b095a3e8faf5a75e3f25d Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0172/2279] python3Packages.mlx: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/mlx/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index 1816bc34f7ed..9aec1b175c76 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -12,7 +12,7 @@ cmake, # buildInputs - apple-sdk_14, + apple-sdk, fmt, nanobind, nlohmann_json, @@ -48,7 +48,7 @@ let patches = [ (replaceVars ./darwin-build-fixes.patch { - sdkVersion = apple-sdk_14.version; + sdkVersion = apple-sdk.version; }) ]; @@ -95,7 +95,6 @@ let ]; buildInputs = [ - apple-sdk_14 fmt gguf-tools nanobind From ca24684803ea7c2a8ab7c80a17c12bce26fac04b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0173/2279] python3Packages.torch: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/torch/source/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix index 61caaf420b57..345ab9866ae6 100644 --- a/pkgs/development/python-modules/torch/source/default.nix +++ b/pkgs/development/python-modules/torch/source/default.nix @@ -42,7 +42,6 @@ removeReferencesTo, # Build inputs - apple-sdk_13, openssl, numactl, llvmPackages, @@ -589,9 +588,6 @@ buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_13 - ] ++ lib.optionals tritonSupport [ _tritonEffective ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ From 28f33de7dd9e92a21cc754b0187b1375d4edb209 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0174/2279] python3Packages.torchvision: use default SDK on Darwin (14.4) --- pkgs/development/python-modules/torchvision/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index bec58361183e..50997ca76193 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -2,7 +2,6 @@ lib, stdenv, torch, - apple-sdk_13, buildPythonPackage, darwinMinVersionHook, fetchFromGitHub, @@ -55,14 +54,6 @@ buildPythonPackage { libjpeg_turbo libpng torch.cxxdev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # This should match the SDK used by `torch` above - apple-sdk_13 - - # error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'? - # https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/ - (darwinMinVersionHook "12.0") ]; dependencies = [ From 968bc7dfb4ef40bd4a825818c4a3c19c7aaffe55 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0175/2279] qemu: use default SDK on Darwin (14.4) --- pkgs/applications/virtualization/qemu/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 00521e0feb27..ec4acef94d96 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -32,8 +32,6 @@ socat, libslirp, libcbor, - apple-sdk_13, - darwinMinVersionHook, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, @@ -128,14 +126,6 @@ assert lib.assertMsg ( let hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets; - - # needed in buildInputs and depsBuildBuild - # check log for warnings eg: `warning: 'hv_vm_config_get_max_ipa_size' is only available on macOS 13.0` - # to indicate if min version needs to get bumped. - darwinSDK = [ - apple-sdk_13 - (darwinMinVersionHook "13") - ]; in stdenv.mkDerivation (finalAttrs: { @@ -156,7 +146,6 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK ++ lib.optionals hexagonSupport [ pkg-config ]; nativeBuildInputs = [ @@ -205,7 +194,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] From f6b75da2d534b87464c25b5572c44fadb3231495 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0176/2279] qt5.*: use default SDK on Darwin (14.4) --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 7 ------- pkgs/development/libraries/qt-5/qtModule.nix | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 57f77518ed55..4974937053ca 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -17,7 +17,6 @@ python3, which, # darwin support - apple-sdk_14, xcbuild, dbus, @@ -86,11 +85,6 @@ let "linux-generic-g++" else throw "Please add a qtPlatformCross entry for ${plat.config}"; - - # Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x. - darwinVersionInputs = [ - apple-sdk_14 - ]; in stdenv.mkDerivation ( @@ -153,7 +147,6 @@ stdenv.mkDerivation ( ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3 ) - ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional mysqlSupport libmysqlclient diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 165b4271c077..fa21bb05c864 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, mkDerivation, - apple-sdk_14, perl, qmake, patches, @@ -29,12 +28,7 @@ mkDerivation ( inherit pname version src; patches = (args.patches or [ ]) ++ (patches.${pname} or [ ]); - buildInputs = - args.buildInputs or [ ] - # Per https://doc.qt.io/qt-5/macos.html#supported-versions - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 - ]; + buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) From 46efd7786aead34e49ed60d5eb2f604ed232b0bd Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0177/2279] rpm: use default SDK on Darwin (14.4) --- pkgs/tools/package-management/rpm/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 49f144d390ba..343004ddc324 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -19,7 +19,6 @@ sqlite, zstd, libcap, - apple-sdk_13, darwinMinVersionHook, openssl, #, libselinux @@ -90,10 +89,6 @@ stdenv.mkDerivation rec { libcap audit systemd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_13 - (darwinMinVersionHook "13.0") ]; patches = lib.optionals stdenv.hostPlatform.isDarwin [ From 1a0918ae778491fa891720d9d1a705eaac6aecc6 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0178/2279] rstudio: use default SDK on Darwin (14.4) --- pkgs/by-name/rs/rstudio/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 94ee478ea25f..510a1a39eebb 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -24,7 +24,6 @@ yarnConfigHook, zip, - apple-sdk_11, boost187, electron_37, fontconfig, @@ -160,9 +159,6 @@ stdenv.mkDerivation rec { soci sqlite.dev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_11 - ] ++ lib.optionals (!server) [ fontconfig ] From f86b1e9a0fad00a5d3dcc008ddba0e3c5d5f013f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0179/2279] screen-pipe: use default SDK on Darwin (14.4) --- pkgs/by-name/sc/screen-pipe/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index a54576c598a1..c26a380f77f5 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -11,7 +11,6 @@ stdenv, alsa-lib, xorg, - apple-sdk_12, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; @@ -48,9 +47,6 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xorg.libxcb From 619a93bc87cc10a6f89302e4cd5d0bf98243cb29 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0180/2279] sdl3: use default SDK on Darwin (14.4) --- pkgs/by-name/sd/sdl3/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 8488b5345258..5237c94c40ab 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -3,7 +3,6 @@ stdenv, config, alsa-lib, - apple-sdk_11, cmake, darwinMinVersionHook, dbus, @@ -144,12 +143,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL ++ lib.optional x11Support xorg.libX11 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'MTLPixelFormatASTC_4x4_LDR' is unavailable: not available on macOS - (darwinMinVersionHook "11.0") - - apple-sdk_11 - ] ++ lib.optionals ibusSupport [ # sdl3 only uses some constants of the ibus headers # it never actually loads the library From e963c19b5f47b29844d0c1c9ec88064c18b5dc35 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0181/2279] sdrangel: use default SDK on Darwin (14.4) --- pkgs/by-name/sd/sdrangel/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 08538523beb2..eea36612c8a9 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -3,7 +3,6 @@ stdenv, airspy, airspyhf, - apple-sdk_12, aptdec, boost, cm256cc, @@ -102,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ From da7a8d12f02337f7d9f3c66f7076f516d62daf88 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0182/2279] servo: use default SDK on Darwin (14.4) --- pkgs/by-name/se/servo/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index c6b69dc98503..257e3234347a 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -24,7 +24,6 @@ zlib, # runtime deps - apple-sdk_14, fontconfig, freetype, gst_all_1, @@ -131,9 +130,6 @@ rustPlatform.buildRustPackage { xorg.libxcb udev vulkan-loader - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_14 ]; # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819 From 6ab924b0c2e1fbc11bb1952e5910521f144acb9a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0183/2279] shipwright: use default SDK on Darwin (14.4) --- pkgs/by-name/sh/shipwright/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index c3fd3e73c0c8..d1de64a45036 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -1,5 +1,4 @@ { - apple-sdk_13, stdenv, cmake, lsb-release, @@ -165,10 +164,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio zenity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Metal.hpp requires macOS 13.x min. - apple-sdk_13 ]; cmakeFlags = [ From 109017913fe23f26b00257728e39ab318fd770bc Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0184/2279] spacebar: use default SDK on Darwin (14.4) --- pkgs/by-name/sp/spacebar/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix index dec0ec5dc6ac..2fcb62b97851 100644 --- a/pkgs/by-name/sp/spacebar/package.nix +++ b/pkgs/by-name/sp/spacebar/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - apple-sdk_12, }: stdenv.mkDerivation rec { @@ -16,10 +15,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM="; }; - buildInputs = [ - apple-sdk_12 - ]; - installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1/ From ec30ce8c6530a5f4d965766f2e9206c719468953 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0185/2279] spidermonkey: drop SDK version workaround patch --- .../spidermonkey/140-relax-apple-sdk.patch | 13 ------------- .../interpreters/spidermonkey/common.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch diff --git a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch b/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch deleted file mode 100644 index c6e28f11be2f..000000000000 --- a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 37c00230c853..dd89bea24392 100644 ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx): - ) - - def mac_sdk_min_version(): -- return "15.5" -+ return "15.2" - - @depends( - "--with-macos-sdk", diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index d2e542899540..4462bb085472 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; }) - # SDK 15.5 is not available in nixpkgs yet - ./140-relax-apple-sdk.patch ]; nativeBuildInputs = [ From 7cc243d3d52e62eb67ddb0e9f3f3dcb967c6ea86 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0186/2279] spotifyd: use default SDK on Darwin (14.4) --- pkgs/by-name/sp/spotifyd/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index e76e0950d852..639c448b9a78 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -3,7 +3,6 @@ stdenv, config, alsa-lib, - apple-sdk_11, cmake, dbus, fetchFromGitHub, @@ -42,8 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + lib.optionals stdenv.hostPlatform.isLinux [ openssl ] # The `dbus_mpris` feature works on other platforms, but only requires `dbus` on Linux ++ lib.optional (withMpris && stdenv.hostPlatform.isLinux) dbus ++ lib.optional (withALSA || withJack) alsa-lib From e61f6d162f213b705866e7edb65de8cb90bc0c7b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0187/2279] swift: mark broken until the 5.10.1 update can be done --- pkgs/development/compilers/swift/compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 25d7f37c4089..96d410972bf2 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -35,12 +35,11 @@ cctools, # libtool sigtool, DarwinTools, - apple-sdk_13, darwinMinVersionHook, }: let - apple-sdk_swift = apple-sdk_13; # Use the SDK that was available when Swift shipped. + apple-sdk_swift = builtins.throw "Swift 5.8 requires the 13.3 SDK, which has been removed"; deploymentVersion = if lib.versionOlder (targetPlatform.darwinMinVersion or "0") "10.15" then @@ -824,5 +823,6 @@ stdenv.mkDerivation { # Swift doesn't support 32-bit Linux, unknown on other platforms. badPlatforms = lib.platforms.i686; timeout = 86400; # 24 hours. + broken = true; # Needs updated to 5.10.1 to build with the 14.4 SDK. }; } From 3c201e0f0e9e2f3d568218b37ee2535ea0002e9c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0188/2279] whisper-cpp: use default SDK on Darwin (14.4) --- pkgs/by-name/wh/whisper-cpp/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index bd24a2f1e976..e8f72715cad8 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -3,7 +3,6 @@ stdenv, cmake, git, - apple-sdk_13, ninja, fetchFromGitHub, SDL2, @@ -47,8 +46,6 @@ let optionals ; - darwinBuildInputs = [ apple-sdk_13 ]; - cudaBuildInputs = with cudaPackages; [ cuda_cccl # @@ -111,7 +108,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = optional withSDL SDL2 - ++ optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs ++ optionals cudaSupport cudaBuildInputs ++ optionals rocmSupport rocmBuildInputs ++ optionals vulkanSupport vulkanBuildInputs; From 9d540d1b8c7764f09d57c76113d562f23d8f6845 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 22 Sep 2025 18:53:09 -0400 Subject: [PATCH 0189/2279] wine: use default SDK on Darwin (14.4) --- pkgs/applications/emulators/wine/base.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 9ac68c4ffcea..4665547f501d 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -40,12 +40,6 @@ let }; } ./setup-hook-darwin.sh; - # Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin. - # It does an availability check, so older systems will still work. - darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin ( - toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ]) - ); - # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures # because they will put Darwin in `meta.badPlatforms`. darwinUnsupportedFlags = [ @@ -168,7 +162,6 @@ stdenv.mkDerivation ( pkgs.libGL pkgs.libdrm ] - ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks ++ lib.optionals x11Support ( with pkgs.xorg; [ @@ -213,11 +206,7 @@ stdenv.mkDerivation ( # LD_LIBRARY_PATH. NIX_LDFLAGS = toString ( map (path: "-rpath " + path) ( - map (x: "${lib.getLib x}/lib") ( - [ stdenv.cc.cc ] - # Avoid adding rpath references to non-existent framework `lib` paths. - ++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs - ) + map (x: "${lib.getLib x}/lib") [ stdenv.cc.cc ] # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport ( map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])) From 9b456509dc6e24ce3c72e352e55508ed41d5767c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Thu, 9 Oct 2025 17:58:27 -0400 Subject: [PATCH 0190/2279] xemu: use default SDK on Darwin (14.4) --- pkgs/by-name/xe/xemu/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 223d1c696451..54847fe83e09 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -29,7 +29,6 @@ wrapGAppsHook3, cacert, darwin, - apple-sdk_12, desktopToDarwinBundle, }: @@ -98,9 +97,6 @@ stdenv.mkDerivation (finalAttrs: { libdrm libgbm vte - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_12 ]; configureFlags = [ From 0f6b88a896e6b2c1ebadd528f75e75d631db227b Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 0191/2279] apple-sdk_{11,12,13}: drop The minimum supported version for 25.11 is 14.0. Drop the old SDKs because they are for versions prior to that. --- .../metadata/apple-oss-lockfile.json | 534 ------------------ .../ap/apple-sdk/metadata/versions.json | 24 - 2 files changed, 558 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json index 2dc99f12620d..fd77eec04584 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json @@ -1,538 +1,4 @@ { - "11.3": { - "CarbonHeaders": { - "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", - "version": "18.1" - }, - "CommonCrypto": { - "hash": "sha256-92v9tuNLqvalwYV4AqQllA8yN9fqGjSpc4MNAmFPrbk=", - "version": "60178.100.1" - }, - "IOAudioFamily": { - "hash": "sha256-dSSbt9ZoL/Tq2xXwvvXsDmD3Xru7igzdK1MxGL1K+Aw=", - "version": "300.6.1" - }, - "IOBDStorageFamily": { - "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", - "version": "20.100.1" - }, - "IOCDStorageFamily": { - "hash": "sha256-w0YhZ38RBfnxSc74Q8r5UdK+WiWOSAX46r5hahHLnSg=", - "version": "59" - }, - "IODVDStorageFamily": { - "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", - "version": "43" - }, - "IOFWDVComponents": { - "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", - "version": "208" - }, - "IOFireWireAVC": { - "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=", - "version": "428" - }, - "IOFireWireFamily": { - "hash": "sha256-2xppN8RJ9cxrHWjPQ4bUIjtupPbzfmrm3rXnT/9QVfc=", - "version": "483" - }, - "IOFireWireSBP2": { - "hash": "sha256-kfhmZy8veqI3/XHDtOTKmKj6P7s+j0B+BiAbcjhGq0M=", - "version": "442" - }, - "IOFireWireSerialBusProtocolTransport": { - "hash": "sha256-WDq2Ak72Jw6gYNIKgZkiexA6LzccrPn1kpSbW5U50ek=", - "version": "257.40.1" - }, - "IOGraphics": { - "hash": "sha256-kEP4RWIZwu3ZPIq9IAPUKM0gIXHr8xD50SnGNFCQRcI=", - "version": "585.1" - }, - "IOHIDFamily": { - "hash": "sha256-QASfvttke+AUx55In4DD4vsQGzC3nbe+MugQQ4ddXGU=", - "version": "1633.100.36" - }, - "IOKitUser": { - "hash": "sha256-NQCRrufElx00B7CqqslBi5BTxf5Zs4lcMcJig4Eab0k=", - "version": "1845.100.19" - }, - "IONetworkingFamily": { - "hash": "sha256-HqTKzrX75mMFYYbxNKwPdXmI7h7t/QWuO3W1Qo//zIo=", - "version": "151.40.1" - }, - "IOSerialFamily": { - "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", - "version": "93" - }, - "IOStorageFamily": { - "hash": "sha256-dy6CYz/z6SwPw0YfC6GLZO2u62Xy8otMDUNrZ5JhTDY=", - "version": "260.100.1" - }, - "IOUSBFamily": { - "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", - "version": "630.4.5" - }, - "Libc": { - "hash": "sha256-v01g/EtMW/STZQ1neKDMyUGL7sgaCzlwXN0VDaj/Mf0=", - "version": "1439.100.3" - }, - "Libinfo": { - "hash": "sha256-T7KO6zfswjyTIKSdZJCbvfsdqQfPMLj5nheX9iSIl9o=", - "version": "542.40.3" - }, - "Libm": { - "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", - "version": "2026" - }, - "Libnotify": { - "hash": "sha256-vcDjdwB5OiTEUdl8ISezzpoHeFttkdvkulY/YbUOZjk=", - "version": "279.40.4" - }, - "Librpcsvc": { - "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", - "version": "26" - }, - "Libsystem": { - "hash": "sha256-24T9aD4W71prcpr3MnnaU3pfxIzIwkOz39OyhCwPO/E=", - "version": "1292.100.5" - }, - "OpenDirectory": { - "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", - "version": "146" - }, - "Security": { - "hash": "sha256-o5MyyqDpERvNPvbEfXNgqMIq0YpQV0+ju72C9g/9OdI=", - "version": "59754.100.106" - }, - "architecture": { - "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=", - "version": "279" - }, - "configd": { - "hash": "sha256-WEorIW5Vl8E9/aB0RBTY2bhkfVOF3tckjNztGDOOueA=", - "version": "1109.101.1" - }, - "copyfile": { - "hash": "sha256-3BHFM67dvwUpinzF0pSX3QiUbIsqtLo77WzB3tMbTW4=", - "version": "173.40.2" - }, - "dtrace": { - "hash": "sha256-FfyaYjEMDeL9wGdUyZ4eJdkbkp/WpdTGyBvaorwKSi8=", - "version": "370.40.1" - }, - "dyld": { - "hash": "sha256-dtDTh6YqubBI4Z+QeytwGgUmU6tutvonIWHqzw6zuxo=", - "version": "851.27" - }, - "eap8021x": { - "hash": "sha256-Ap7qumn/oKYe424n2NW6QkuivgDyLoJgDfl30Q5O7Jo=", - "version": "304.100.1" - }, - "hfs": { - "hash": "sha256-MSnc1pB8DcB+mn308snTD1uRQ7Ro4aWyFuLdWjHtAG4=", - "version": "556.100.11" - }, - "launchd": { - "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", - "version": "842.1.4" - }, - "libclosure": { - "hash": "sha256-UgmMnDUosaC2yI7IyQ7mkNwZ6/oft77ay+SmGSoycIw=", - "version": "79" - }, - "libdispatch": { - "hash": "sha256-K8QL9NfjGsj8c0jbocKegmKBqydimpKu8yRXnQQqdH8=", - "version": "1271.100.5" - }, - "libmalloc": { - "hash": "sha256-k3dJk7S0Lom3B28vRI9QxIuo0AOkd9OHzWO7MandfUw=", - "version": "317.100.9" - }, - "libplatform": { - "hash": "sha256-BSIGgKj5B6Dr0KQiIl2LSA3+ZEhzk/snQeCauErcq6k=", - "version": "254.80.2" - }, - "libpthread": { - "hash": "sha256-cGaDXLTztUYppbMvv41qj5RqONXfhfdHpt9dqY6+5Lc=", - "version": "454.100.8" - }, - "mDNSResponder": { - "hash": "sha256-eqcv174vIwWYXrIhzph+KO1zG8TdK5jRFVgsaAlV9es=", - "version": "1310.100.10" - }, - "objc4": { - "hash": "sha256-rqOPyN9S4KbMhCCVvtyEmGxTWzy+tsh0kfu3k47szXo=", - "version": "818.2" - }, - "ppp": { - "hash": "sha256-pSOlu/yXQhopCHDLnmhUnQeU89MkXhkQB0ZrN9r3qyk=", - "version": "877.40.2" - }, - "removefile": { - "hash": "sha256-B79A9AQ1/cB+zlmVKWcEXVOJHW6rOrX40S/hrMuWqXU=", - "version": "49.101.1" - }, - "xnu": { - "hash": "sha256-M1XWippH55VUJu4aosRFX8j9aOm/PONYVjPZOPufD80=", - "version": "7195.101.1" - } - }, - "12.3": { - "CarbonHeaders": { - "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", - "version": "18.1" - }, - "CommonCrypto": { - "hash": "sha256-HTGBUE6vHjS80CFTiIQ8F17m8Yd2ZRHccvFu2CA2P9U=", - "version": "60191.100.1" - }, - "IOAudioFamily": { - "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=", - "version": "340.2" - }, - "IOBDStorageFamily": { - "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", - "version": "22" - }, - "IOCDStorageFamily": { - "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", - "version": "61" - }, - "IODVDStorageFamily": { - "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", - "version": "43" - }, - "IOFWDVComponents": { - "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", - "version": "208" - }, - "IOFireWireAVC": { - "hash": "sha256-ruAomp5Lv7zuPu9vHsNKoPtDvD1AIrRARsPMpcx/fh0=", - "version": "430" - }, - "IOFireWireFamily": { - "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", - "version": "487" - }, - "IOFireWireSBP2": { - "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", - "version": "445" - }, - "IOFireWireSerialBusProtocolTransport": { - "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", - "version": "260" - }, - "IOGraphics": { - "hash": "sha256-lzxBrPLlF01+2jFKRJtSnwpf0r05C0H3tM7Q0N1RUPA=", - "version": "594" - }, - "IOHIDFamily": { - "hash": "sha256-EQQHAS8WKUoTxZscixylc2ZMoD4UYBlHRUj2O7Ikgac=", - "version": "1787.100.13" - }, - "IOKitUser": { - "hash": "sha256-Cdfa/YXM0W4O15femcU0G1Xcpbm+iADWIBWIdzoeuTE=", - "version": "1955.100.5" - }, - "IONetworkingFamily": { - "hash": "sha256-odUZJQq8lb3UYk7F8dBi1Hds00M+kwdlyGwZkVkSwTg=", - "version": "160.100.2" - }, - "IOSerialFamily": { - "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", - "version": "93" - }, - "IOStorageFamily": { - "hash": "sha256-2b32qe1z7Z+Od1dVlAGdM142DdF8cBaRC+ElysSuAQ4=", - "version": "290.100.6" - }, - "IOUSBFamily": { - "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", - "version": "630.4.5" - }, - "Libc": { - "hash": "sha256-obalDxsbE+7gm7YwznUbfxL7MCriamQFP3DrXleNwU4=", - "version": "1507.100.9" - }, - "Libinfo": { - "hash": "sha256-OjnnSHEcifcWarVyXiHvYg/9jbCQy5/lzaq6fJRriy0=", - "version": "554" - }, - "Libm": { - "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", - "version": "2026" - }, - "Libnotify": { - "hash": "sha256-JXG0kHEdoIs6krVZ4+KsRVES4AuNjnQi8qF+XKSp5jE=", - "version": "301" - }, - "Librpcsvc": { - "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=", - "version": "26" - }, - "Libsystem": { - "hash": "sha256-mPPAxo67wWLtemO+PuKg1Ui0zKEfjnYVj/qX1/0kNBs=", - "version": "1311.100.3" - }, - "OpenDirectory": { - "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", - "version": "146" - }, - "Security": { - "hash": "sha256-cIqfXcfQOZonxaKndH80xC5YmmveHw+TxHOxqvc9u8I=", - "version": "60158.100.133" - }, - "architecture": { - "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", - "version": "280.100.2" - }, - "configd": { - "hash": "sha256-X34mjXdil4HeBLyqY4tyBWdmpjsOFTJDdDE81UQf708=", - "version": "1163.100.19.0.2" - }, - "copyfile": { - "hash": "sha256-3/zI3j/m9b13hebjCsOLry3Mf8ADdWJgrtQOdD0huG0=", - "version": "180.100.3" - }, - "dtrace": { - "hash": "sha256-q8H6slCN4RwJ5TxC5s3og6cIbjALySP5ODfVw6a/a+M=", - "version": "375" - }, - "dyld": { - "hash": "sha256-v1kk/Z3eI2sufNm2rx3FRbA/f9BeKJ3t9i9W7tTksXg=", - "version": "955" - }, - "eap8021x": { - "hash": "sha256-SayP1d2KWoRShykBA/NrQCuRnPoxlTiaLwifoqm0Gkg=", - "version": "315.100.2" - }, - "hfs": { - "hash": "sha256-q1yOIei98oudGAoBMNPRTV5EOYpXFL7iYmlCYsKsG0o=", - "version": "583.100.10" - }, - "launchd": { - "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", - "version": "842.1.4" - }, - "libclosure": { - "hash": "sha256-Ez75a0m+fJas7mGqFeDjjpc7sFDnyirRbtLMTYQDVxw=", - "version": "79.1" - }, - "libdispatch": { - "hash": "sha256-/VbSUtnWyToWOUyAAg/3wImbJ2w5k1tbJkt827x2lIE=", - "version": "1325.100.36" - }, - "libmalloc": { - "hash": "sha256-tyYce5nk0N923MbzoGzkGqunoKwArbTiZl8PCppYpso=", - "version": "374.100.5" - }, - "libplatform": { - "hash": "sha256-JUD2NdS310OhZ0F8gnOvoD8AgEtWRtPahKDw5iE2QJU=", - "version": "273.100.5" - }, - "libpthread": { - "hash": "sha256-al8QumtH7/D04oJ4LUSYW+6OdX0Ko3S3rwYU53n9/54=", - "version": "486.100.11" - }, - "mDNSResponder": { - "hash": "sha256-hsV0VYTPoO5YpaxrUXpXFy97LxlERzrQT0FRfCMOwic=", - "version": "1557.101.2" - }, - "objc4": { - "hash": "sha256-MKXnfZL46VtmAQMolqd7ATF9fYjCNstapGQfcH4uVwo=", - "version": "841.13" - }, - "ppp": { - "hash": "sha256-YyCE19T3rcM1G5jdXuYXuBXblJgR/nelvjpq+9maMhw=", - "version": "884" - }, - "removefile": { - "hash": "sha256-xF1VtTUhoiGsFQsvuFnFYemwiCdsKeriFJv51vRLqmw=", - "version": "60" - }, - "xnu": { - "hash": "sha256-bfFmDfRBSvoWMdQYVstsJRbcq+15lDjVFqk+0XYWpy8=", - "version": "8020.101.4" - } - }, - "13.3": { - "CarbonHeaders": { - "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", - "version": "18.1" - }, - "CommonCrypto": { - "hash": "sha256-tftAQbs5xIOc5VZLVAKXAUvle9WO/i33/pQ3D64l/yI=", - "version": "600016.100.4" - }, - "IOAudioFamily": { - "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=", - "version": "440.2" - }, - "IOBDStorageFamily": { - "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=", - "version": "22" - }, - "IOCDStorageFamily": { - "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=", - "version": "61" - }, - "IODVDStorageFamily": { - "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=", - "version": "43" - }, - "IOFWDVComponents": { - "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=", - "version": "208" - }, - "IOFireWireAVC": { - "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=", - "version": "431" - }, - "IOFireWireFamily": { - "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=", - "version": "487" - }, - "IOFireWireSBP2": { - "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=", - "version": "445" - }, - "IOFireWireSerialBusProtocolTransport": { - "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=", - "version": "260" - }, - "IOGraphics": { - "hash": "sha256-KubCz8DNwf1WuF7LrtARM2VJugFDP0wfHoUhnIz/faQ=", - "version": "596.1" - }, - "IOHIDFamily": { - "hash": "sha256-7UFMBdF5k9aVFVuoL2riozzKmn8uOt87Aitt8j6XkN8=", - "version": "1915.100.21" - }, - "IOKitUser": { - "hash": "sha256-hgFRHPAuoqSf6aRUBUyfU2y2+dBUA34DKwLHLwhPNms=", - "version": "2022.100.19" - }, - "IONetworkingFamily": { - "hash": "sha256-SwZvXLSB9cMHssZU4dCogGVoV64qYdGN1CGYV3FZ6tk=", - "version": "170" - }, - "IOSerialFamily": { - "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=", - "version": "93" - }, - "IOStorageFamily": { - "hash": "sha256-g4oCrxM5VtHm8h1M+zM81Ar1LsaaiJZLej5fT8EHPG4=", - "version": "302.100.1" - }, - "IOUSBFamily": { - "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=", - "version": "630.4.5" - }, - "Libc": { - "hash": "sha256-dqbdWtBuaRq3IHnSUPH2aj8h/X4zCwUNSOeSdwfKvN8=", - "version": "1534.100.14" - }, - "Libinfo": { - "hash": "sha256-iUyndeUXx7FFZ/jgJ6jRwda3IChOaMs4dZW/ISuAJ1E=", - "version": "564.101.1" - }, - "Libm": { - "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=", - "version": "2026" - }, - "Libnotify": { - "hash": "sha256-7AwTfogvCUMdoabxf413ENWXtFTOM6AUldccoPQ89sU=", - "version": "312" - }, - "Librpcsvc": { - "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=", - "version": "31" - }, - "Libsystem": { - "hash": "sha256-IIksf0yCg3GdME3HofYzD1MRC+ofsPhHcxddmNd7V2M=", - "version": "1319.100.3" - }, - "OpenDirectory": { - "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=", - "version": "146" - }, - "Security": { - "hash": "sha256-lPq58QIx+H9DouTXAUJSMf1X7dj9V6xu3c8VWr2R1IY=", - "version": "60420.101.4" - }, - "architecture": { - "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=", - "version": "282" - }, - "configd": { - "hash": "sha256-M/fRAnUw2wObhCQp9a6zQbCGhACCQHpju4/1+KGlkjg=", - "version": "1241.100.11" - }, - "copyfile": { - "hash": "sha256-te3WcQudrXPqnTM1s/AtsTdu7VIXf5dIASy+IGnIxv0=", - "version": "191.100.3" - }, - "dtrace": { - "hash": "sha256-7jAG66hG9qmqpRbECazMD1Pyi53CWTOGNnZca1NpcxE=", - "version": "397" - }, - "dyld": { - "hash": "sha256-OkDOTV86EB44LxsqwTD4ZncMcr7iqSHXxw+6U+AP7oU=", - "version": "1066.8" - }, - "eap8021x": { - "hash": "sha256-FMG+IGVPpcwrRe2/OKpFycrY/EFPZkge2vX61NgorGg=", - "version": "336.100.6" - }, - "hfs": { - "hash": "sha256-Au5VDrYRBerI1I6rjC0lVDwB5IBwGARrAdcTI4M+Fx0=", - "version": "627.100.6" - }, - "launchd": { - "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=", - "version": "842.1.4" - }, - "libclosure": { - "hash": "sha256-V1tpp/XG6baETunJt029rI6wp6moYSnFprt+bNGaQ40=", - "version": "87" - }, - "libdispatch": { - "hash": "sha256-d1VObN11bNdtNJlZQqp2y8yP4lit5Wbj+4/aN3StsPc=", - "version": "1415.100.11" - }, - "libmalloc": { - "hash": "sha256-jcR1AO/chcZzfAvELkC+U3q9tzxqPdwgLcHrnkQmN4M=", - "version": "425.100.7" - }, - "libplatform": { - "hash": "sha256-+BB23YGGT0hA326Dh+3k2UvAqBdEJ84A6yGA/ccrihg=", - "version": "292.100.1" - }, - "libpthread": { - "hash": "sha256-/l17vMWhfAs0YhIHi+l84vGVxpGFOzocvxxii7B+WUk=", - "version": "514.100.2" - }, - "mDNSResponder": { - "hash": "sha256-M4yfQsdlKwes5M2QOEEfjv7ldSVZw7oGXLISaDcObjs=", - "version": "1807.101.2" - }, - "objc4": { - "hash": "sha256-qOV9YfP59WP8Izp+IvM/aiYTW8fCoq21uxU64OcIHk8=", - "version": "876" - }, - "ppp": { - "hash": "sha256-Sg5c5qOSk5TaS4pgXZ+eAy/iuGBa1oFML0dkj463DcE=", - "version": "1010" - }, - "removefile": { - "hash": "sha256-oQorWHlJ0ctekCTUsLXHko8k1aCKBJ00A2FHkRd4B3E=", - "version": "68" - }, - "xnu": { - "hash": "sha256-w9/lDZ/E54YzYQkOWptNpX5GomgI/fvZLAy7NY3O+IQ=", - "version": "8796.101.5" - } - }, "14.4": { "CarbonHeaders": { "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=", diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 6c0b1ecabf46..75fd132b8b2b 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -1,28 +1,4 @@ { - "11": { - "urls": [ - "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg" - ], - "version": "11.3", - "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg=" - }, - "12": { - "urls": [ - "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg" - ], - "version": "12.3", - "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8=" - }, - "13": { - "urls": [ - "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg" - ], - "version": "13.3", - "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4=" - }, "14": { "urls": [ "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg", From d37154c920e397639525853c7b288750abe1fd53 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 21 Apr 2025 18:51:52 -0400 Subject: [PATCH 0192/2279] apple-sdk_{11,12,13}: add to aliases.nix --- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b9996ca8dfe..ccbc90bfd001 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -464,6 +464,9 @@ mapAliases { apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27 apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27 apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27 + apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10 + apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10 + apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10 appthreat-depscan = dep-scan; # Added 2024-04-10 arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12 arb = throw "'arb' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84c6e70421d1..086a2741c4a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8908,9 +8908,6 @@ with pkgs; ### DEVELOPMENT / LIBRARIES / DARWIN SDKS - apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; }; - apple-sdk_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "12"; }; - apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; }; apple-sdk_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "14"; }; apple-sdk_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "15"; }; From 236ccf8c358ec7cceb0f6427047a012ac4482d66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 10 Oct 2025 01:46:48 +0200 Subject: [PATCH 0193/2279] python312: 3.12.11 -> 3.12.12 https://docs.python.org/release/3.12.12/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 1801d321b679..0bffe58e708a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -71,10 +71,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "11"; + patch = "12"; suffix = ""; }; - hash = "sha256-wwuyS38emhmxG1WlRkNPdOc5u0wnGj46gP9DgNSfets="; + hash = "sha256-+4WhNBSwKMSboYu9UjwtBVowtWsYuSzkVOosUe3GVsQ="; inherit passthruFun; }; From 31b743d9652d5bad2708523a96179b80d575ede1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 13:33:14 +0200 Subject: [PATCH 0194/2279] python3Packages.numpy: Disable borked test on ppc64 --- pkgs/development/python-modules/numpy/2.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 397b071909e8..7cee327a222a 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -19,6 +19,7 @@ # native dependencies blas, + coreutils, lapack, # Reverse dependency @@ -81,6 +82,10 @@ buildPythonPackage rec { # remove needless reference to full Python path stored in built wheel substituteInPlace numpy/meson.build \ --replace-fail 'py.full_path()' "'python'" + + # Test_POWER_Features::test_features - FileNotFoundError: [Errno 2] No such file or directory: '/bin/true' + substituteInPlace numpy/_core/tests/test_cpu_features.py \ + --replace-fail '/bin/true' '${lib.getExe' coreutils "true"}' ''; build-system = [ @@ -159,6 +164,10 @@ buildPythonPackage rec { # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh') "test_loss_of_precision" ] + ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [ + # https://github.com/numpy/numpy/issues/29918 + "test_sq_cases" + ] ++ lib.optionals (stdenv.hostPlatform ? gcc.arch) [ # remove if https://github.com/numpy/numpy/issues/27460 is resolved "test_validate_transcendentals" From 94830c05ed6f5104bd32f96186ab9a347cbc3c0a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 10 Oct 2025 14:14:26 +0200 Subject: [PATCH 0195/2279] openssh: 10.1p1 -> 10.2p1 Changes: https://www.openssh.com/releasenotes.html#10.2p1 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 046a4db7a55c..39c6ae31133f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -25,11 +25,11 @@ in { openssh = common rec { pname = "openssh"; - version = "10.1p1"; + version = "10.2p1"; src = fetchurl { url = urlFor version; - hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g="; + hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI="; }; extraPatches = [ From f87f0618cbce5eb2d32107f870b806d3105b97de Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 10 Oct 2025 21:33:30 +0200 Subject: [PATCH 0196/2279] fontforge: 20230101 -> 20251009 https://github.com/fontforge/fontforge/releases/tag/20251009 --- pkgs/by-name/fo/fontforge/package.nix | 41 ++++----------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix index c6c3199bb318..610d0cc8771b 100644 --- a/pkgs/by-name/fo/fontforge/package.nix +++ b/pkgs/by-name/fo/fontforge/package.nix @@ -2,7 +2,6 @@ stdenv, fetchFromGitHub, lib, - fetchpatch, replaceVars, cmake, pkg-config, @@ -34,46 +33,18 @@ assert withGTK -> withGUI; let py = python3.withPackages (ps: with ps; [ setuptools ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fontforge"; - version = "20230101"; + version = "20251009"; src = fetchFromGitHub { owner = "fontforge"; repo = "fontforge"; - rev = version; - sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0="; + tag = finalAttrs.version; + hash = "sha256-tlpdd+x1mA+HeLXpy5LotNC6sabxI6U7S+m/qOn1jwc="; }; patches = [ - (fetchpatch { - name = "CVE-2024-25081.CVE-2024-25082.patch"; - url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch"; - hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU="; - }) - - # Replace distutils use in the build script - (fetchpatch { - name = "replace-distutils.patch"; - url = "https://github.com/fontforge/fontforge/commit/8c75293e924602ed09a9481b0eeb67ba6c623a81.patch"; - includes = [ "pyhook/CMakeLists.txt" ]; - hash = "sha256-3CEwC8vygmCztKRmeD45aZIqyoj8yk5CLwxX2SGP7z4="; - }) - - # Fixes translation compatibility with gettext 0.22 - (fetchpatch { - name = "update-translation-compatibility.patch"; - url = "https://github.com/fontforge/fontforge/commit/642d8a3db6d4bc0e70b429622fdf01ecb09c4c10.patch"; - hash = "sha256-uO9uEhB64hkVa6O2tJKE8BLFR96m27d8NEN9UikNcvg="; - }) - - # Updates to new Python initialization API - (fetchpatch { - name = "modern-python-initialization-api.patch"; - url = "https://github.com/fontforge/fontforge/commit/2f2ba54c15c5565acbde04eb6608868cbc871e01.patch"; - hash = "sha256-qF4DqFpiZDbULi9+POPM73HF6pEot8BAFSVaVCNQrMU="; - }) - # Provide a Nix-controlled location for the initial `sys.path` entry. (replaceVars ./set-python-sys-path.patch { python = "${py}/${py.sitePackages}"; }) ]; @@ -128,7 +99,7 @@ stdenv.mkDerivation rec { preConfigure = '' # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19) - export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) + export SOURCE_DATE_EPOCH=$(date -d ${finalAttrs.version} +%s) ''; meta = { @@ -141,4 +112,4 @@ stdenv.mkDerivation rec { ulysseszhan ]; }; -} +}) From 4a6e2ebd8a5055048bfb02d991975f2393a3b6c6 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 7 Oct 2025 21:49:10 -0700 Subject: [PATCH 0197/2279] mkDerivation: warn for obsolete pie hardening flag usage --- pkgs/stdenv/generic/make-derivation.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 0af13170c261..cd4b76fcfd5b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -151,7 +151,6 @@ let "nostrictaliasing" "pacret" "pic" - "pie" "relro" "stackprotector" "glibcxxassertions" @@ -439,7 +438,7 @@ let else subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable); # hardeningDisable additionally supports "all". - erroneousHardeningFlags = subtractLists knownHardeningFlags ( + erroneousHardeningFlags = subtractLists (knownHardeningFlags ++ [ "pie" ]) ( hardeningEnable ++ remove "all" hardeningDisable ); @@ -637,7 +636,9 @@ let else null } = - builtins.concatStringsSep " " enabledHardeningOptions; + lib.warnIf ((builtins.elem "pie" hardeningEnable) || (builtins.elem "pie" hardeningDisable)) + "The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used. PIE can be disabled with the -no-pie compiler flag, but this is usually not necessary as most build systems pass this if needed. Usage of the 'pie' hardening flag will become an error in future." + (builtins.concatStringsSep " " enabledHardeningOptions); # TODO: remove platform condition # Enabling this check could be a breaking change as it requires to edit nix.conf From f5ec4b277fd5f86bfcbcd91b47cce013e2f0bcf6 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Tue, 23 Sep 2025 16:21:51 -0700 Subject: [PATCH 0198/2279] python3Packages.panzi-json-logic: init at 1.0.1 Apply suggestion from @uninsane Co-authored-by: Colin --- .../panzi-json-logic/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/panzi-json-logic/default.nix diff --git a/pkgs/development/python-modules/panzi-json-logic/default.nix b/pkgs/development/python-modules/panzi-json-logic/default.nix new file mode 100644 index 000000000000..292c42f14a1d --- /dev/null +++ b/pkgs/development/python-modules/panzi-json-logic/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + unittestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "panzi-json-logic"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "panzi"; + repo = "panzi-json-logic"; + tag = "v${version}"; + hash = "sha256-P34+7SckMtiCTZbdKsjztNam+/HWtcVQEnGPMoPBw3g="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "json_logic" ]; + + meta = { + description = "Pure Python 3 JsonLogic and CertLogic implementation."; + homepage = "https://github.com/panzi/panzi-json-logic"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thanegill ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cf17237c5b1..84a5c26d774b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11407,6 +11407,8 @@ self: super: with self; { panphon = callPackage ../development/python-modules/panphon { }; + panzi-json-logic = callPackage ../development/python-modules/panzi-json-logic { }; + paperbush = callPackage ../development/python-modules/paperbush { }; papermill = callPackage ../development/python-modules/papermill { }; From dcbdd66331ba18e0354183ef8df554ee3ed819d0 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Tue, 23 Sep 2025 16:24:45 -0700 Subject: [PATCH 0199/2279] python3Packages.price-parser: init at 0.4.0 Apply suggestion from @uninsane Co-authored-by: Colin --- .../python-modules/price-parser/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/price-parser/default.nix diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix new file mode 100644 index 000000000000..c2baaced3afb --- /dev/null +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + pytest-cov, + attrs, +}: + +buildPythonPackage rec { + pname = "price-parser"; + version = "0.4.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "scrapinghub"; + repo = "price-parser"; + tag = version; + hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0="; + }; + + dependencies = [ attrs ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "price_parser" ]; + + meta = { + description = "Extract price amount and currency symbol from a raw text string"; + homepage = "https://github.com/scrapinghub/price-parser"; + changelog = "https://github.com/scrapinghub/price-parser/blob/${version}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thanegill ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84a5c26d774b..f03edcc57ae6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12151,6 +12151,8 @@ self: super: with self; { prettytable = callPackage ../development/python-modules/prettytable { }; + price-parser = callPackage ../development/python-modules/price-parser { }; + primecountpy = callPackage ../development/python-modules/primecountpy { }; primepy = callPackage ../development/python-modules/primepy { }; From 682d91c1cf0a4032cec5853d754618e4742ebde0 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Tue, 23 Sep 2025 16:26:13 -0700 Subject: [PATCH 0200/2279] python3packages.pyppeteer-ng: init at 2.0.0rc10 Apply suggestion from @uninsane Co-authored-by: Colin --- .../python-modules/pyppeteer-ng/default.nix | 160 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 162 insertions(+) create mode 100644 pkgs/development/python-modules/pyppeteer-ng/default.nix diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix new file mode 100644 index 000000000000..b4674d023e26 --- /dev/null +++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix @@ -0,0 +1,160 @@ +{ + lib, + aenum, + aiohttp, + appdirs, + buildPythonPackage, + certifi, + diff-match-patch, + fetchFromGitHub, + flake8, + importlib-metadata, + livereload, + mypy, + networkx, + ordered-set, + pillow, + pixelmatch, + poetry-core, + pre-commit, + pydocstyle, + pyee, + pylint, + pytest, + pytest-cov, + pytest-timeout, + pytest-xdist, + pytestCheckHook, + pythonOlder, + readme-renderer, + sphinx, + sphinxcontrib-asyncio, + syncer, + tox, + tqdm, + typing-extensions, + typing-inspect, + urllib3, + websockets, +}: + +buildPythonPackage rec { + pname = "pyppeteer-ng"; + version = "2.0.0rc10"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dgtlmoon"; + repo = "pyppeteer-ng"; + tag = version; + hash = "sha256-NpxjKsh12pr/MCZ4gfoaa+3jTYyvQzHgSno1+rw2Wk0="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'aenum = "^2.2.3"' 'aenum = "*"' \ + --replace-fail 'typing_inspect = { version ="^0.5.0"' 'typing_inspect = { version ="*"' \ + --replace-fail 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \ + --replace-fail 'websockets = "^10.1"' 'websockets = "*"' \ + --replace-fail 'requires = ["poetry>=0.12"]' 'requires = ["poetry-core"]' \ + --replace-fail 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' + + substituteInPlace tests/conftest.py \ + --replace-fail '_port = get_free_port()' "" + + substituteInPlace tests/utils/server.py \ + --replace-fail '_Middleware' '_Middlewares' \ + ''; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aenum + appdirs + certifi + ordered-set + pillow + pyee + tqdm + typing-inspect + typing-extensions + urllib3 + websockets + ]; + + nativeCheckInputs = [ + aiohttp + diff-match-patch + flake8 + livereload + mypy + networkx + pixelmatch + pre-commit + pydocstyle + pylint + pytest + pytest-cov + pytest-timeout + pytest-xdist + readme-renderer + sphinx + sphinxcontrib-asyncio + syncer + tox + pytestCheckHook + ]; + + disabledTestPaths = [ + # Requires network access + "tests/test_abnormal_crash.py" + "tests/test_accessibility.py" + "tests/test_browser.py" + "tests/test_browser_context.py" + "tests/test_browser_fetcher.py" + "tests/test_click.py" + "tests/test_connection.py" + "tests/test_coverage.py" + "tests/test_dialog.py" + "tests/test_element_handle.py" + "tests/test_emulation.py" + "tests/test_execution_context.py" + "tests/test_frame.py" + "tests/test_input.py" + "tests/test_jshandle.py" + "tests/test_keyboard.py" + "tests/test_launcher.py" + "tests/test_mouse.py" + "tests/test_navigation.py" + "tests/test_page.py" + "tests/test_pyppeteer.py" + "tests/test_queryselector.py" + "tests/test_requestinterception.py" + "tests/test_screenshot.py" + "tests/test_target.py" + "tests/test_touchscreen.py" + "tests/test_tracing.py" + "tests/test_worker.py" + + # Failing + "pyee12-compat/connection_stability_test.py" + "pyee12-compat/pyee_compatibility_test.py" + "pyee12-compat/real_websocket_test.py" + "pyee12-compat/simple_connection_test.py" + "pyee12-compat/simplified_test.py" + "tests/test_misc.py" + ]; + + pythonImportsCheck = [ "pyppeteer" ]; + + meta = with lib; { + description = "Headless chrome/chromium automation library (unofficial port of puppeteer)"; + mainProgram = "pyppeteer-install"; + homepage = "https://github.com/dgtlmoon/pyppeteer-ng"; + changelog = "https://github.com/dgtlmoon/pyppeteer-ng/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ thanegill ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f03edcc57ae6..50b85227dcb8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13822,6 +13822,8 @@ self: super: with self; { pyppeteer = callPackage ../development/python-modules/pyppeteer { }; + pyppeteer-ng = callPackage ../development/python-modules/pyppeteer-ng { }; + pyppmd = callPackage ../development/python-modules/pyppmd { }; pyprecice = callPackage ../development/python-modules/pyprecice { From 8bef5b5978e91f64594530bed7cbe60525804d87 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Tue, 23 Sep 2025 16:30:28 -0700 Subject: [PATCH 0201/2279] changedetection-io: 0.49.4 -> 0.50.14 Apply suggestion from @uninsane Co-authored-by: Colin --- .../by-name/ch/changedetection-io/package.nix | 57 ++++++++++++------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index 918a95f10788..8148e58cef54 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -2,18 +2,19 @@ lib, fetchFromGitHub, python3, + gitUpdater, }: python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.49.4"; + version = "0.50.14"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; tag = version; - hash = "sha256-EmtJ8XXPb75W4VPj4Si9fdzVLDKVfm+8P6UZZlMpMdI="; + hash = "sha256-zxCb2mmCicjDxilj/l8HabJm2FsFQB0yLNaRiIDltwI="; }; pythonRelaxDeps = true; @@ -22,14 +23,13 @@ python3.pkgs.buildPythonApplication rec { with python3.pkgs; [ apprise - beautifulsoup4 - brotli babel + beautifulsoup4 + blinker + brotli chardet cryptography - dnspython elementpath - eventlet extruct feedgen flask @@ -39,45 +39,62 @@ python3.pkgs.buildPythonApplication rec { flask-login flask-paginate flask-restful + flask-socketio flask-wtf + gevent greenlet inscriptis + janus jinja2 jinja2-time - jsonpath-ng jq + jsonpath-ng + jsonschema + levenshtein loguru lxml + openapi-core + openpyxl paho-mqtt - playwright - pyee - pyppeteer + panzi-json-logic + pluggy + price-parser + psutil + pyppeteer-ng + # pyppeteerstealth + python-engineio + python-magic + python-socketio pytz + referencing requests + requests-file selenium - setuptools timeago - urllib3 + tzdata validators werkzeug wtforms ] - ++ requests.optional-dependencies.socks; + ++ requests.optional-dependencies.socks + ++ openapi-core.optional-dependencies.flask; # tests can currently not be run in one pytest invocation and without docker doCheck = false; - nativeCheckInputs = with python3.pkgs; [ - pytest-flask - pytestCheckHook - ]; + pythonImportsCheck = [ "changedetectionio" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Self-hosted free open source website change detection tracking, monitoring and notification service"; homepage = "https://github.com/dgtlmoon/changedetection.io"; changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ mikaelfangel ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + mikaelfangel + thanegill + ]; mainProgram = "changedetection.io"; }; } From e92426ff58ba3dd86a4c530bfd9588783000c3d9 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 10 Oct 2025 18:44:39 -0400 Subject: [PATCH 0202/2279] libinput: make wacom support optional --- pkgs/development/libraries/libinput/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1a00fab8d27b..de543cf9a7c4 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -9,6 +9,7 @@ libevdev, mtdev, udev, + wacomSupport ? true, libwacom, documentationSupport ? false, doxygen, @@ -85,7 +86,6 @@ stdenv.mkDerivation rec { buildInputs = [ libevdev mtdev - libwacom (python3.withPackages ( pp: with pp; [ pp.libevdev # already in scope @@ -95,6 +95,9 @@ stdenv.mkDerivation rec { ] )) ] + ++ lib.optionals wacomSupport [ + libwacom + ] ++ lib.optionals eventGUISupport [ # GUI event viewer cairo @@ -116,6 +119,7 @@ stdenv.mkDerivation rec { (mkFlag documentationSupport "documentation") (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") + (mkFlag wacomSupport "libwacom") "--sysconfdir=/etc" "--libexecdir=${placeholder "bin"}/libexec" ]; From 46e42dc7ee38554d2f4047c4ae7108a2c7ab1a4b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 11 Oct 2025 13:46:37 +0800 Subject: [PATCH 0203/2279] jj-pre-push: remove uv patch --- pkgs/by-name/jj/jj-pre-push/package.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index 1216e64477a3..1d100e6b46a3 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -17,15 +17,6 @@ python3Packages.buildPythonApplication rec { hash = "sha256-SdGnhHk8MelX6hqKQmZnQYXBJ5VpjPBe+PWUxaGsxC4="; }; - patches = [ - # https://github.com/acarapetis/jj-pre-push/pull/2 - (fetchpatch2 { - name = "uv-build.patch"; - url = "https://github.com/Prince213/jj-pre-push/commit/aa2d917ec9560318178fbc1040281228db7b7ec1.patch?full_index=1"; - hash = "sha256-uNqOO0yVHShcXxYMPFcPCDM5YlL4IcmpUAfClmDlJ4Q="; - }) - ]; - build-system = [ python3Packages.uv-build ]; From 88f245ca0ce03dc5477a2b7eee2abbe542c0d521 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 11 Oct 2025 13:51:24 +0800 Subject: [PATCH 0204/2279] python3Packages.ffmpy: remove uv patch --- pkgs/development/python-modules/ffmpy/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index d32f91464da2..9703bc808f45 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -25,14 +25,6 @@ buildPythonPackage rec { hash = "sha256-XFC7f8wdIsySIn4qXqo61GmRcaF0QciLYN5lwhzlIuA="; }; - patches = [ - (fetchpatch2 { - name = "uv-build.patch"; - url = "https://github.com/Ch00k/ffmpy/commit/11a053d11939b488ce7ac362589372904218a798.patch?full_index=1"; - hash = "sha256-78D64uSX03zp2VM7h3hg493Vtow8fh+tQWXkzVgokDA="; - }) - ]; - postPatch = # Default to store ffmpeg. '' From ebd7ce5ea406e351f0a85a0dc4e10587b28e2dc7 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 11 Oct 2025 13:42:53 +0800 Subject: [PATCH 0205/2279] uv: 0.9.0 -> 0.9.2 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 230079fc6aba..878b11a3735a 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-YDpaDArhw0QmJ7fmoNZAewOQx+cMnxW+xhdCL3zQ9GI="; + hash = "sha256-qT5A3nzYkbzjqv8rk93zAcBlhYsI5SkMUYavsxp5QJg="; }; - cargoHash = "sha256-eHkEUG2Er6qN8JcUaEyJSec6L9cMI4EebNrdv4UJIUk="; + cargoHash = "sha256-3IMOAYRxyMPSJSWnZJ344jHC7nS6TE2CouCr4eTYeaw="; buildInputs = [ rust-jemalloc-sys From dfe2466ce3c0fc7535e45d9124ff79c42a25f971 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Oct 2025 22:21:09 +0000 Subject: [PATCH 0206/2279] termsvg: 0.9.3 -> 0.10.0 --- pkgs/by-name/te/termsvg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix index 7e984c2c5406..7a14d7112c58 100644 --- a/pkgs/by-name/te/termsvg/package.nix +++ b/pkgs/by-name/te/termsvg/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "termsvg"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mrmarble"; repo = "termsvg"; rev = "v${version}"; - hash = "sha256-ejrg1UywPQDCeaymkGzU+xZoPXME6XEP/SBe3Yxf4YU="; + hash = "sha256-tNvr8ptMortP7iI6GwT4AGbqTvNFposca8I2JribGnk="; }; vendorHash = "sha256-BoXRLWhQmfvMIN658MiXGCFMbnvuXfv/H/jCE6h4aWk="; From c98e04fffc4702cfaf90415b8592fcdaa10e7692 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 00:21:47 +0200 Subject: [PATCH 0207/2279] python313Packages.pyinstaller-versionfile: fix build --- .../python-modules/pyinstaller-versionfile/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix index 2962ea7b3004..295894446e06 100644 --- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix +++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix @@ -20,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-UNrXP5strO6LIkIM3etBo1+Vm+1lR5wF0VfKtZYRoYc="; }; + preBuild = '' + touch requirements.txt + ''; + propagatedBuildInputs = [ packaging jinja2 From c28ce32e9829daa6e00f0bf8f0d88b0139ccb7d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 01:09:00 +0000 Subject: [PATCH 0208/2279] publicsuffix-list: 0-unstable-2025-08-28 -> 0-unstable-2025-10-08 --- pkgs/by-name/pu/publicsuffix-list/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 491b7adaa8ed..1edfa926dd47 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2025-08-28"; + version = "0-unstable-2025-10-08"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "4103956c4300902436b03d7da482536e757b3601"; - hash = "sha256-QIjDAbPfbdV+V4RV6v8/85YTxiRbXLBlulObXpkPmxQ="; + rev = "ee7dec4a99602baaf51879dd8469b6642881a494"; + hash = "sha256-IlR3dICad9EZeizI3V0A1YCQZiV/xg2GxtmTLG4EASU="; }; dontBuild = true; From 7cc9df45895e99ab058f5baa381f89c58dfef376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Oct 2025 21:56:39 -0700 Subject: [PATCH 0209/2279] python3Packages.libcst: 1.8.4 -> 1.8.5 Diff: https://github.com/Instagram/LibCST/compare/v1.8.4...v1.8.5 Changelog: https://github.com/Instagram/LibCST/blob/v1.8.5/CHANGELOG.md --- pkgs/development/python-modules/libcst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index c89cdb8daba8..7f6e9fc13ef1 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "libcst"; - version = "1.8.4"; + version = "1.8.5"; pyproject = true; src = fetchFromGitHub { owner = "Instagram"; repo = "LibCST"; tag = "v${version}"; - hash = "sha256-OSLaEIfFM/uU3GkcVpvbeesqzr+qXa/BgkDEan7Ybkg="; + hash = "sha256-4FFkxy8UrLOXuZwvGvGQNZGtY27yLtiTWAzTbxLm3Eo="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -39,7 +39,7 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-F/TaKZpynaCwXU0YvvuTEh5/pvMOpKur7wMSE7dtgNo="; + hash = "sha256-eFdcyqzH7meF4kIVT2qhbKVxEB6KtZVEONMgYw4sBew="; }; cargoRoot = "native"; From a2e8a03430a7ec92555aa61716e243ad00fa49bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Oct 2025 21:58:18 -0700 Subject: [PATCH 0210/2279] python3Packages.multidict: 6.6.4 -> 6.7.0 Diff: https://github.com/aio-libs/multidict/compare/v6.6.4...v6.7.0 Changelog: https://github.com/aio-libs/multidict/blob/v6.7.0/CHANGES.rst --- .../python-modules/multidict/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index a35bbdbee805..286c7395781e 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "multidict"; - version = "6.6.4"; + version = "6.7.0"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "multidict"; tag = "v${version}"; - hash = "sha256-Ewxwz+0Y8pXJpHobLxrV7cuA9fsAaawWmW9XoEg7dxU="; + hash = "sha256-NEiUXHwY7bas7+Ddf9hdR6m/N+wbRG/NguoMROIWjeU="; }; postPatch = '' @@ -37,11 +37,9 @@ buildPythonPackage rec { typing-extensions ]; - env = - { } - // lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument"; - }; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument"; + }; nativeCheckInputs = [ objgraph @@ -58,11 +56,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "multidict" ]; - meta = with lib; { + meta = { changelog = "https://github.com/aio-libs/multidict/blob/${src.tag}/CHANGES.rst"; description = "Multidict implementation"; homepage = "https://github.com/aio-libs/multidict/"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From 2c02a8265792a2171a7148efcf6fd8090d69cd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Oct 2025 22:10:16 -0700 Subject: [PATCH 0211/2279] python3Packages.pytest-mock: 3.15.0 -> 3.15.1 Diff: https://github.com/pytest-dev/pytest-mock/compare/v3.15.0...v3.15.1 Changelog: https://github.com/pytest-dev/pytest-mock/blob/v3.15.1/CHANGELOG.rst --- .../development/python-modules/pytest-mock/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 1dc9f25ea63f..3c03379fceb4 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.15.0"; + version = "3.15.1"; pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-mock"; tag = "v${version}"; - hash = "sha256-a9Mu0FfU8rTbMeA1YoM/Kb5R2IUO8FyzQfscBVuBFfo="; + hash = "sha256-9h5/cssWs4F0LKnFLjWDsEjB2AYczLvnSjiUdsaEcBQ="; }; build-system = [ @@ -35,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_mock" ]; - meta = with lib; { + meta = { description = "Thin wrapper around the mock package for easier use with pytest"; homepage = "https://github.com/pytest-dev/pytest-mock"; changelog = "https://github.com/pytest-dev/pytest-mock/blob/${src.tag}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From 59b82cff97d66225e18028251311a292a7ec7a28 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 12 Oct 2025 06:50:45 +0100 Subject: [PATCH 0212/2279] dnsmasq: enable parallel building Before the change `dnsmasq` builds 10 seconds on my machine. After the change it builds 2.5 seconds. --- pkgs/by-name/dn/dnsmasq/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix index b5f4872b0cdb..3b7699cf87c0 100644 --- a/pkgs/by-name/dn/dnsmasq/package.nix +++ b/pkgs/by-name/dn/dnsmasq/package.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ]; + enableParallelBuilding = true; + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' make -C contrib/lease-tools ''; From 578e2c18d3cc9ddcd0c01cdd8672793841666f21 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 12 Oct 2025 16:27:28 +0800 Subject: [PATCH 0213/2279] python3Packages.django-bootstrap3: update uv-build.patch --- pkgs/development/python-modules/django-bootstrap3/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 1edf6d8332f3..cc9d493ad8f0 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -28,10 +28,9 @@ buildPythonPackage rec { }; patches = [ - # https://github.com/zostera/django-bootstrap3/pull/1085 (fetchpatch2 { name = "uv-build.patch"; - url = "https://github.com/Prince213/django-bootstrap3/commit/d3285ad9c3de87aa763bb49b9666baed514f7c87.patch?full_index=1"; + url = "https://github.com/zostera/django-bootstrap3/commit/5e1a86549e9607b8e2a9772a3a839fc81b9ae6c0.patch?full_index=1"; hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw="; }) ]; From 993b5129cc8c4489e23b5830dd984f43239bd061 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 12 Oct 2025 10:48:03 +0100 Subject: [PATCH 0214/2279] maturin: 1.9.5 -> 1.9.6 Changes: https://github.com/PyO3/maturin/releases/tag/v1.9.6 --- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index abb2695d21a1..51d013195197 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-2WiQtNuhuCJfKIoRKNFaX50Jah4nn2aqlAGrRq/+kww="; + hash = "sha256-hMMX59nq9Wusb0XZb8i5/EmQiPL4WopuZX7maycj0J4="; }; - cargoHash = "sha256-lLWQy9f7vQ+8K0gOCcantAf5644v6Y6MDRvaBvJZJKA="; + cargoHash = "sha256-hNFbRtt/sVlEffu7RgXxC1NHzakP8miMyHIV/cf4sfM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv From 72155d28e214de9f7f1cbad4c46be4163720054b Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 11 Oct 2025 20:07:45 +0200 Subject: [PATCH 0215/2279] rust: 1.89.0 -> 1.90.0 --- .../compilers/rust/{1_89.nix => 1_90.nix} | 40 +++++++++---------- pkgs/development/compilers/rust/cargo.nix | 7 ++++ pkgs/development/compilers/rust/rustc.nix | 13 +++++- pkgs/top-level/all-packages.nix | 8 ++-- 4 files changed, 42 insertions(+), 26 deletions(-) rename pkgs/development/compilers/rust/{1_89.nix => 1_90.nix} (53%) diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_90.nix similarity index 53% rename from pkgs/development/compilers/rust/1_89.nix rename to pkgs/development/compilers/rust/1_90.nix index 768d02987ff3..783bbca42051 100644 --- a/pkgs/development/compilers/rust/1_89.nix +++ b/pkgs/development/compilers/rust/1_90.nix @@ -44,8 +44,8 @@ let in import ./default.nix { - rustcVersion = "1.89.0"; - rustcSha256 = "sha256-JXb59EDdmbAVG9KPWaoKxhAtXE8+1O+KgQyN0FBXJQ0="; + rustcVersion = "1.90.0"; + rustcSha256 = "sha256-eZqfnLpO1TUeBxBIvPa1VgdV2QCWSN7zOkB91JYfm34="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -59,29 +59,29 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.89.0"; + bootstrapVersion = "1.90.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "676ef74ce8ce3137ca66e3941b0221516e1713862053d8aa219e91b491417dd9"; - x86_64-unknown-linux-gnu = "542f517d0624cbee516627221482b166bf0ffe5fd560ec32beb778c01f5c99b6"; - x86_64-unknown-linux-musl = "35695721d53d7eb83ce0153be4c399babf5afd8597bed84f3386d9aac2b4b391"; - arm-unknown-linux-gnueabihf = "e618d08b1547c143cfbfc040023914f4a33a4fcf7addff6778d7cfccbd444c5e"; - armv7-unknown-linux-gnueabihf = "09a295d2d6821a404ca3bf5d1163b9642139105618d0583241b05b7dbf6e22dc"; - aarch64-unknown-linux-gnu = "26d6de84ac59da702aa8c2f903e3c344e3259da02e02ce92ad1c735916b29a4a"; - aarch64-unknown-linux-musl = "b5fdcad8289adf94c45727c33773a05acca994b01b333cf7a508f95fa6adc454"; - x86_64-apple-darwin = "8590528cade978ecb5249184112887489c9d77ae846539e3ef4d04214a6d8663"; - aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118"; - powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337"; - powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6"; - riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161"; - s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7"; - loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec"; - loongarch64-unknown-linux-musl = "86e5d8b0f0c868559de3ec2a0902d0e516a710adb845c8904595c54807e821c2"; - x86_64-unknown-freebsd = "4baf0d5a44e64eecc91dc7ab89d8b0a8f8607e1d39b6989767861b34459a0396"; + i686-unknown-linux-gnu = "8f389b9eb1513785f5589816b60b5a7ca3b24c29bedce7ec0d1c2f8c3ccfb0cc"; + x86_64-unknown-linux-gnu = "e453bae1c68d02fe2eae065c5452d5731308164cd154154c6ee442d2fa590685"; + x86_64-unknown-linux-musl = "251c9fe4e3374f2f9f629a7a83238c618e016b1bda1b9de5e8385cb3a6f057fa"; + arm-unknown-linux-gnueabihf = "61f3987f61bf73562f04dcacfee1a2bad8d16d41f7a3f81ad82dd9b9cbc559ce"; + armv7-unknown-linux-gnueabihf = "06cfb7f1bd3ce50480eed73ad9ae4f8f665d154fa4c713bc08541197eecd4ae0"; + aarch64-unknown-linux-gnu = "293f412e3412c3aa3398c78ebbdf898fa08eacad80c85a7332ce1a455504c5fc"; + aarch64-unknown-linux-musl = "b3ac31ca2e1a720709bf4fb678b2a2f98464c55662c516dfffcbdadd95a420c9"; + x86_64-apple-darwin = "3d1d24e1d4bedb421ca1a16060c21f4d803eaefba585c0b5b5d0b1e56692ef4b"; + aarch64-apple-darwin = "a11b52e34f5e80cb25d49f7943ae60e0b069b431727a4c09b2c890ceebee3687"; + powerpc64-unknown-linux-gnu = "39720c905b8a730cfa725b7e201cd238d15c33112bd4c31b168ca6d1cb898cac"; + powerpc64le-unknown-linux-gnu = "4061405099dc0aba379fe7b7a616d320272ef9325114dfa8f106c303f9b5695c"; + riscv64gc-unknown-linux-gnu = "42cc3b3bb008e24a39bd98887c43ef32c2d997f801c86ca47f2119e5e3589fcb"; + s390x-unknown-linux-gnu = "345c9b902ebee656533d2cfba39c1a020e6a41a4a9609f87430ff8a5d680d649"; + loongarch64-unknown-linux-gnu = "1c116041a2bc7ab2697218f99ad8cccbe3d6b63fcbf516cb9d985cb00efcdb09"; + loongarch64-unknown-linux-musl = "0ae18468c7cd3872d1b685cf960426aeb7467629f69eabb497bee6f0fff9cb04"; + x86_64-unknown-freebsd = "6c7ebf6acbe00873680a190152d47aeebe76e237195b974c593a67227123b2ef"; }; - selectRustPackage = pkgs: pkgs.rust_1_89; + selectRustPackage = pkgs: pkgs.rust_1_90; } ( diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 475d61d06d0a..b1302a8f0a36 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -62,6 +62,13 @@ rustPlatform.buildRustPackage.override # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel RUSTC_BOOTSTRAP = 1; + RUSTFLAGS = + if stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu" then + # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker + "-Clinker-features=-lld -Clink-self-contained=-linker" + else + null; + postInstall = '' wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d8f25d52d850..463c0133015f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -97,8 +97,17 @@ stdenv.mkDerivation (finalAttrs: { ++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib" ); - # Increase codegen units to introduce parallelism within the compiler. - RUSTFLAGS = "-Ccodegen-units=10"; + RUSTFLAGS = lib.concatStringsSep " " ( + [ + # Increase codegen units to introduce parallelism within the compiler. + "-Ccodegen-units=10" + ] + ++ lib.optionals (stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu") [ + # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker + "-Clinker-features=-lld" + "-Clink-self-contained=-linker" + ] + ); RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links"; # We need rust to build rust. If we don't provide it, configure will try to download it. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c3c0bff12c8..d04d1d7bed7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5384,15 +5384,15 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_89 = callPackage ../development/compilers/rust/1_89.nix { }; - rust = rust_1_89; + rust_1_90 = callPackage ../development/compilers/rust/1_90.nix { }; + rust = rust_1_90; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_89 = rust_1_89.packages.stable; - rustPackages = rustPackages_1_89; + rustPackages_1_90 = rust_1_90.packages.stable; + rustPackages = rustPackages_1_90; inherit (rustPackages) cargo From 4c63d537b59edf59479ac8153d81ebdf27cd5ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:47:25 -0400 Subject: [PATCH 0216/2279] systemdgenie: 0.99.0 -> 0.99.0-unstable-2025-10-11 --- .../system/systemdgenie/default.nix | 26 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index 0131be7ebc71..ed1a07f1d0a0 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -2,32 +2,34 @@ stdenv, lib, cmake, - extra-cmake-modules, - kxmlgui, fetchFromGitLab, - kdelibs4support, - wrapQtAppsHook, + kdePackages, + pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "systemdgenie"; - version = "0.99.0"; + version = "0.99.0-unstable-2025-10-11"; + src = fetchFromGitLab { domain = "invent.kde.org"; repo = "SystemdGenie"; owner = "system"; - rev = "v${version}"; - hash = "sha256-y+A2OuK1ZooPY5W0SsXEb1aaOAJ2b7QSwiumolmAaR4="; + rev = "dcfd937a711fb124da6c717c51334dbbb430e48e"; + hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE="; }; nativeBuildInputs = [ cmake - extra-cmake-modules - wrapQtAppsHook + pkg-config + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook ]; buildInputs = [ - kxmlgui - kdelibs4support + kdePackages.kirigami-addons + kdePackages.kio + kdePackages.ktexteditor + kdePackages.kxmlgui ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c3c0bff12c8..c79729bb9f3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4096,7 +4096,7 @@ with pkgs; w3m = w3m-batch; }; - systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; + systemdgenie = callPackage ../applications/system/systemdgenie { }; tartube = callPackage ../applications/video/tartube { }; From 7bb2b9073192c0a482fc6715135372130eaaa4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:47:36 -0400 Subject: [PATCH 0217/2279] systemdgenie: enable strictDeps --- pkgs/applications/system/systemdgenie/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index ed1a07f1d0a0..9bfb4711b1ca 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config From 3d892c3d5b815c8d25d6929225efd46e0bb200ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:47:43 -0400 Subject: [PATCH 0218/2279] systemdgenie: clean up meta --- pkgs/applications/system/systemdgenie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index 9bfb4711b1ca..dba5e019fda3 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation { kdePackages.kxmlgui ]; - meta = with lib; { + meta = { description = "Systemd management utility"; mainProgram = "systemdgenie"; homepage = "https://kde.org"; - license = licenses.gpl2; - maintainers = [ maintainers.pasqui23 ]; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.pasqui23 ]; + platforms = lib.platforms.linux; }; } From 3981ba00d0400063c415e6ba1bfe0754e77cca14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 12 Oct 2025 08:52:55 -0400 Subject: [PATCH 0219/2279] systemdgenie: set updateScript --- pkgs/applications/system/systemdgenie/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix index dba5e019fda3..bb4b43072d40 100644 --- a/pkgs/applications/system/systemdgenie/default.nix +++ b/pkgs/applications/system/systemdgenie/default.nix @@ -5,7 +5,9 @@ fetchFromGitLab, kdePackages, pkg-config, + nix-update-script, }: + stdenv.mkDerivation { pname = "systemdgenie"; version = "0.99.0-unstable-2025-10-11"; @@ -34,6 +36,8 @@ stdenv.mkDerivation { kdePackages.kxmlgui ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "Systemd management utility"; mainProgram = "systemdgenie"; From c98b9ab2aa1ff7dfcb3b3853298569a27145ce21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:48:59 -0400 Subject: [PATCH 0220/2279] systemdgenie: migrate to by-name --- .../default.nix => by-name/sy/systemdgenie/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/system/systemdgenie/default.nix => by-name/sy/systemdgenie/package.nix} (100%) diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/by-name/sy/systemdgenie/package.nix similarity index 100% rename from pkgs/applications/system/systemdgenie/default.nix rename to pkgs/by-name/sy/systemdgenie/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c79729bb9f3a..3cd3e1caba9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4096,8 +4096,6 @@ with pkgs; w3m = w3m-batch; }; - systemdgenie = callPackage ../applications/system/systemdgenie { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { From 7d77e5b064481113b9f0091080f355772fef5977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 14:29:59 +0000 Subject: [PATCH 0221/2279] linuxPackages.ecapture: 1.4.2 -> 1.4.3 --- pkgs/by-name/ec/ecapture/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index e9c2d499ea42..7fc676d3bcf9 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -24,13 +24,13 @@ buildGoModule rec { pname = "ecapture"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-1FyZMUII+bPQDmNK1eJkfeoTjdhe/jj2qiooWuNFsNg="; + hash = "sha256-Y/VDK0m+SCUtswPCA+S/U57nHy0Q/rUaPz0R0AWLxxA="; fetchSubmodules = true; }; @@ -122,7 +122,7 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-cN6pCfc9LEItASCoZ4+BU1AOtwMmFaUEzOM/BZ13jcI="; + vendorHash = "sha256-jkc8UdFNPYFwXZoei+IRb7CS06r+U0UvKfPxKeACobM="; passthru.updateScript = nix-update-script { }; From cf8b55260ff708060dbca1a8b0d6b20c8f6895bb Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 12 Oct 2025 16:06:44 +0800 Subject: [PATCH 0222/2279] python3Packages.cryptography{,.vectors}: 46.0.1 -> 46.0.2 --- .../python-modules/cryptography/default.nix | 13 ++++++------- .../python-modules/cryptography/vectors.nix | 9 ++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 11f6406d4238..d9b3a68715ae 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cryptography"; - version = "46.0.1"; # Also update the hash in vectors.nix + version = "46.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pyca"; repo = "cryptography"; tag = version; - hash = "sha256-saTHFKSJa9gjtEp6uGAHsvzFE3yPeck1WGdIE1+9kgs="; + hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -83,7 +83,7 @@ buildPythonPackage rec { vectors = cryptography-vectors; }; - meta = with lib; { + meta = { description = "Package which provides cryptographic recipes and primitives"; longDescription = '' Cryptography includes both high level recipes and low level interfaces to @@ -91,13 +91,12 @@ buildPythonPackage rec { digests, and key derivation functions. ''; homepage = "https://github.com/pyca/cryptography"; - changelog = - "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version; - license = with licenses; [ + changelog = "https://cryptography.io/en/latest/changelog/#v" + lib.replaceString "." "-" version; + license = with lib.licenses; [ asl20 bsd3 psfl ]; - maintainers = with maintainers; [ mdaniels5757 ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 0a9a1a5d5894..0b518419f8a0 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchPypi, cryptography, uv-build, }: @@ -9,14 +8,10 @@ buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package - inherit (cryptography) version; + inherit (cryptography) version src; pyproject = true; - src = fetchPypi { - pname = "cryptography_vectors"; - inherit version; - hash = "sha256-B40Sh84rRdJGtCxs+545Dh96+hdsGZsL1t6p1s6Jou4="; - }; + sourceRoot = "${src.name}/vectors"; build-system = [ uv-build ]; From 793760ff9576f1942ad54540a5d23b9f752f9e74 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 12 Oct 2025 17:46:09 +0800 Subject: [PATCH 0223/2279] python3Packages.cryptography.vectors: fix build with uv_build 0.9.2 --- .../python-modules/cryptography/vectors.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 0b518419f8a0..f8614e08a240 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, cryptography, + fetchpatch2, uv-build, }: @@ -13,6 +14,17 @@ buildPythonPackage rec { sourceRoot = "${src.name}/vectors"; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/449568 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1"; + stripLen = 1; + includes = [ "pyproject.toml" ]; + hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4="; + }) + ]; + build-system = [ uv-build ]; # No tests included From ca3c653d3d4fbc0af35aca29d92ff9c03f65684e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Oct 2025 16:48:49 -0700 Subject: [PATCH 0224/2279] python3Packages.pyperclip: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/pyperclip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 2fe17a982550..6ae8a535b2d2 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.10.0"; + version = "1.11.0"; pname = "pyperclip"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GAyDRrEYaSHHXf0U2QSKa11Gv8SZd4gRlSxt1uscpr4="; + hash = "sha256-JEA1lj5EKFMNnjphAaHvlyCcaCXtqxVnvqwUjMwdsbY="; }; build-system = [ setuptools ]; From 92d171daed85f3195227a9514111ffe2e2068a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Oct 2025 16:51:22 -0700 Subject: [PATCH 0225/2279] python3Packages.pytest-asyncio: 1.1.0 -> 1.2.0 Diff: https://github.com/pytest-dev/pytest-asyncio/compare/v1.1.0...v1.2.0 Changelog: https://github.com/pytest-dev/pytest-asyncio/blob/v1.2.0/docs/reference/changelog.rst --- .../python-modules/pytest-asyncio/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index a251f89fc5de..6d1d22738532 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -7,18 +7,19 @@ pytest, setuptools-scm, backports-asyncio-runner, + typing-extensions, }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "1.1.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "1.2.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-+dLOzMPKI3nawfyZVZZ6hg6OkaEGZBp8oC5VIr7y0es="; + hash = "sha256-27FCV7zgFGe/Q0fkYyh5Z05foVGhbKBRPTH4UK/tW5A="; }; outputs = [ @@ -29,8 +30,12 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; - dependencies = lib.optionals (pythonOlder "3.11") [ + + dependencies = [ backports-asyncio-runner + ] + ++ lib.optionals (pythonOlder "3.13") [ + typing-extensions ]; postInstall = '' From 8aad7ef9ad52bb9b6e958df29c5904d52ec799c9 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 12 Oct 2025 20:02:30 -0400 Subject: [PATCH 0226/2279] Revert "python3Packages.pytest: don't wrap binaries" --- pkgs/development/python-modules/pytest/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index e332672444ea..edd68ff232b8 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -76,9 +76,6 @@ buildPythonPackage rec { ''; doCheck = false; - # FIXME(jade): perhaps this should be the default? - # https://github.com/NixOS/nixpkgs/issues/435069 - dontWrapPythonPrograms = true; passthru.tests.pytest = callPackage ./tests.nix { }; # Remove .pytest_cache when using py.test in a Nix build From 0f8b9bb85c52725477044e4dc1b27b3f2235242d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 12 Oct 2025 17:01:52 -0700 Subject: [PATCH 0227/2279] python3Packages.yarl: 1.21.1 -> 1.22.0 Diff: https://github.com/aio-libs/yarl/compare/v1.21.1...v1.22.0 Changelog: https://github.com/aio-libs/yarl/blob/v1.22.0/CHANGES.rst --- pkgs/development/python-modules/yarl/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 36184650fcb9..8e7387921a2d 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.21.1"; + version = "1.22.0"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "yarl"; tag = "v${version}"; - hash = "sha256-YN2Gn/wokwbBbVcKvqNNJZ8eZKxwwdKbA84kPsx1Dg0="; + hash = "sha256-IkP6AxLT260NN2X2bd7b5LGVGFUjo7eQiuWxvMtcb8g="; }; build-system = [ @@ -58,11 +58,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "yarl" ]; - meta = with lib; { - changelog = "https://github.com/aio-libs/yarl/blob/v${version}/CHANGES.rst"; + meta = { + changelog = "https://github.com/aio-libs/yarl/blob/${src.tag}/CHANGES.rst"; description = "Yet another URL library"; homepage = "https://github.com/aio-libs/yarl"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From bb7964b6828c5c4eb697c7d621509fb40cf52ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Oct 2025 09:14:59 +0200 Subject: [PATCH 0228/2279] Revert "ruby: avoid rebuilding default ruby on linux for now" This reverts commit f0166da268940ec4a78504a83a15b61871eb1552. /cc PR #451386 --- pkgs/development/interpreters/ruby/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 348708f573a0..4b1ccdd4fdfa 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -192,8 +192,7 @@ let # anything and fixes cross compilation. ./dont-refer-to-build-dir.patch ] - # TODO: drop the isClang condition - ++ ops (lib.versionOlder ver.majMin "3.4" && stdenv.cc.isClang) [ + ++ ops (lib.versionOlder ver.majMin "3.4") [ (fetchpatch { name = "ruby-3.3-fix-llvm-21.patch"; url = "https://github.com/ruby/ruby/commit/5a8d7642168f4ea0d9331fded3033c225bbc36c5.patch"; From d5021cf61afa74fe0d159e606832e7f23e289f6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Oct 2025 14:01:36 +0200 Subject: [PATCH 0229/2279] python313Packages.cbor2: 5.6.5 -> 5.7.0 Changelog: https://github.com/agronholm/cbor2/releases/tag/5.7.0 --- pkgs/development/python-modules/cbor2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index a9fd9152666e..1f9ee232ebea 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.6.5"; + version = "5.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-toKCBnfuHbukX32hGJjScg+S4Gvjas7CkIZ9Xr89fgk="; + hash = "sha256-P22EP0200OxQHEZFPCKk++uxq/tbdA4byrNMYVzXQGs="; }; build-system = [ From ec0703a5322587138f9c0fc12146ff14cb1875c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 Oct 2025 14:43:33 +0200 Subject: [PATCH 0230/2279] python313Packages.cbor2: clean-up --- .../python-modules/cbor2/default.nix | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 1f9ee232ebea..698d88e2c5bf 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,18 +2,13 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, - - withCExtensions ? true, - - # build-system - setuptools, - setuptools-scm, - - # tests hypothesis, pytest-cov-stub, pytestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, + withCExtensions ? true, }: buildPythonPackage rec { @@ -21,8 +16,6 @@ buildPythonPackage rec { version = "5.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; hash = "sha256-P22EP0200OxQHEZFPCKk++uxq/tbdA4byrNMYVzXQGs="; @@ -33,8 +26,6 @@ buildPythonPackage rec { setuptools-scm ]; - pythonImportsCheck = [ "cbor2" ]; - nativeCheckInputs = [ hypothesis pytest-cov-stub @@ -49,12 +40,15 @@ buildPythonPackage rec { inherit withCExtensions; }; - meta = with lib; { - changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; + pythonImportsCheck = [ "cbor2" ]; + + meta = { description = "Python CBOR (de)serializer with extensive tag support"; - mainProgram = "cbor2"; + changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; homepage = "https://github.com/agronholm/cbor2"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; + mainProgram = "cbor2"; + }; } From 14488d4051243696786742844af1ebe908c9f36c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 19 Sep 2025 12:07:06 +0200 Subject: [PATCH 0231/2279] compilers/ghc/common-hadrian: remove unused condition Hadrian is only used for GHC 9.6+ anyway. --- pkgs/development/compilers/ghc/common-hadrian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 60224a33d236..670549279e4b 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -208,7 +208,7 @@ extraPrefix = "libraries/unix/"; }) ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + ++ lib.optionals (lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 (fetchpatch { From ac5228c6c02590a0d05afad272e1598385ee9680 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:11:05 +0200 Subject: [PATCH 0232/2279] haskell.compiler.ghc9101: drop Latest 9.10.x minor release is 9.10.2, which is also in Stackage 24.8. Thus, dropping according to the GHC Deprecation Policy. --- pkgs/development/compilers/ghc/9.10.1.nix | 4 -- .../compilers/ghc/common-hadrian.nix | 39 ++++++++----------- pkgs/top-level/haskell-packages.nix | 23 ----------- pkgs/top-level/release-haskell.nix | 4 -- 4 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.10.1.nix diff --git a/pkgs/development/compilers/ghc/9.10.1.nix b/pkgs/development/compilers/ghc/9.10.1.nix deleted file mode 100644 index d1824ce680fd..000000000000 --- a/pkgs/development/compilers/ghc/9.10.1.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.10.1"; - sha256 = "bf386a302d4ee054791ffd51748900f15d71760fd199157922d120cc1f89e2f7"; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 670549279e4b..678bf11a618f 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -185,29 +185,22 @@ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - lib.optionals - ( - # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4 - lib.versionOlder version "9.11" - && !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8") - && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9") - && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.11") - ) - [ - # Determine size of time related types using hsc2hs instead of assuming CLong. - # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 - # Note that in normal situations this shouldn't be the case since nixpkgs - # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). - (fetchpatch { - name = "unix-fix-ctimeval-size-32-bit.patch"; - url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; - sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; - stripLen = 1; - extraPrefix = "libraries/unix/"; - }) - ] + # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1, 9.10.2, 9.8.4 and 9.6.7 + lib.optionals (lib.versionOlder version "9.6.7") [ + # Determine size of time related types using hsc2hs instead of assuming CLong. + # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. + # https://github.com/haskell/ghcup-hs/issues/1107 + # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 + # Note that in normal situations this shouldn't be the case since nixpkgs + # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). + (fetchpatch { + name = "unix-fix-ctimeval-size-32-bit.patch"; + url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; + sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; + stripLen = 1; + extraPrefix = "libraries/unix/"; + }) + ] ++ lib.optionals (lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 827685681415..5190ca26801c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -121,24 +121,6 @@ in inherit buildTargetLlvmPackages llvmPackages; }; ghc98 = compiler.ghc984; - ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { - bootPkgs = - if stdenv.buildPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - bb.packages.ghc967 - else - bb.packages.ghc963Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - inherit buildTargetLlvmPackages llvmPackages; - }; ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { bootPkgs = if stdenv.buildPlatform.isDarwin then @@ -284,11 +266,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; ghc98 = packages.ghc984; - ghc9101 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc9101; - ghc = bh.compiler.ghc9101; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; - }; ghc9102 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9102; ghc = bh.compiler.ghc9102; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 5013bf119de8..b4e1b1b66f20 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -66,7 +66,6 @@ let ghc948 ghc967 ghc984 - ghc9101 ghc9102 ghc9103 # exclude ghc9121 due to severe miscompilation bug @@ -552,14 +551,12 @@ let funcmp = released; git-annex = [ # for 9.10, test that using filepath (instead of filepath-bytestring) works. - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 ]; haskell-language-server = released; hoogle = released; hlint = lib.subtractLists [ - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122 @@ -587,7 +584,6 @@ let compilerNames.ghc967 ]; weeder = lib.subtractLists [ - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122 From 5df6c9a28f1ddcb54ca5f558e0764ab92e782904 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 6 Sep 2025 13:05:05 +0200 Subject: [PATCH 0233/2279] haskell.compiler.ghc963Binary: drop This bootstraps mostly from ghc984Binary, at least for the major platforms. The bootstrap paths for darwin become much shorter. Unfortunately, the bootstrap paths for i686-linux become a bit longer, so it's a trade-off. --- .../compilers/ghc/9.6.3-binary.nix | 467 ------------------ .../compilers/ghc/common-hadrian.nix | 18 +- pkgs/top-level/haskell-packages.nix | 37 +- 3 files changed, 4 insertions(+), 518 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.6.3-binary.nix diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix deleted file mode 100644 index fcfa43f64b24..000000000000 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ /dev/null @@ -1,467 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - gcc, - ncurses5, - ncurses6, - gmp, - libiconv, - numactl, - libffi, - coreutils, - targetPackages, - - # minimal = true; will remove files that aren't strictly necessary for - # regular builds and GHC bootstrapping. - # This is "useful" for staying within hydra's output limits for at least the - # aarch64-linux architecture. - minimal ? false, -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - downloadsUrl = "https://downloads.haskell.org/ghc"; - - # Copy sha256 from https://downloads.haskell.org/~ghc/9.6.3/SHA256SUMS - version = "9.6.3"; - - # Information about available bindists that we use in the build. - # - # # Bindist library checking - # - # The field `archSpecificLibraries` also provides a way for us get notified - # early when the upstream bindist changes its dependencies (e.g. because a - # newer Debian version is used that uses a new `ncurses` version). - # - # Usage: - # - # * You can find the `fileToCheckFor` of libraries by running `readelf -d` - # on the compiler binary (`exePathForLibraryCheck`). - # * To skip library checking for an architecture, - # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specific library, - # set `fileToCheckFor = null`. - ghcBinDists = { - # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) - # nixpkgs uses for the respective system. - defaultLibc = { - i686-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "58be26f8b8f6b5bd8baf5c32abb03e2c4621646b2142fab10e5c7de5af5c50f8"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, - # which link it against `libtinfo.so.5` (ncurses 5). - # Other bindists are linked `libtinfo.so.6` (ncurses 6). - { - nixPackage = ncurses5; - fileToCheckFor = "libtinfo.so.5"; - } - ]; - }; - x86_64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb11-linux.tar.xz"; - sha256 = "c4c0124857265926f1cf22a09d950d7ba989ff94053a4ddf3dcdab5359f4cab7"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libtinfo.so.6"; - } - ]; - }; - aarch64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; - sha256 = "03c389859319f09452081310fc13af7525063ea8930830ef76be2a14b312271e"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libtinfo.so.6"; - } - { - nixPackage = numactl; - fileToCheckFor = null; - } - ]; - }; - x86_64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "dde46118ab8388fb1066312c097123e93b1dcf6ae366e3370f88ea456382c9db"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - }; - aarch64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; - sha256 = "e1cdf458926b2eaf52d2a8287d99a965040ff9051171f5c3b7467049cf0eb213"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - }; - }; - # Binary distributions for the musl libc for the respective system. - musl = { - x86_64-linux = { - variantSuffix = "-musl"; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3_12-linux.tar.xz"; - sha256 = "8f457af0aa40127049c11134c8793f64351a446e87da1f8ec256e1279b5ab61f"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libncursesw.so.6"; - } - ]; - }; - }; - }; - - distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; - - binDistUsed = - ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); - - gmpUsed = - (builtins.head ( - builtins.filter ( - drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "") - ) binDistUsed.archSpecificLibraries - )).nixPackage; - - libPath = lib.makeLibraryPath ( - # Add arch-specific libraries. - map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries - ); - - libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - - runtimeDeps = [ - targetPackages.stdenv.cc - targetPackages.stdenv.cc.bintools - coreutils # for cat - ] - # On darwin, we need unwrapped bintools as well (for otool) - ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ - targetPackages.stdenv.cc.bintools.bintools - ]; - -in - -stdenv.mkDerivation { - inherit version; - pname = "ghc-binary${binDistUsed.variantSuffix}"; - - src = fetchurl binDistUsed.src; - - nativeBuildInputs = [ perl ]; - - # Set LD_LIBRARY_PATH or equivalent so that the programs running as part - # of the bindist installer can find the libraries they expect. - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location. - ${libEnvVar} = libPath; - - postUnpack = - # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, - # so that we know when ghc bindists upgrade that and we need to update the - # version used in `libPath`. - lib.optionalString (binDistUsed.exePathForLibraryCheck != null) - # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. - # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. - # As a result, don't shell-quote this glob when splicing the string. - ( - let - buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; - in - lib.concatStringsSep "\n" [ - '' - shopt -u nullglob - echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" - if ! test -e ${buildExeGlob}; then - echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - (lib.concatMapStringsSep "\n" ( - { fileToCheckFor, nixPackage }: - lib.optionalString (fileToCheckFor != null) '' - echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" - if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then - echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - - echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" - if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then - echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - ) binDistUsed.archSpecificLibraries) - ] - ) - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - + lib.optionalString stdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isMachO $exe || continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - '' - - # We have to patch the GMP paths for the ghc-bignum package, for hadrian by - # modifying the package-db directly - + '' - find . -name 'ghc-bignum*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' - # Similar for iconv and libffi on darwin - + lib.optionalString stdenv.hostPlatform.isDarwin '' - find . -name 'base*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; - - # To link RTS in the end we also need libffi now - find . -name 'rts*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \ - -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ - -i {} \; - '' - + - # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in - # FFI_LIB_DIR is a good indication of places it must be needed. - lib.optionalString - ( - lib.meta.availableOn stdenv.hostPlatform numactl - && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries - ) - '' - find . -name package.conf.in \ - -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; - '' - + - # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.hostPlatform.isLinux '' - find . -type f -executable -exec patchelf \ - --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - ''; - - # fix for `configure: error: Your linker is affected by binutils #16177` - preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold"; - - # GHC has a patched config.sub and bindists' platforms should always work - dontUpdateAutotoolsGnuConfigScripts = true; - - configurePlatforms = [ ]; - configureFlags = - lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - # From: https://github.com/NixOS/nixpkgs/pull/43369/commits - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # GHC tries to remove xattrs when installing to work around Gatekeeper - # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally - # succeeds in nixpkgs because xattrs are not allowed in the store, but it - # can fail when a file has the `com.apple.provenance` xattr, and it can’t be - # modified (such as target of the symlink to `libiconv.dylib`). - # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13. - # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/ - makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ]; - - # Patch scripts to include runtime dependencies in $PATH. - postInstall = '' - for i in "$out/bin/"*; do - test ! -h "$i" || continue - isScript "$i" || continue - sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" - done - '' - + lib.optionalString stdenv.targetPlatform.isDarwin '' - # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it - # detects `llvm-ar` even though the resulting archives are not supported by ld64. - # https://gitlab.haskell.org/ghc/ghc/-/issues/23188 - # https://github.com/haskell/cabal/issues/8882 - sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings" - ''; - - # Apparently necessary for the ghc Alpine (musl) bindist: - # When we strip, and then run the - # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - # below, running ghc (e.g. during `installCheckPhase)` gives some apparently - # corrupted rpath or whatever makes the loader work on nonsensical strings: - # running install tests - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # This is extremely bogus and should be investigated. - dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - postFixup = - lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) ( - if stdenv.hostPlatform.isAarch64 then - # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs - # are 2 directories deep from $out/lib, so pooling symlinks there makes - # a short rpath. - '' - (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) - (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10) - (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) - for p in $(find "$out/lib" -type f -name "*\.so*"); do - (cd $out/lib; ln -s $p) - done - - for p in $(find "$out/lib" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p - fi - done - '' - else - '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' - ) - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isMachO $exe || continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - '' - # Recache package db which needs to happen for Hadrian bindists - # where we modify the package db before installing - + '' - package_db=("$out"/lib/ghc-*/lib/package.conf.d) - "$out/bin/ghc-pkg" --package-db="$package_db" recache - ''; - - doInstallCheck = true; - installCheckPhase = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - env -i $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - - llvmPackages = null; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - - # Normal GHC derivations expose the hadrian derivation used to build them - # here. In the case of bindists we just make sure that the attribute exists, - # as it is used for checking if a GHC derivation has been built with hadrian. - hadrian = null; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "Glasgow Haskell Compiler"; - license = lib.licenses.bsd3; - # HACK: since we can't encode the libc / abi in platforms, we need - # to make the platform list dependent on the evaluation platform - # in order to avoid eval errors with musl which supports less - # platforms than the default libcs (i. e. glibc / libSystem). - # This is done for the benefit of Hydra, so `packagePlatforms` - # won't return any platforms that would cause an evaluation - # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as - # long as the evaluator runs on a platform that supports - # `pkgsMusl`. - platforms = builtins.attrNames ghcBinDists.${distSetName}; - teams = [ lib.teams.haskell ]; - broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); - }; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 678bf11a618f..829c6a14edf6 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -185,23 +185,7 @@ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1, 9.10.2, 9.8.4 and 9.6.7 - lib.optionals (lib.versionOlder version "9.6.7") [ - # Determine size of time related types using hsc2hs instead of assuming CLong. - # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 - # Note that in normal situations this shouldn't be the case since nixpkgs - # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). - (fetchpatch { - name = "unix-fix-ctimeval-size-32-bit.patch"; - url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; - sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; - stripLen = 1; - extraPrefix = "libraries/unix/"; - }) - ] - ++ lib.optionals (lib.versionOlder version "9.8") [ + lib.optionals (lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 (fetchpatch { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5190ca26801c..58b0665ba647 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -15,7 +15,6 @@ let # Binary GHCs "ghc902Binary" "ghc924Binary" - "ghc963Binary" "ghc984Binary" ]; @@ -80,8 +79,6 @@ in ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { }; - ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix { }; - ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { }; ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { @@ -108,11 +105,7 @@ in }; ghc96 = compiler.ghc967; ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { - bootPkgs = - if stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl then - bb.packages.ghc984Binary - else - bb.packages.ghc963Binary; + bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc948 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -122,16 +115,7 @@ in }; ghc98 = compiler.ghc984; ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { - bootPkgs = - if stdenv.buildPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - bb.packages.ghc967 - else - bb.packages.ghc963Binary; + bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -140,16 +124,7 @@ in inherit buildTargetLlvmPackages llvmPackages; }; ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix { - bootPkgs = - if stdenv.buildPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - bb.packages.ghc967 - else - bb.packages.ghc963Binary; + bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -236,12 +211,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc963Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc963Binary; - ghc = bh.compiler.ghc963Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc984Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc984Binary; ghc = bh.compiler.ghc984Binary; From da915f81efab5163f7a3a3fd304970f07909b336 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 7 Sep 2025 01:13:30 +0100 Subject: [PATCH 0234/2279] haskell.compiler.ghc967: bootstrap with GHC 9.4.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’d want every version to be able to trace back to 9.4.8 for the “cross‐compiled GHC bootstrap tarballs” plan, anyway. I’m not sure whether we’d want a `ghc948Binary` package that also includes the official tarballs, or just only use our cross‐compiled binary distributions, but it will make sense to align the version used for bootstrap regardless. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 58b0665ba647..5ad258b14d8a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -95,7 +95,7 @@ in }; ghc94 = compiler.ghc948; ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { - bootPkgs = bb.packages.ghc924Binary; + bootPkgs = bb.packages.ghc948; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and From c9c734465795ce42e8c9eb39aa8f815340d3ca5e Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 7 Sep 2025 01:13:30 +0100 Subject: [PATCH 0235/2279] haskell.compiler.ghc924Binary: drop --- .../compilers/ghc/9.2.4-binary.nix | 493 ------------------ .../configuration-ghc-9.2.x.nix | 167 ------ pkgs/top-level/haskell-packages.nix | 9 - 3 files changed, 669 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.2.4-binary.nix delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix deleted file mode 100644 index ea9cf49efff2..000000000000 --- a/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ /dev/null @@ -1,493 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - gcc, - ncurses5, - ncurses6, - gmp, - libiconv, - numactl, - libffi, - coreutils, - targetPackages, - - # minimal = true; will remove files that aren't strictly necessary for - # regular builds and GHC bootstrapping. - # This is "useful" for staying within hydra's output limits for at least the - # aarch64-linux architecture. - minimal ? false, -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - downloadsUrl = "https://downloads.haskell.org/ghc"; - - # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.4/SHA256SUMS - version = "9.2.4"; - - # Information about available bindists that we use in the build. - # - # # Bindist library checking - # - # The field `archSpecificLibraries` also provides a way for us get notified - # early when the upstream bindist changes its dependencies (e.g. because a - # newer Debian version is used that uses a new `ncurses` version). - # - # Usage: - # - # * You can find the `fileToCheckFor` of libraries by running `readelf -d` - # on the compiler binary (`exePathForLibraryCheck`). - # * To skip library checking for an architecture, - # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specific library, - # set `fileToCheckFor = null`. - ghcBinDists = { - # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) - # nixpkgs uses for the respective system. - defaultLibc = { - i686-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "5dc1eb9c65f01b1e5c5693af72af07a4e9e75c6920e620fd598daeefa804487a"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, - # which link it against `libtinfo.so.5` (ncurses 5). - # Other bindists are linked `libtinfo.so.6` (ncurses 6). - { - nixPackage = ncurses5; - fileToCheckFor = "libtinfo.so.5"; - } - ]; - }; - x86_64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; - sha256 = "a77a91a39d9b0167124b7e97648b2b52973ae0978cb259e0d44f0752a75037cb"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libtinfo.so.6"; - } - ]; - }; - aarch64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; - sha256 = "fc7dbc6bae36ea5ac30b7e9a263b7e5be3b45b0eb3e893ad0bc2c950a61f14ec"; - }; - exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libtinfo.so.6"; - } - { - nixPackage = numactl; - fileToCheckFor = null; - } - ]; - }; - x86_64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "f2e8366fd3754dd9388510792aba2d2abecb1c2f7f1e5555f6065c3c5e2ffec4"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - isHadrian = true; - }; - aarch64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; - sha256 = "8cf8408544a1a43adf1bbbb0dd6b074efadffc68bfa1a792947c52e825171224"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - isHadrian = true; - }; - }; - # Binary distributions for the musl libc for the respective system. - musl = { - x86_64-linux = { - variantSuffix = "-musl"; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz"; - sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481"; - }; - isStatic = true; - isHadrian = true; - # We can't check the RPATH for statically linked executable - exePathForLibraryCheck = null; - archSpecificLibraries = [ - { - nixPackage = gmp.override { withStatic = true; }; - fileToCheckFor = null; - } - ]; - }; - }; - }; - - distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; - - binDistUsed = - ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); - - gmpUsed = - (builtins.head ( - builtins.filter ( - drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "") - ) binDistUsed.archSpecificLibraries - )).nixPackage; - - libPath = lib.makeLibraryPath ( - # Add arch-specific libraries. - map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries - ); - - libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - - runtimeDeps = [ - targetPackages.stdenv.cc - targetPackages.stdenv.cc.bintools - coreutils # for cat - ] - # On darwin, we need unwrapped bintools as well (for otool) - ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ - targetPackages.stdenv.cc.bintools.bintools - ]; - -in - -stdenv.mkDerivation { - inherit version; - pname = "ghc-binary${binDistUsed.variantSuffix}"; - - src = fetchurl binDistUsed.src; - - nativeBuildInputs = [ perl ]; - - # Set LD_LIBRARY_PATH or equivalent so that the programs running as part - # of the bindist installer can find the libraries they expect. - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location. - ${libEnvVar} = libPath; - - postUnpack = - # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, - # so that we know when ghc bindists upgrade that and we need to update the - # version used in `libPath`. - lib.optionalString (binDistUsed.exePathForLibraryCheck != null) - # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. - # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. - # As a result, don't shell-quote this glob when splicing the string. - ( - let - buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; - in - lib.concatStringsSep "\n" [ - '' - shopt -u nullglob - echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" - if ! test -e ${buildExeGlob}; then - echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - (lib.concatMapStringsSep "\n" ( - { fileToCheckFor, nixPackage }: - lib.optionalString (fileToCheckFor != null) '' - echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" - if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then - echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - - echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" - if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then - echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - ) binDistUsed.archSpecificLibraries) - ] - ) - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - + lib.optionalString stdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - '' - + - - # Some scripts used during the build need to have their shebangs patched - '' - patchShebangs ghc-${version}/utils/ - patchShebangs ghc-${version}/configure - test -d ghc-${version}/inplace/bin && \ - patchShebangs ghc-${version}/inplace/bin - '' - + - # We have to patch the GMP paths for the integer-gmp package. - '' - find . -name ghc-bignum.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${lib.getLib gmpUsed}/lib@" {} \; - - # we need to modify the package db directly for hadrian bindists - find . -name 'ghc-bignum*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # we need to modify the package db directly for hadrian bindists - # (all darwin bindists are hadrian-based for 9.2.2) - find . -name 'base*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; - - # To link RTS in the end we also need libffi now - find . -name 'rts*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \ - -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ - -i {} \; - '' - + - # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in - # FFI_LIB_DIR is a good indication of places it must be needed. - lib.optionalString - ( - lib.meta.availableOn stdenv.hostPlatform numactl - && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries - ) - '' - find . -name package.conf.in \ - -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; - '' - + - # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.hostPlatform.isLinux '' - find . -type f -executable -exec patchelf \ - --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - ''; - - # fix for `configure: error: Your linker is affected by binutils #16177` - preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold"; - - configurePlatforms = [ ]; - configureFlags = [ - "--with-gmp-includes=${lib.getDev gmpUsed}/include" - # Note `--with-gmp-libraries` does nothing for GHC bindists: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - # From: https://github.com/NixOS/nixpkgs/pull/43369/commits - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # GHC tries to remove xattrs when installing to work around Gatekeeper - # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally - # succeeds in nixpkgs because xattrs are not allowed in the store, but it - # can fail when a file has the `com.apple.provenance` xattr, and it can’t be - # modified (such as target of the symlink to `libiconv.dylib`). - # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13. - # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/ - makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ]; - - # Patch scripts to include runtime dependencies in $PATH. - postInstall = '' - for i in "$out/bin/"*; do - test ! -h "$i" || continue - isScript "$i" || continue - sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" - done - ''; - - # Apparently necessary for the ghc Alpine (musl) bindist: - # When we strip, and then run the - # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - # below, running ghc (e.g. during `installCheckPhase)` gives some apparently - # corrupted rpath or whatever makes the loader work on nonsensical strings: - # running install tests - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # This is extremely bogus and should be investigated. - dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - postFixup = - lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) ( - if stdenv.hostPlatform.isAarch64 then - # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs - # are 2 directories deep from $out/lib, so pooling symlinks there makes - # a short rpath. - '' - (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) - (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10) - (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) - for p in $(find "$out/lib" -type f -name "*\.so*"); do - (cd $out/lib; ln -s $p) - done - - for p in $(find "$out/lib" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p - fi - done - '' - else - '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' - ) - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - '' - + lib.optionalString minimal '' - # Remove profiling files - find $out -type f -name '*.p_o' -delete - find $out -type f -name '*.p_hi' -delete - find $out -type f -name '*_p.a' -delete - # `-f` because e.g. musl bindist does not have this file. - rm -f $out/lib/ghc-*/bin/ghc-iserv-prof - # Hydra will redistribute this derivation, so we have to keep the docs for - # legal reasons (retaining the legal notices etc) - # As a last resort we could unpack the docs separately and symlink them in. - # They're in $out/share/{doc,man}. - '' - # Recache package db which needs to happen for Hadrian bindists - # where we modify the package db before installing - + '' - shopt -s nullglob - package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d) - "$out/bin/ghc-pkg" --package-db="$package_db" recache - ''; - - doInstallCheck = true; - installCheckPhase = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - env -i $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - - llvmPackages = null; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - } - # We duplicate binDistUsed here since we have a sensible default even if no bindist is available, - # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. - // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { - # Normal GHC derivations expose the hadrian derivation used to build them - # here. In the case of bindists we just make sure that the attribute exists, - # as it is used for checking if a GHC derivation has been built with hadrian. - # The isHadrian mechanism will become obsolete with GHCs that use hadrian - # exclusively, i.e. 9.6 (and 9.4?). - hadrian = null; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "Glasgow Haskell Compiler"; - license = lib.licenses.bsd3; - # HACK: since we can't encode the libc / abi in platforms, we need - # to make the platform list dependent on the evaluation platform - # in order to avoid eval errors with musl which supports less - # platforms than the default libcs (i. e. glibc / libSystem). - # This is done for the benefit of Hydra, so `packagePlatforms` - # won't return any platforms that would cause an evaluation - # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as - # long as the evaluator runs on a platform that supports - # `pkgsMusl`. - platforms = builtins.attrNames ghcBinDists.${distSetName}; - teams = [ lib.teams.haskell ]; - broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); - }; -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix deleted file mode 100644 index 8bc8c6b6d2a9..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ - config, - pkgs, - haskellLib, -}: - -with haskellLib; - -let - inherit (pkgs.stdenv.hostPlatform) isDarwin; - inherit (pkgs) lib; -in - -self: super: { - - # Disable GHC 9.2.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - exceptions = null; - filepath = null; - ghc-bignum = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-heap = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hpc = null; - integer-gmp = null; - libiserv = null; - mtl = null; - parsec = null; - pretty = null; - process = null; - rts = null; - stm = null; - template-haskell = null; - # GHC only builds terminfo if it is a native compiler - terminfo = - if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then - null - else - doDistribute self.terminfo_0_4_1_7; - text = null; - time = null; - transformers = null; - unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; - - # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work - Cabal-syntax = self.Cabal-syntax_3_6_0_0; - # These core package only exist for GHC >= 9.4. The best we can do is feign - # their existence to callPackages, but their is no shim for lower GHC versions. - system-cxx-std-lib = null; - - # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available - ghc-internal = null; - # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage - ghc-toolchain = null; - ghc-platform = null; - - # Becomes a core package in GHC >= 9.8 - semaphore-compat = doDistribute self.semaphore-compat_1_0_0; - - # Becomes a core package in GHC >= 9.10 - os-string = doDistribute self.os-string_2_0_8; - - # weeder >= 2.5 requires GHC 9.4 - weeder = doDistribute self.weeder_2_4_1; - # Allow dhall 1.42.* - weeder_2_4_1 = doJailbreak ( - super.weeder_2_4_1.override { - # weeder < 2.6 only supports algebraic-graphs < 0.7 - # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set - algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; - } - ); - - haskell-language-server = - lib.throwIf config.allowAliases - "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version" - (markBroken super.haskell-language-server); - - # hashable >= 1.5 doesn't support base < 4.18 - hashable = self.hashable_1_4_7_0; - # For GHC < 9.4, some packages need data-array-byte as an extra dependency - hashable_1_4_7_0 = addBuildDepends [ self.data-array-byte ] super.hashable_1_4_7_0; - primitive = addBuildDepends [ self.data-array-byte ] super.primitive; - primitive-unlifted = super.primitive-unlifted_0_1_3_1; - # Too strict lower bound on base - primitive-addr = doJailbreak super.primitive-addr; - - # Needs base-orphans for GHC < 9.8 / base < 4.19 - some = addBuildDepend self.base-orphans super.some; - - # Jailbreaks & Version Updates - hashable-time = doJailbreak super.hashable-time; - - # Depends on utf8-light which isn't maintained / doesn't support base >= 4.16 - # https://github.com/haskell-infra/hackage-trustees/issues/347 - # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html - language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - - # Needs to match ghc-lib version - ghc-tags = doDistribute (doJailbreak self.ghc-tags_1_7); - - # Needs to match ghc-lib - hlint = doDistribute self.hlint_3_6_1; - - # ghc-lib >= 9.8 and friends no longer build with GHC 9.2 since they require semaphore-compat - ghc-lib-parser = doDistribute ( - self.ghc-lib-parser_9_6_7_20250325.override { - happy = self.happy_1_20_1_1; # wants happy < 1.21 - } - ); - ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2; - ghc-lib = doDistribute ( - self.ghc-lib_9_6_7_20250325.override { - happy = self.happy_1_20_1_1; # wants happy < 1.21 - } - ); - - # 0.2.2.3 requires Cabal >= 3.8 - shake-cabal = doDistribute self.shake-cabal_0_2_2_2; - - # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8 - aeson = dontCheck super.aeson; - - # https://github.com/NixOS/cabal2nix/issues/554 - # https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility - clash-prelude = dontDistribute (markBroken super.clash-prelude); - - # Too strict upper bound on bytestring, relevant for GHC 9.2.6 specifically - # https://github.com/protolude/protolude/issues/127#issuecomment-1428807874 - protolude = doJailbreak super.protolude; - - # https://github.com/fpco/inline-c/pull/131 - inline-c-cpp = - (if isDarwin then appendConfigureFlags [ "--ghc-option=-fcompact-unwind" ] else x: x) - super.inline-c-cpp; - - # A given major version of ghc-exactprint only supports one version of GHC. - ghc-exactprint = super.ghc-exactprint_1_5_0; - - # only broken for >= 9.6 - calligraphy = doDistribute (unmarkBroken super.calligraphy); - - # Packages which need compat library for GHC < 9.6 - inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super) - indexed-traversable - OneTuple - these - ; - base-compat-batteries = addBuildDepends [ - self.foldable1-classes-compat - self.OneTuple - ] super.base-compat-batteries; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5ad258b14d8a..d81d257c868b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -14,7 +14,6 @@ let "native-bignum" # Binary GHCs "ghc902Binary" - "ghc924Binary" "ghc984Binary" ]; @@ -77,8 +76,6 @@ in inherit llvmPackages; }; - ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { }; - ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { }; ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { @@ -205,12 +202,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc924Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc924Binary; - ghc = bh.compiler.ghc924Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc984Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc984Binary; ghc = bh.compiler.ghc984Binary; From 740e138fe0330f454347f887b4fe52e9b3677eaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 18:04:15 +0000 Subject: [PATCH 0236/2279] frei0r: 2.4.0 -> 2.5.0 --- pkgs/by-name/fr/frei0r/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frei0r/package.nix b/pkgs/by-name/fr/frei0r/package.nix index 4d890bbbb6e7..1f1a1e862ef2 100644 --- a/pkgs/by-name/fr/frei0r/package.nix +++ b/pkgs/by-name/fr/frei0r/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "frei0r-plugins"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "dyne"; repo = "frei0r"; rev = "v${version}"; - hash = "sha256-95d1aXfCq4mPccY8VKmO7jkX57li6OVSwtfIf9459n4="; + hash = "sha256-JEQndfQOcSARGIPtMwteUqWqTLPEMcpF2F/xD1PsDEU="; }; nativeBuildInputs = [ From d88e47c845b69fa7adf939c52bd9896d78db64c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Oct 2025 20:36:37 +0200 Subject: [PATCH 0237/2279] python3Packages.anyio: disable racy test Closes: #448125 --- pkgs/development/python-modules/anyio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f5e02b9d2067..2565129d2215 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -95,6 +95,8 @@ buildPythonPackage rec { "test_nonexistent_main_module" # 3 second timeout expired "test_keyboardinterrupt_during_test" + # racy with high thread count, see https://github.com/NixOS/nixpkgs/issues/448125 + "test_multiple_threads" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' From 8ab72653f2cb774226a0f08577aabc7972c02e14 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Oct 2025 23:06:14 +0200 Subject: [PATCH 0238/2279] {spandsp,spandsp3}: Enable tests --- pkgs/development/libraries/spandsp/3.nix | 17 +- pkgs/development/libraries/spandsp/common.nix | 160 +++++++++++++++++- .../development/libraries/spandsp/default.nix | 4 +- 3 files changed, 168 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index 77126a7c4cee..5a7f0005a407 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -4,16 +4,19 @@ libjpeg, }: -(callPackage ./common.nix { }).overrideAttrs (previousAttrs: { +((callPackage ./common.nix { }) { version = "3.0.0"; src = fetchFromGitHub { owner = "freeswitch"; - repo = previousAttrs.pname; + repo = "spandsp"; rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7"; }; - - propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [ - libjpeg - ]; -}) +}).overrideAttrs + ( + finalAttrs: previousAttrs: { + propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [ + libjpeg + ]; + } + ) diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index 7abfee0668c5..6b31524cdecb 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -5,11 +5,27 @@ libtiff, buildPackages, fetchpatch, - autoreconfHook, + autoconf, + automake, + fftw, + libpcap, + libsndfile, + libtool, + libxml2, + netpbm, + sox, + util-linux, + which, +}: + +{ + version, + src, }: stdenv.mkDerivation (finalAttrs: { pname = "spandsp"; + inherit version src; patches = [ # submitted upstream: https://github.com/freeswitch/spandsp/pull/47 @@ -19,33 +35,169 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + postPatch = '' + patchShebangs autogen.sh + + # pkg-config? What's that? + # Actually *check* the value given for --{en,dis}able-tests, not just whether the option was passed + substituteInPlace configure.ac \ + --replace-fail '$xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2' '$xml2_include_dir ${lib.getDev libxml2}/include ${lib.getDev libxml2}/include/libxml2 /usr/local/include/libxml2' \ + --replace-fail 'if test -n "$enable_tests" ; then' 'if test "$enable_tests" = "yes" ; then' + ''; + outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; + + nativeBuildInputs = [ + autoconf + automake + libtool + util-linux + which + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedBuildInputs = [ audiofile libtiff ]; + nativeCheckInputs = [ + libtiff + netpbm + sox + ]; + + checkInputs = [ + fftw + libpcap + libsndfile + libxml2 + ]; + + preConfigure = '' + ./autogen.sh + ''; + configureFlags = [ + (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") + # This flag is required to prevent linking error in the cross-compilation case. # I think it's fair to assume that realloc(NULL, size) will return a valid memory # block for most libc implementation, so let's just assume that and hope for the best. "ac_cv_func_malloc_0_nonnull=yes" ]; - enableParallelBuilding = true; + # Issues with test asset generation under heavy parallelism + enableParallelBuilding = false; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" ]; - strictDeps = true; + env.NIX_CFLAGS_COMPILE = toString [ + # Missing const conversion on some calls + "-Wno-error=incompatible-pointer-types" + ]; + + hardeningDisable = lib.optionals (lib.strings.versionOlder finalAttrs.version "3.0.0") [ + "format" + ]; + + doCheck = + stdenv.buildPlatform.canExecute stdenv.hostPlatform + # Compat with i.e. Clang improved by 0446f4e0c72553f3ea9b50c5333ece6ac980e58d, too big to apply + && stdenv.cc.isGNU; + + disabledTests = [ + # Need proprietary recordings that aren't included + "ademco_contactid_tests" + "dtmf_rx_tests" + "g722_tests" + "g726_tests" + "gsm0610_tests" + "modem_connect_tones_tests" + "sig_tone_tests" + "t42_tests" + "t43_tests" + "v42bis_tests" + + # Fails to initialise modem. + "data_modems_tests" + + # ERROR PTY Fatal error: failed to create /dev/spandsp/0 symbolic link + "dummy_modems_tests" # needs extra setup, but eventually runs into the above error + "pseudo_terminal_tests" + + # Hangs. Maybe needs setup / some interaction + "fax_tests" + + # Needs an input file, unsure what's suitable + "playout_tests" + + # Borked in the packaged versions due to missing audio file - copy-pasting mistake + # Maybe fixed after 5394b2cae6c482ccb835335b769469977e6802ae, but too big to apply + "super_tone_rx_tests" + + # Stuck + "t31_pseudo_terminal_tests" + + # Generated signal has more than the expected maximum samples - 441 vs 422 + "time_scale_tests" + + # Test failed - -16dBm0 of noise, signal is 9056.993164 (11440.279297) + "tone_detect_tests" + + # Fails due to result different from reference + "v18_tests" + + # Seemingly runs forever, with tons of output + "v22bis_tests" + ]; + + checkPhase = '' + runHook preCheck + + pushd tests + + for test in *_tests; do + testArgs=() + case "$test" in + # Skipped tests + ${lib.strings.concatStringsSep "|" finalAttrs.disabledTests}) + echo "Skipping $test" + continue + ;; + + # Needs list of subtests to run + echo_tests) + testArgs+=( + sanity 2a 2b 2ca 3a 3ba 3bb 3c 4 5 6 7 8 9 10a 10b 10c 11 12 13 14 15 + ) + # Fallthough for running the test + ;;& + + *) + echo "Running $test" + if ! ./"$test" "''${testArgs[@]}" >"$test".log 2>&1; then + echo "$test failed! Output:" + cat "$test".log + exit 1 + fi + ;; + esac + done + + popd + + runHook postCheck + ''; meta = { description = "Portable and modular SIP User-Agent with audio and video support"; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 991b9cd8ba17..e2b70b402778 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -3,10 +3,10 @@ callPackage, }: -(callPackage ./common.nix { }).overrideAttrs (_: rec { +(callPackage ./common.nix { }) rec { version = "0.0.6"; src = fetchurl { url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; -}) +} From f9cc041eded01c0abea01eafd5852d1fa230ecb2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Oct 2025 23:07:00 +0200 Subject: [PATCH 0239/2279] {spandsp,spandsp3}: Adopt by NGI team BigBlueButton uses this. --- pkgs/development/libraries/spandsp/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index 6b31524cdecb..baff42276a60 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -204,6 +204,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/freeswitch/spandsp"; platforms = with lib.platforms; unix; maintainers = with lib.maintainers; [ misuzu ]; + teams = [ lib.teams.ngi ]; license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; }; From 071162cccee696bb75e8bbe93f94a603b70bda07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 13 Oct 2025 12:58:26 -0700 Subject: [PATCH 0240/2279] python3Packages.aiohttp: 3.12.15 -> 3.13.0 Diff: https://github.com/aio-libs/aiohttp/compare/v3.12.15...v3.13.0 Changelog: https://docs.aiohttp.org/en/v3.13.0/changes.html --- pkgs/development/python-modules/aiohttp/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index d7203d464870..7a7163164594 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -6,6 +6,7 @@ replaceVars, isPy310, isPyPy, + pythonOlder, # build-system cython, @@ -24,6 +25,7 @@ multidict, propcache, yarl, + zstandard, # optional dependencies aiodns, @@ -49,14 +51,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.12.15"; + version = "3.13.0"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-nVDGSbzjCdyJFCsHq8kJigNA4vGs4Pg1Vyyvw+gKg2w="; + hash = "sha256-X4igOjBeAGDfUGwZAsjUWOWt3EFt53QSuUcdJ/5vBVU="; }; patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [ @@ -104,6 +106,9 @@ buildPythonPackage rec { optional-dependencies.speedups = [ aiodns (if isPyPy then brotlicffi else brotli) + ] + ++ lib.optionals (pythonOlder "3.14") [ + zstandard ]; nativeCheckInputs = [ From a3edb2443ecf4f1317ff708c9099c07f2b393e72 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Thu, 4 Sep 2025 16:43:52 +0300 Subject: [PATCH 0241/2279] ee: 1.5.2 -> 1.5.2-unstable-2024-06-20, fix update script --- pkgs/by-name/ee/ee/package.nix | 20 ++++++++++---------- pkgs/by-name/ee/ee/update.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 10 deletions(-) create mode 100755 pkgs/by-name/ee/ee/update.sh diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix index 8be454f4b069..efe71101b186 100644 --- a/pkgs/by-name/ee/ee/package.nix +++ b/pkgs/by-name/ee/ee/package.nix @@ -1,23 +1,23 @@ { lib, stdenv, - nix-update-script, - fetchgit, + fetchFromGitHub, ncurses, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "ee"; - version = "1.5.2"; + version = "1.5.2-unstable-2024-06-20"; - src = fetchgit { - url = "https://git.freebsd.org/src.git"; - tag = "release/14.3.0"; - outputHash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0="; + src = fetchFromGitHub { + owner = "freebsd"; + repo = "freebsd-src"; + rev = "0667538b888c1171932c6cf28b62fc19d393e119"; + hash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0="; rootDir = "contrib/ee"; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = ./update.sh; buildInputs = [ ncurses ]; @@ -49,4 +49,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; mainProgram = "ee"; }; -}) +} diff --git a/pkgs/by-name/ee/ee/update.sh b/pkgs/by-name/ee/ee/update.sh new file mode 100755 index 000000000000..29a5460e7daf --- /dev/null +++ b/pkgs/by-name/ee/ee/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq common-updater-scripts +set -euo pipefail + +owner=freebsd +repo=freebsd-src +path=contrib/ee +pkg_file=./pkgs/by-name/ee/ee/package.nix + +api_url_latest="https://api.github.com/repos/$owner/$repo/commits?path=$path&per_page=1" +json_latest=$(curl -sSfL -H "Accept: application/vnd.github+json" ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$api_url_latest") +latest_rev=$(printf '%s' "$json_latest" | jq -r '.[0].sha') +latest_date=$(printf '%s' "$json_latest" | jq -r '.[0].commit.committer.date' | cut -dT -f1) + +if [[ -z "${latest_rev:-}" || "$latest_rev" == "null" ]]; then + echo "Failed to fetch latest commit for path $path" >&2 + exit 1 +fi + +# Fetch EE_VERSION from that commit +raw_url="https://raw.githubusercontent.com/$owner/$repo/$latest_rev/$path/ee_version.h" +ee_version=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$raw_url" | sed -n 's/^#define[[:space:]]*EE_VERSION[[:space:]]*"\([^"]*\)".*/\1/p') +if [[ -z "${ee_version:-}" ]]; then + echo "Failed to parse EE_VERSION from ee_version.h at $latest_rev" >&2 + exit 1 +fi + +new_version="${ee_version}-unstable-${latest_date}" + +update-source-version ee "$new_version" --rev="$latest_rev" --file="$pkg_file" --ignore-same-version --print-changes From 500ec2fc673da5e0d670129dff04b50c94c4038d Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 13 Oct 2025 23:05:40 +0300 Subject: [PATCH 0242/2279] ee: adopt --- pkgs/by-name/ee/ee/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix index efe71101b186..0b4707c79499 100644 --- a/pkgs/by-name/ee/ee/package.nix +++ b/pkgs/by-name/ee/ee/package.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation { license = lib.licenses.bsd2; platforms = lib.platforms.unix; mainProgram = "ee"; + maintainers = with lib.maintainers; [ qweered ]; }; } From b97f76c701b695802bda50fc65fb9f04bf08c37c Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 13 Oct 2025 22:33:35 +0200 Subject: [PATCH 0243/2279] nodejs: disable failing test on darwin --- pkgs/development/web/nodejs/nodejs.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 208ded114973..a81592ee05d8 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -406,6 +406,9 @@ let # Those are annoyingly flaky, but not enough to be marked as such upstream. "test-wasi" + + # This is failing on newer macOS versions, no fix has yet been provided upstream: + "test-cluster-dgram-1" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Doesn't work in sandbox on x86_64. @@ -424,12 +427,9 @@ let ] # Those are annoyingly flaky, but not enough to be marked as such upstream. ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit" - ++ lib.optionals (majorVersion == "22" && stdenv.buildPlatform.isDarwin) [ - "test-cluster-dgram-1" - "test/sequential/test-http-server-request-timeouts-mixed.js" - ] - # This is failing on newer macOS versions, no fix has yet been provided upstream: - ++ lib.optional (majorVersion == "24" && stdenv.buildPlatform.isDarwin) "test-cluster-dgram-1" + ++ lib.optional ( + majorVersion == "22" && stdenv.buildPlatform.isDarwin + ) "test/sequential/test-http-server-request-timeouts-mixed.js" ) }" ]; From d6b704d9e9f07961c28c23dfa9292889ece0d0e5 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Mon, 13 Oct 2025 22:57:44 +0200 Subject: [PATCH 0244/2279] natscli: add bengsparks as maintainer --- pkgs/by-name/na/natscli/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 4288ac816353..74152326dd38 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -43,7 +43,10 @@ buildGoModule rec { homepage = "https://github.com/nats-io/natscli"; changelog = "https://github.com/nats-io/natscli/releases/tag/${src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ + bengsparks + fab + ]; mainProgram = "nats"; }; } From 27aa52ac8dcdf5ee904a3e11c472f48a84c22f5c Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Mon, 13 Oct 2025 22:49:00 +0200 Subject: [PATCH 0245/2279] natscli: modernize versionCheckHook usage The binary exposed via mainProgram and the one referenced in versionCheckProgram are the same, so the latter can simply be dropped. Additionally provide versionCheckProgramArg so that --help isn't needlessly invoked --- pkgs/by-name/na/natscli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 74152326dd38..14f3fee1db43 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { ''; doInstallCheck = true; - versionCheckProgram = "${placeholder "out"}/bin/nats"; + versionCheckProgramArg = "--version"; meta = { description = "NATS Command Line Interface"; From 7d28e619b43cff32a2f1bcab8875c4b3a3819ac8 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 13 Oct 2025 22:00:09 +0100 Subject: [PATCH 0246/2279] haskell.compiler.ghc948: drop obsolete `configure` patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This string is not present in GHC 9.4.8’s `configure` script. --- pkgs/development/compilers/ghc/common-make-native-bignum.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 1629828c4951..90c8d762df95 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -444,7 +444,6 @@ stdenv.mkDerivation ( export AR_STAGE0="$AR_FOR_BUILD" echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' # Haddock and sphinx need a working locale + lib.optionalString (enableDocs || enableHaddockProgram) ( From 6664f3137c2ee106bb6ea12eb7b88e0382cad50c Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 13 Oct 2025 22:00:09 +0100 Subject: [PATCH 0247/2279] haskell.compiler.ghc948: use `autoreconfHook` This matches the Hadrian build, and will be required for the LLVM support backports. --- .../compilers/ghc/common-make-native-bignum.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 90c8d762df95..c116c6121e12 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -14,14 +14,12 @@ # build-tools bootPkgs, - autoconf, - automake, + autoreconfHook, coreutils, fetchpatch, fetchurl, perl, python3, - m4, sphinx, xattr, autoSignDarwinBinariesHook, @@ -546,10 +544,8 @@ stdenv.mkDerivation ( dontAddExtraLibs = true; nativeBuildInputs = [ + autoreconfHook perl - autoconf - automake - m4 python3 bootPkgs.alex bootPkgs.happy From 5923f1f1e2d266d6d59954afa87012a1746d36f3 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 13 Oct 2025 22:00:09 +0100 Subject: [PATCH 0248/2279] =?UTF-8?q?haskell.compiler.ghc948:=20don?= =?UTF-8?q?=E2=80=99t=20patch=20both=20`aclocal.m4`=20and=20`configure`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `autoreconfHook` will handle the latter now. --- pkgs/development/compilers/ghc/common-make-native-bignum.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index c116c6121e12..3d147fe986e0 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -476,8 +476,7 @@ stdenv.mkDerivation ( grep linux-musl llvm-targets | sed 's/^/ /' echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do + for x in aclocal.m4; do substituteInPlace $x \ --replace '*-android*|*-gnueabi*)' \ '*-android*|*-gnueabi*|*-musleabi*)' From b80587454ae229da846cf9735e7423320b22b8a1 Mon Sep 17 00:00:00 2001 From: Leon Klingele Date: Mon, 13 Oct 2025 23:29:44 +0200 Subject: [PATCH 0249/2279] go_1_25: 1.25.2 -> 1.25.3 --- pkgs/development/compilers/go/1.25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index d7eff664fa04..20f8bc52a533 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.2"; + version = "1.25.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-NxEUDPuH/Oj3oT982GDfBB5sEvdhD0DKxuxvorZeluQ="; + hash = "sha256-qBpLpZPQAV4QxR4mfeP/B8eskU38oDfZUX0ClRcJd5U="; }; strictDeps = true; From 5dff919f2fb8fd3a6bc499bef0bd3aa07a1fd453 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Oct 2025 23:21:06 +0000 Subject: [PATCH 0250/2279] python3Packages.thermobeacon-ble: 0.10.0 -> 1.0.0 --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index 7efc1c9e334d..b9c986c09f9c 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "thermobeacon-ble"; - version = "0.10.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "thermobeacon-ble"; tag = "v${version}"; - hash = "sha256-+WQWb1D1Rw5KE4fvu55WYF2YsQY48MWtPA26G5MB6aY="; + hash = "sha256-ij8g1bq9xmHLSHf2O69H6laK+KsEmW7E+hXv52/iJkY="; }; build-system = [ poetry-core ]; From da13b48f15cafd7ba57049eb4a5965e88da1560a Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 14 Oct 2025 12:17:49 +0800 Subject: [PATCH 0251/2279] rtags: 2.38 -> 2.41-unstable-2025-09-23 --- pkgs/by-name/rt/rtags/package.nix | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/rt/rtags/package.nix b/pkgs/by-name/rt/rtags/package.nix index a5ebc016da6e..67bae281880e 100644 --- a/pkgs/by-name/rt/rtags/package.nix +++ b/pkgs/by-name/rt/rtags/package.nix @@ -2,17 +2,17 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, llvmPackages, openssl, emacs, pkg-config, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtags"; - version = "2.38"; + version = "2.41-unstable-2025-09-23"; nativeBuildInputs = [ cmake pkg-config @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { llvmPackages.llvm llvmPackages.libclang openssl - emacs + (emacs.override { withNativeCompilation = false; }) ] ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]; src = fetchFromGitHub { owner = "andersbakken"; repo = "rtags"; - tag = "v${version}"; - hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; + rev = "836e4f30ea51ef2074d3231d2118f43e8e32042f"; + hash = "sha256-dPCXGDDK3sC0oYCTX3Ph3MYxAZqOSaRG7c4+LB/n+Rs="; fetchSubmodules = true; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation @@ -39,25 +39,19 @@ stdenv.mkDerivation rec { ''; }; - # This should be fixed with the next version bump - # https://github.com/Andersbakken/rtags/issues/1411 - patches = [ - (fetchpatch { - name = "define-obsolete-function-alias.patch"; - url = "https://github.com/Andersbakken/rtags/commit/63f18acb21e664fd92fbc19465f0b5df085b5e93.patch"; - sha256 = "sha256-dmEPtnk8Pylmf5479ovHKItRZ+tJuOWuYOQbWB/si/Y="; - }) - ]; - preConfigure = '' export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \ LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = { description = "C/C++ client-server indexer based on clang"; homepage = "https://github.com/andersbakken/rtags"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = with lib.platforms; x86_64 ++ aarch64; }; -} +}) From 81b0d1f69dfee01e7ebd578fb4a79cd4a6a42ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 14 Oct 2025 11:47:37 +0200 Subject: [PATCH 0252/2279] gonic: 0.18.0 -> 0.19.0 --- pkgs/by-name/go/gonic/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/go/gonic/package.nix b/pkgs/by-name/go/gonic/package.nix index 14016c04011b..d0dddb9cf4a1 100644 --- a/pkgs/by-name/go/gonic/package.nix +++ b/pkgs/by-name/go/gonic/package.nix @@ -20,20 +20,15 @@ buildGoModule rec { pname = "gonic"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sentriz"; repo = "gonic"; rev = "v${version}"; - sha256 = "sha256-qWUADZntJg8722Kxt3z1cwIOTcjxS0PYC0RHzselkdI="; + sha256 = "sha256-la3xBECo4zZfkp5BlXuUzFEUGtxMl8ZAQdwgjFXIuSM="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - taglib - zlib - ]; - vendorHash = "sha256-HY+57SJsz/kPxSadjFl4LQ1Jlu3A5I+rpih67cMMGHA="; + vendorHash = "sha256-HrYS7c0MtiOYRyiSg7eLbiSIUkHeRikJ0Rwf4EoZIsQ="; # TODO(Profpatsch): write a test for transcoding support, # since it is prone to break From 347062bef5fb63ffe30742a52ca89540d925e8d5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Oct 2025 16:59:12 +0200 Subject: [PATCH 0253/2279] haskell.compiler.ghc984Binary: drop unnecessary libnuma dep ghc902Binary's rts.conf indeed prescribes linking against numa for aarch64-linux, but this is not the case with the later bindists we have been providing numa for. --- pkgs/development/compilers/ghc/9.8.4-binary.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 7c5ad0030dac..0ef74e55f430 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -100,10 +100,6 @@ let nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } - { - nixPackage = numactl; - fileToCheckFor = null; - } ]; }; x86_64-darwin = { From c31c0bbb70a7199bf104bd9b65961d08236d3cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 14 Oct 2025 11:48:00 +0200 Subject: [PATCH 0254/2279] nixos/gonic: unharden memory for new wasm libs --- nixos/modules/services/audio/gonic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/audio/gonic.nix b/nixos/modules/services/audio/gonic.nix index 800c08b13879..30b1f91ce7eb 100644 --- a/nixos/modules/services/audio/gonic.nix +++ b/nixos/modules/services/audio/gonic.nix @@ -94,7 +94,6 @@ in ]; RestrictRealtime = true; LockPersonality = true; - MemoryDenyWriteExecute = true; UMask = "0066"; ProtectHostname = true; }; From 5761e3145526e17357667ff631c63c897516a360 Mon Sep 17 00:00:00 2001 From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com> Date: Tue, 14 Oct 2025 14:59:58 +0200 Subject: [PATCH 0255/2279] pingu: 0.0.5 -> 0.0.6 (forked) --- pkgs/by-name/pi/pingu/package.nix | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pi/pingu/package.nix b/pkgs/by-name/pi/pingu/package.nix index c5778b735bf4..5df2c28bc3bd 100644 --- a/pkgs/by-name/pi/pingu/package.nix +++ b/pkgs/by-name/pi/pingu/package.nix @@ -6,25 +6,37 @@ buildGoModule rec { pname = "pingu"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { - owner = "sheepla"; + owner = "CactiChameleon9"; repo = "pingu"; rev = "v${version}"; - sha256 = "sha256-iAHj6/qaZgpTfrUZZ9qdsjiNMJ2zH0CzhR4TVSC9oLE="; + sha256 = "sha256-pXC/y+piLhSWIcJ1/+UaC3sjHPKG3XvTuHzWENsXME0="; + # Get values that require us to use git, then delete .git + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse --short HEAD > ldflags_revision + find . -type d -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorHash = "sha256-xn6la6E0C5QASXxNee1Py/rBs4ls9X/ePeg4Q1e2UyU="; + vendorHash = "sha256-8d0pKweumnJH49HSBCfEF8cwEXLGMAk2WbhS10T/Cmc="; + ldflags = [ + "-w" + "-s" + "-X main.appVersion=${version}" + ]; + preBuild = '' + ldflags+=" -X main.appRevision=$(cat ldflags_revision)" + ''; meta = with lib; { description = "Ping command implementation in Go but with colorful output and pingu ascii art"; - homepage = "https://github.com/sheepla/pingu/"; + homepage = "https://github.com/CactiChameleon9/pingu/"; license = licenses.mit; maintainers = with maintainers; [ CactiChameleon9 ]; mainProgram = "pingu"; - # Doesn't build with Go toolchain >1.22, build error: - # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg'. - broken = true; }; } From 2e758513fc20987f281af1e27e5d455c6ffa6542 Mon Sep 17 00:00:00 2001 From: Bruno Bigras <24027+bbigras@users.noreply.github.com> Date: Tue, 14 Oct 2025 09:50:36 -0400 Subject: [PATCH 0256/2279] diffedit3: 0.6.0 -> 0.6.1 --- pkgs/by-name/di/diffedit3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index 9a6ed5917b05..c7678e5ae251 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "diffedit3"; - version = "0.6.0"; + version = "0.6.1"; src = fetchCrate { inherit pname version; - hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU="; + hash = "sha256-tlrP97XMAAnk5H5wTHPsP1DMSmDqV9wJp1n+22jUtnM="; }; - cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA="; + cargoHash = "sha256-Hv3T0pxNUwp7No5tmFopMGjNdxfje4gRODj3B7sDVcg="; passthru = { updateScript = nix-update-script { }; From 7a3bae83f5259453df0919a3af87c0c636318094 Mon Sep 17 00:00:00 2001 From: Zachary Arnaise <121795280+zacharyarnaise@users.noreply.github.com> Date: Tue, 14 Oct 2025 19:30:15 +0200 Subject: [PATCH 0257/2279] tilt: 0.35.1 -> 0.35.2 --- pkgs/by-name/ti/tilt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix index 52299b1b00c4..a7f0cb98bd33 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.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; tag = "v${version}"; - hash = "sha256-rM5INMOECbnuWd4ealBcIuMwZij7MthrXfohOBavl8Y="; + hash = "sha256-QHW2lX92Yj43BwhAfHDLPXTeyrnRjaWs64GpXMzEzAk="; }; }; From 93966b11d4e7fc6580bef7f5ff7664fd55cc3f94 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 14 Oct 2025 21:44:21 +0200 Subject: [PATCH 0258/2279] ffmpeg_6: 6.1.2 -> 6.1.3 --- pkgs/development/libraries/ffmpeg/default.nix | 4 +-- pkgs/development/libraries/ffmpeg/generic.nix | 30 ------------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index cc0332510307..f36b3f6b3e3d 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -21,8 +21,8 @@ let }; v6 = { - version = "6.1.2"; - hash = "sha256-h/N56iKkAR5kH+PRQceWZvHe3k+70KWMDEP5iVq/YFQ="; + version = "6.1.3"; + hash = "sha256-NQnPOfiNmurY+L9/B7eVQc2JpOi0jhv5g9kVWsTzpis="; }; v7 = { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7a209f62692a..86103e7cc8c1 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -460,36 +460,6 @@ stdenv.mkDerivation ( url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c="; }) - (fetchpatch2 { - name = "CVE-2024-31582.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2"; - hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA="; - }) - (fetchpatch2 { - name = "CVE-2024-31578.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7"; - hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; - }) - (fetchpatch2 { - name = "CVE-2023-49501.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7"; - hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw="; - }) - (fetchpatch2 { - name = "CVE-2023-49502.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75"; - hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8="; - }) - (fetchpatch2 { - name = "CVE-2023-50007.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47"; - hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ="; - }) - (fetchpatch2 { - name = "CVE-2023-50008.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b"; - hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; - }) ] ++ optionals (lib.versionOlder version "7.1.1") [ (fetchpatch2 { From db73b8a406804d3f384c5ed0553238497da0cb26 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 14 Oct 2025 21:44:55 +0200 Subject: [PATCH 0259/2279] ffmpeg_7: 7.1.1 -> 7.1.2 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index f36b3f6b3e3d..7e81dc4d422a 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -26,8 +26,8 @@ let }; v7 = { - version = "7.1.1"; - hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4="; + version = "7.1.2"; + hash = "sha256-MF/0oSOhxGWuOu6Yat7O68iOvgZ+wKjpQ8zSkwpWXqQ="; }; v8 = { version = "8.0"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 86103e7cc8c1..2034b3b67392 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -490,7 +490,7 @@ stdenv.mkDerivation ( hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ="; }) ] - ++ optionals (lib.versionOlder version "7.2") [ + ++ optionals (lib.versionOlder version "7.1.2") [ (fetchpatch2 { name = "unbreak-svt-av1-3.0.0.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95"; From c5c96b92930e3140eabddb96941dd5680b31e99b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 14 Oct 2025 20:50:00 +0100 Subject: [PATCH 0260/2279] tinysparql: 3.10.0 -> 3.10.1 Changes: https://gitlab.gnome.org/GNOME/tinysparql/-/blob/3.10.1/NEWS --- pkgs/by-name/ti/tinysparql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index a4ea112ef7f6..fbe6f91e9348 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinysparql"; - version = "3.10.0"; + version = "3.10.1"; outputs = [ "out" @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { url = with finalAttrs; "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz"; - hash = "sha256-+wr5g1XqHbcAdkz0+iRYhKGZyhRe1C7VX5oYxoVSyjA="; + hash = "sha256-Wn8+eJ22ZxpVDtYoDtT2CmC+p3No2pK+aNx9jX4jAmU="; }; strictDeps = true; From 48c1319bebd3baf56e8fab605f851cc2e7cee703 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:08 -0700 Subject: [PATCH 0261/2279] folly: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/folly/compare/v2025.09.15.00...v2025.10.13.00 --- .../fo/folly/fix-stdexcept-include.patch | 22 ------------------- pkgs/by-name/fo/folly/package.nix | 15 +++---------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/fo/folly/fix-stdexcept-include.patch diff --git a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch deleted file mode 100644 index c13632abf599..000000000000 --- a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From dc06cc3162afb148c19cd0931d8fe489d639217a Mon Sep 17 00:00:00 2001 -From: Uilian Ries -Date: Tue, 9 Sep 2025 16:48:26 +0200 -Subject: [PATCH] Add missing header for std::runtime_error - -Signed-off-by: Uilian Ries ---- - folly/hash/Checksum.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/folly/hash/Checksum.cpp b/folly/hash/Checksum.cpp -index 1d42d6a6e5f..aeafdb20b1b 100644 ---- a/folly/hash/Checksum.cpp -+++ b/folly/hash/Checksum.cpp -@@ -17,6 +17,7 @@ - #include - - #include -+#include - - #include - diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index cce2c4aee1c9..2e6584d32482 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-//gx081nMFXAcUgkHQToiFHhECfLW22Fl0eXEsObxUs="; + hash = "sha256-k7PGxYF3HlNc5nPBV+MkELya/4yllkaMA37vcfES4NE="; }; nativeBuildInputs = [ @@ -145,16 +145,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; }) - # Fix an upstream regression with libstdc++. - # - # See: - # - # * - # * - # * - # * - ./fix-stdexcept-include.patch - # Fix a GCC‐incompatible use of a private trait. # # Per Folly’s own documentation: @@ -237,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: { pierreis emily techknowlogick + lf- ]; }; }) From 3d844fad8be597bdaae47d3d95ba83812cc06390 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:13 -0700 Subject: [PATCH 0262/2279] fizz: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebookincubator/fizz/compare/v2025.09.15.00...v2025.10.13.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.10.13.00 --- pkgs/by-name/fi/fizz/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index b56562148195..47871e1eb4bf 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-8j8Nt8XCbMGui7bELhvP+o8E2bqYobkXLhvZVkzCMzU="; + hash = "sha256-MNkPf289QGZ1x6Yr2E8vnlCFan94Opjiw6RItodWGaw="; }; patches = [ @@ -116,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From 7ced6fbc9c202c8ecfcc080d018440118bb847c3 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:18 -0700 Subject: [PATCH 0263/2279] mvfst: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/mvfst/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/mv/mvfst/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 01a9af81b1c8..65952f295588 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "bin" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZgzqkR72xtO5VVd2cyMM3vSsUWdW6HEvu9T1sM+cPi8="; + hash = "sha256-bsg+Zqv+aEDH6r6lZazCG25Wj2zG/VSgpmEOKrb44/k="; }; patches = [ @@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ris emily techknowlogick + lf- ]; }; }) From 35e14414047ec535b3b61a82c7703ade88784da6 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:21 -0700 Subject: [PATCH 0264/2279] wangle: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/wangle/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/wa/wangle/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 56928c88ffbd..baba9795b63a 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-S2L3ifQTwyidz3x5pPrVEGEJXvM1czqTRXYsYUqIeRY="; + hash = "sha256-lptILtCaVeO8yXlIYHaATfJw6VyPxUJCx7nxfOZVIIc="; }; patches = [ @@ -109,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From 032c4bb99b39006dc96bafc4e1b2d035702fcd97 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:36 -0700 Subject: [PATCH 0265/2279] fbthrift: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/fbthrift/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/fb/fbthrift/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 71e759c7def1..7eeb083253f4 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-4u3SbbmSgtvnW3/VH3CfQrEddAlkQuUl9dmnGGKL4mE="; + hash = "sha256-6Vlmb7PfPl9hyJkpH0vsF4mjNTOxd4lu8CWPE0rRvVo="; }; patches = [ @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From aaf02d92354935d59a2232a97de341d77cff7fce Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:41 -0700 Subject: [PATCH 0266/2279] fb303: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/fb303/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/fb/fb303/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 6c5017bde61b..8e607283bd85 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-6suO1SE8+WASQiHLtiieu3nrjEYqSPnKxw7nHkQ4br0="; + hash = "sha256-IF3fQY8QfDBo8DoLFIFuZD8OgrrJfXLXDgFcsD1CmaY="; }; patches = [ @@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From c6e06c55e947d383192c1d545433811908adb313 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Oct 2025 23:00:19 +0200 Subject: [PATCH 0267/2279] python313Packages.thermobeacon-ble: remove disabled --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index b9c986c09f9c..55261be555ca 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -7,7 +7,6 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, sensor-state-data, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "thermobeacon-ble"; From 4cd527d969eef3d54e8814582249f6aa1c3a0a6e Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 14 Oct 2025 22:08:16 +0100 Subject: [PATCH 0268/2279] gtk3: fix sincos detection with clang Backport GTK MR 5531 to fix sincos detection with clang on all platforms. The issue occurs because meson's function detection doesn't include proper headers or -D_GNU_SOURCE when checking for sincos(), causing it to fail detection even when the function is available (especially with clang). This backports the fix from GTK 4 (MR 5531) which was never backported to the gtk-3-24 branch. The patch adds proper headers and compiler flags to meson's function detection, and updates gtkgears.c to use a wrapper function that conditionally uses sincos() only when properly detected. Upstream MR: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531 See: https://github.com/NixOS/nixpkgs/pull/449689 --- pkgs/development/libraries/gtk/3.x.nix | 6 ++ .../gtk/patches/3.0-mr5531-backport.patch | 93 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index e37a40923d1a..00d85ff5d1a5 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -88,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch + # Backport of MR 5531 to fix sincos detection with clang + # Adds proper headers and -D_GNU_SOURCE to function checks + # MR 5531 was only merged into GTK 4, never backported to gtk-3-24 + # See: https://github.com/NixOS/nixpkgs/pull/449689 + # Upstream: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531 + ./patches/3.0-mr5531-backport.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # X11 module requires which is not installed on Darwin diff --git a/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch b/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch new file mode 100644 index 000000000000..afbfb1f95eb6 --- /dev/null +++ b/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch @@ -0,0 +1,93 @@ +From f1fb82c739aebc6b37090f8ebf74d856129116d3 Mon Sep 17 00:00:00 2001 +From: Matteo Pacini +Date: Tue, 14 Oct 2025 22:03:27 +0100 +Subject: [PATCH] Backport MR 5531: Fix sincos detection with clang + +Add proper headers and -D_GNU_SOURCE to function checks to ensure +functions like sincos are properly detected, especially with clang. + +Also fix gtkgears.c to avoid issues when sincos is in headers but +not detected by the build system. + +Backport of https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531 +adapted for GTK 3.24.49. +--- + meson.build | 10 +++++++++- + tests/gtkgears.c | 22 ++++++++++++---------- + 2 files changed, 21 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index 08337ec..92d7781 100644 +--- a/meson.build ++++ b/meson.build +@@ -255,7 +255,15 @@ check_functions = [ + ] + + foreach func : check_functions +- if cc.has_function(func, dependencies: libm) ++ if cc.has_function(func, ++ args: '-D_GNU_SOURCE', ++ prefix: ++ '#include \n' + ++ '#include \n' + ++ '#include \n' + ++ '#include \n' + ++ '#include ', ++ dependencies: libm) + cdata.set('HAVE_' + func.underscorify().to_upper(), 1) + endif + endforeach +diff --git a/tests/gtkgears.c b/tests/gtkgears.c +index 062b611..ba7e196 100644 +--- a/tests/gtkgears.c ++++ b/tests/gtkgears.c +@@ -48,14 +48,16 @@ + #define VERTICES_PER_TOOTH 34 + #define GEAR_VERTEX_STRIDE 6 + +-#ifndef HAVE_SINCOS +-static void +-sincos (double x, double *_sin, double *_cos) ++static inline void ++_sincos (double x, double *_sin, double *_cos) + { ++#ifdef HAVE_SINCOS ++ sincos (x, _sin, _cos); ++#else + *_sin = sin (x); + *_cos = cos (x); +-} + #endif ++} + + /** + * Struct describing the vertices in triangle strip +@@ -306,11 +308,11 @@ create_gear (GLfloat inner_radius, + struct point p[7]; + + /* Calculate needed sin/cos for varius angles */ +- sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]); +- sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]); +- sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]); +- sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]); +- sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]); ++ _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]); ++ _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]); ++ _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]); ++ _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]); ++ _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]); + + GEAR_POINT(p[0], r2, 1); + GEAR_POINT(p[1], r2, 2); +@@ -519,7 +521,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa + identity(tmp); + + deltaZ = zFar - zNear; +- sincos(radians, &sine, &cosine); ++ _sincos(radians, &sine, &cosine); + + if ((deltaZ == 0) || (sine == 0) || (aspect == 0)) + return; +-- +2.50.1 (Apple Git-155) + From f8de5310fb61991a8b01d6a18b1dbea812009da6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Oct 2025 00:24:52 +0200 Subject: [PATCH 0269/2279] python313: 3.13.8 -> 3.13.9 https://docs.python.org/release/3.13.9/whatsnew/changelog.html --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 41f5a41c8b0f..4bd13788e44f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "13"; - patch = "8"; + patch = "9"; suffix = ""; }; - hash = "sha256-uZEHMFJrKYKZtGs1WVztkFVyLfYMBq1jAfak4scoolI="; + hash = "sha256-7V7zTNo2z6Lzo0DwfKx+eBT5HH88QR9tNWIyOoZsXGY="; }; }; From fbe214434a678004f8631a8f893d5c089e534db9 Mon Sep 17 00:00:00 2001 From: Ivy Pierlot Date: Wed, 15 Oct 2025 11:15:29 +1100 Subject: [PATCH 0270/2279] buildEnv: change pathsToLink to json decoding --- pkgs/build-support/buildenv/builder.pl | 2 +- pkgs/build-support/buildenv/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index f2fdf36f79e5..f66acf3d5e75 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -15,7 +15,7 @@ $SIG{__DIE__} = sub { die "pkgs.buildEnv error: ", @_ }; my $out = $ENV{"out"}; my $extraPrefix = $ENV{"extraPrefix"}; -my @pathsToLink = split ' ', $ENV{"pathsToLink"}; +my @pathsToLink = @{decode_json $ENV{"pathsToLinkJSON"}}; sub isInPathsToLink($path) { $path = "/" if $path eq ""; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index dbeb2a629f20..5996239a16b4 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -105,6 +105,7 @@ lib.makeOverridable ( nativeBuildInputs buildInputs ; + pathsToLinkJSON = builtins.toJSON pathsToLink; pkgs = builtins.toJSON chosenOutputs; extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure); preferLocalBuild = true; From 53eb2ecc5472edff2620a35ddf75210412d91cde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 05:03:47 +0000 Subject: [PATCH 0271/2279] networkmanager-iodine: 1.2.0-unstable-2025-09-06 -> 1.2.0-unstable-2025-10-11 --- pkgs/by-name/ne/networkmanager-iodine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix index 423a68a9392b..084775b41a6f 100644 --- a/pkgs/by-name/ne/networkmanager-iodine/package.nix +++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation { pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}"; - version = "1.2.0-unstable-2025-09-06"; + version = "1.2.0-unstable-2025-10-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "network-manager-iodine"; - rev = "2a630d5c492521378160882864eb88277f6315cb"; - sha256 = "vSvvJVWtV+BHM3rDtgUWYlIOfhP80J3uDHPMwd0vvbM="; + rev = "ad266003aa74ddba1d22259b213a7f9c996e1cd4"; + sha256 = "OoJRkU4POW9RajwW05xYPlkodXqytq89GTbJuoLxebY="; }; patches = [ From ec2ce20ac487f459423d94320fd786577a61e4df Mon Sep 17 00:00:00 2001 From: Albert Larsan Date: Wed, 15 Oct 2025 12:04:51 +0200 Subject: [PATCH 0272/2279] nixos/systemd-networkd: Add missing option in netdev Tunnel It exists since systemd 254 (https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#IgnoreDontFragment=) --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 2a197362211f..ef037b816156 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -376,6 +376,7 @@ let "TOS" "TTL" "DiscoverPathMTU" + "IgnoreDontFragment" "IPv6FlowLabel" "CopyDSCP" "EncapsulationLimit" @@ -398,6 +399,7 @@ let (assertInt "TTL") (assertRange "TTL" 0 255) (assertValueOneOf "DiscoverPathMTU" boolValues) + (assertValueOneOf "IgnoreDontFragment" boolValues) (assertValueOneOf "CopyDSCP" boolValues) (assertValueOneOf "Mode" [ "ip6ip6" From 7031da6224a74d8901083e7c58826137324eda06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 10:32:59 +0000 Subject: [PATCH 0273/2279] python3Packages.httpx-sse: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/httpx-sse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix index af17e3a88124..c38464b96200 100644 --- a/pkgs/development/python-modules/httpx-sse/default.nix +++ b/pkgs/development/python-modules/httpx-sse/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "httpx-sse"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; src = fetchFromGitHub { owner = "florimondmanca"; repo = "httpx-sse"; tag = version; - hash = "sha256-bSozSZmbRU5sc3jvVUOAXQWVBA8GhzM2R26uPdabS+w="; + hash = "sha256-6DPbfJlbLmws9GkQ2zePGp4g0at4M32vrIDtmUPDkX4="; }; build-system = [ From e959031f9bc34b5e1a0cc149687c0381dcd94b0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 14:26:48 +0000 Subject: [PATCH 0274/2279] nvidia-container-toolkit: 1.17.8 -> 1.17.9 --- pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index 11bd87d34ed8..72e377fd7f42 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -13,13 +13,13 @@ let in buildGoModule (finalAttrs: { pname = "nvidia-container-toolkit"; - version = "1.17.8"; + version = "1.17.9"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-container-toolkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo="; + hash = "sha256-kcE4yDoj+CFbMy0N5v8ImxjZMJ/o5/LaAVVV1M7qGiw="; }; From b6be8a03a76d7b58d613389b6d99c92fc7c1488d Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 3 Sep 2025 01:32:53 +0100 Subject: [PATCH 0275/2279] haskell.compiler.ghc{948,967,984,9102,9103,9121,9122}: backport patches for LLVM support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LLVM 12–17 have been dropped for Nixpkgs 25.11. As discussed recently on Matrix, this backports upstream changes to allow the use of LLVM 20 for all GHC versions from 9.4.8 onward. I looked over GHC commits mentioning LLVM since the release of 9.4.8, and read the discussions and issues around the relevant bumps, and attempted to be quite thorough, but I obviously cannot guarantee that this is wholly comprehensive. It seems like upstream generally bumps the upper bound on the basis of “it builds successfully for me”, with specific adaptations for new versions being fairly uncommon and only coming for obvious build blockers or reactively in response to bug reports. I have backported both kinds of changes here. For some commits, trivial conflict resolutions and adaptations were required. It would be possible to pass the affected files to `fetchpatch` as `excludes` and keep smaller fix‐up patches in tree in some cases, but I opted to keep it simple and vendor complete backport patches instead. I did not attempt to backport every single change to the LLVM backend, only those that seemed directly relevant to support for newer versions; if you’d get the same issue with the older LLVM, that’s just a GHC bug. These changes should actually make it easier to cross‐compile for new architectures, as more recent LLVMs will have better support for newer platforms, and it will be easier to backport GHC changes to enable new platforms with less drift in the backend. These patches do result in two breaking changes. Firstly, the minimum LLVM version is bumped to 13 across the board. This is irrelevant for Nixpkgs as we pin a specific LLVM version anyway, and versions below LLVM 18 will be removed imminently. Secondly, support for the hidden `-fno-llvm-tbaa` flag is dropped. This can be replaced with custom `-optlo` flags to control the passes more directly, but the main use of this undocumented flag appears to have been to [work around] the lack of support for newer LLVM versions, anyway. [work around]: I successfully built the following on `aarch64-linux`: * `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc948` * `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc967` * `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc984` * `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc9102` * `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc9121` * `pkgsCross.armv7l-hf-multiplatform.buildPackages.haskell.compiler.ghc9122` * `pkgsCross.riscv64.haskell.compiler.ghc948` The GHC 9.4.8 with an ARMv7 host platform segfaults when I try to run GHC, though e.g. `ghc-pkg --help` runs successfully. The GHC 9.10.3 build targeting ARMv7 crashed inside `llc(1)`, so I tried RISC‐V, which has some platform mismatch issue relating to `libffi`, so I tried z/Architecture, which failed with an invalid floating point constant in the LLVM IR, so I tried 64‐bit MIPS, which failed with a different `libffi` issue, so I tried 32‐bit MIPS, which failed to compile `compiler-rt`, so I gave up. I confirmed that both of the ARMv7 issues reproduce with 944e8fd4f45f214f99e908eac4a69162cb9a4196, the revision before they were bumped from their old versions of LLVM, so these are not regressions. I built a test program with the ARMv7 cross‐compilers and confirmed that they run on the AArch64 builder. I also confirmed that the cross‐compiled RISC‐V GHC successfully runs under `qemu-riscv64(1)`. It will only try to build programs via the C backend, though, as that is the only option for unregisterised™ targets, so it’s not clear to me how useful LLVM support in 9.4.8 really is for bootstrapping new platforms; I guess even RISC‐V would require more backporting work to produce a cross‐compiled GHC that will use LLVM to compile its own input. I didn’t bother setting up all the binfmt machinery to get it through compiling and running a test program, but it at least makes the attempt. --- .../compilers/ghc/common-hadrian.nix | 6 +- .../compilers/ghc/common-llvm-patches.nix | 126 ++++++++++++++++ .../ghc/common-make-native-bignum.nix | 6 +- .../ghc-9.4-llvm-add-metadata-exports.patch | 31 ++++ ...9.4-llvm-allow-llvmlits-in-metaexprs.patch | 40 +++++ .../ghc-9.4-llvm-fix-stack-alignment.patch | 137 ++++++++++++++++++ .../ghc-9.4-llvm-fix-version-detection.patch | 103 +++++++++++++ .../ghc-9.4-llvm-use-new-pass-manager.patch | 87 +++++++++++ .../ghc/ghc-9.6-llvm-restore-import.patch | 12 ++ .../ghc-9.6-llvm-use-new-pass-manager.patch | 87 +++++++++++ .../ghc-9.8-llvm-use-new-pass-manager.patch | 92 ++++++++++++ .../haskell-modules/with-packages-wrapper.nix | 7 +- pkgs/top-level/haskell-packages.nix | 10 ++ 13 files changed, 732 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/compilers/ghc/common-llvm-patches.nix create mode 100644 pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch create mode 100644 pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 829c6a14edf6..b526b98e33bd 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -269,7 +269,9 @@ # Missing ELF symbols ++ lib.optionals stdenv.targetPlatform.isAndroid [ ./ghc-define-undefined-elf-st-visibility.patch - ]; + ] + + ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; }); stdenv = stdenvNoCC; }, @@ -859,8 +861,6 @@ stdenv.mkDerivation ( timeout = 24 * 3600; platforms = lib.platforms.all; inherit (bootPkgs.ghc.meta) license; - # To be fixed by . - broken = useLLVM; }; dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm; diff --git a/pkgs/development/compilers/ghc/common-llvm-patches.nix b/pkgs/development/compilers/ghc/common-llvm-patches.nix new file mode 100644 index 000000000000..999e77f44ad4 --- /dev/null +++ b/pkgs/development/compilers/ghc/common-llvm-patches.nix @@ -0,0 +1,126 @@ +{ + lib, + version, + fetchpatch, +}: + +# Backports for LLVM support. +# +# These primarily focus on backporting patches that are relevant to +# supporting newer LLVM versions, rather than aiming to backport every +# LLVM backend bug fix or improvement from newer GHC releases. +# +# Potentially of interest for cross‐compiling GHC 9.4.8 to LoongArch64: +# +# * +# * + +[ ] + +++ lib.optionals (lib.versionOlder version "9.6") [ + # + (fetchpatch { + name = "ghc-9.4-llvm-support-15.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/0cc16aaf89d7dc3963764b7193ceac73e4e3329b.patch"; + hash = "sha256-G0gqrj5iPuQ5JuC2+d151yka72XZMbrqMWPZd4EuT04="; + }) + + # + ./ghc-9.4-llvm-fix-version-detection.patch +] + +++ lib.optionals (lib.versionOlder version "9.8") [ + ( + # The upstream backport of !13763 in 9.6.7 removed an unused import + # that is required by the next series. + if lib.versionOlder version "9.6" then null else ./ghc-9.6-llvm-restore-import.patch + ) +] + +++ lib.optionals (lib.versionOlder version "9.10") [ + # + ( + if lib.versionOlder version "9.8" then + ./ghc-9.4-llvm-add-metadata-exports.patch + else + fetchpatch { + name = "ghc-9.8-llvm-add-metadata-exports.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/fcfc1777c22ad47613256c3c5e7304cfd29bc761.patch"; + hash = "sha256-9rpyeH8TUVeKoW4PA6qn7DG2+P9MhBCywmbi1O/NsTQ="; + } + ) + ( + if lib.versionOlder version "9.8" then + ./ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch + else + fetchpatch { + name = "ghc-9.8-llvm-allow-llvmlits-in-metaexprs.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5880fff6d353a14785c457999fded5a7100c9514.patch"; + hash = "sha256-NDMGNc0PYpWJUW+nI2YvMsBOWRIfNix4oWHQZAIxrVY="; + } + ) + ( + # `GHC.Driver.DynFlags` was not split out until 9.8, so this can be + # omitted with no functional effect on the rest of the series on + # earlier versions. + if lib.versionOlder version "9.8" then + null + else + fetchpatch { + name = "ghc-9.8-move-feature-predicates-to-dynflags.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/86ce92a2f81a04aa980da2891d0e300cb3cb7efd.patch"; + hash = "sha256-SzJgzq4b5wAMPz+/QSa67iSOxB2enqejvV0lsF0+9L8="; + } + ) + (fetchpatch { + name = "ghc-9.4-llvm-add-module-flag-metadata-infra.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/a6a3874276ced1b037365c059dcd0a758e813a5b.patch"; + hash = "sha256-tAYDRNXmpp5cZtyONpO8vlsDmnNEBbh4J3oSCy/uWWc="; + }) + ( + if lib.versionOlder version "9.8" then + ./ghc-9.4-llvm-fix-stack-alignment.patch + else + fetchpatch { + name = "ghc-9.8-llvm-fix-stack-alignment.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/e9af2cf3f16ab60b5c79ed91df95359b11784df6.patch"; + hash = "sha256-RmYwFN3c3AgJxF9KXWQLdwOgugzepCW1wcTdJX1h0C4="; + } + ) + + # + ( + if lib.versionOlder version "9.6" then + ./ghc-9.4-llvm-use-new-pass-manager.patch + else if lib.versionOlder version "9.8" then + ./ghc-9.6-llvm-use-new-pass-manager.patch + else + ./ghc-9.8-llvm-use-new-pass-manager.patch + ) +] + +++ lib.optionals (lib.versionOlder version "9.12") [ + # + (fetchpatch { + name = "ghc-9.4-llvm-support-16-17-18.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ae170155e82f1e5f78882f7a682d02a8e46a5823.patch"; + hash = "sha256-U1znWqXZTORmAg480p5TjTL53T2Zn+1+9Fnk2V1Drfs="; + }) + + # + (fetchpatch { + name = "ghc-9.4-llvm-support-19.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/36bbb167f354a2fbc6c4842755f2b1e374e3580e.patch"; + excludes = [ ".gitlab-ci.yml" ]; + hash = "sha256-v8T/FtriDPbibcIDZmU2yotBoDVo+wU2+gw+CCdQlm0="; + }) +] + +++ lib.optionals (lib.versionOlder version "9.14") [ + # + (fetchpatch { + name = "ghc-9.4-llvm-support-20.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ca03226db2db2696460bfcb8035dd3268d546706.patch"; + hash = "sha256-7cO049DQtJHUAhwPujoFO+zQtXsMg6VFTHtMDwenrKs="; + }) +] diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 3d147fe986e0..f1886f4a3bec 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -386,7 +386,9 @@ stdenv.mkDerivation ( # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch - ]; + ] + + ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; }); postPatch = "patchShebangs ."; @@ -671,8 +673,6 @@ stdenv.mkDerivation ( timeout = 24 * 3600; platforms = lib.platforms.all; inherit (bootPkgs.ghc.meta) license; - # To be fixed by . - broken = useLLVM; }; } diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch new file mode 100644 index 000000000000..ec2fa19d452c --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch @@ -0,0 +1,31 @@ +From 701154fdbceff2edb121768eb660713a98580af8 Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Tue, 22 Aug 2023 12:23:26 -0400 +Subject: [PATCH] llvmGen: Add export list to GHC.Llvm.MetaData + +(cherry picked from commit fcfc1777c22ad47613256c3c5e7304cfd29bc761) +--- + compiler/GHC/Llvm/MetaData.hs | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs +index f46ae0a101..3526c11bc3 100644 +--- a/compiler/GHC/Llvm/MetaData.hs ++++ b/compiler/GHC/Llvm/MetaData.hs +@@ -1,6 +1,12 @@ + {-# LANGUAGE GeneralizedNewtypeDeriving #-} + +-module GHC.Llvm.MetaData where ++module GHC.Llvm.MetaData ++ ( MetaId(..) ++ , ppr ++ , MetaExpr(..) ++ , MetaAnnot(..) ++ , MetaDecl(..) ++ ) where + + import GHC.Prelude + +-- +2.50.1 + diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch new file mode 100644 index 000000000000..6c34f9800472 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch @@ -0,0 +1,40 @@ +From 51765e343e9829f1d3e95d1d7303fa3594ae91cc Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Tue, 22 Aug 2023 12:24:53 -0400 +Subject: [PATCH] llvmGen: Allow LlvmLits in MetaExprs + +This omission appears to be an oversight. + +(cherry picked from commit 5880fff6d353a14785c457999fded5a7100c9514) +--- + compiler/GHC/Llvm/MetaData.hs | 1 + + compiler/GHC/Llvm/Ppr.hs | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs +index f46ae0a101..121cdd5788 100644 +--- a/compiler/GHC/Llvm/MetaData.hs ++++ b/compiler/GHC/Llvm/MetaData.hs +@@ -68,6 +68,7 @@ instance Outputable MetaId where + + -- | LLVM metadata expressions + data MetaExpr = MetaStr !LMString ++ | MetaLit !LlvmLit + | MetaNode !MetaId + | MetaVar !LlvmVar + | MetaStruct [MetaExpr] +diff --git a/compiler/GHC/Llvm/Ppr.hs b/compiler/GHC/Llvm/Ppr.hs +index f48e7aa034..bc88a13439 100644 +--- a/compiler/GHC/Llvm/Ppr.hs ++++ b/compiler/GHC/Llvm/Ppr.hs +@@ -256,6 +256,7 @@ ppMetaExpr :: LlvmCgConfig -> MetaExpr -> SDoc + ppMetaExpr opts = \case + MetaVar (LMLitVar (LMNullLit _)) -> text "null" + MetaStr s -> char '!' <> doubleQuotes (ftext s) ++ MetaLit l -> ppTypeLit opts l + MetaNode n -> ppr n + MetaVar v -> ppVar opts v + MetaStruct es -> char '!' <> braces (ppCommaJoin (map (ppMetaExpr opts) es)) +-- +2.50.1 + diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch new file mode 100644 index 000000000000..23c4e0717c5e --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch @@ -0,0 +1,137 @@ +From 646d62e74c16be785ef08735ae5b24f4af6bcf78 Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Tue, 22 Aug 2023 13:26:58 -0400 +Subject: [PATCH] llvmGen: Don't pass stack alignment via command line + +As of https://reviews.llvm.org/D103048 LLVM no longer supports the +`-stack-alignment=...` flag. Instead this information is passed via a +module flag metadata node. + +This requires dropping support for LLVM 11 and 12. + +Fixes #23870 + +(cherry picked from commit e9af2cf3f16ab60b5c79ed91df95359b11784df6) +--- + compiler/GHC/CmmToLlvm.hs | 29 ++++++++++++++++++++++++- + compiler/GHC/CmmToLlvm/Config.hs | 1 + + compiler/GHC/Driver/Config/CmmToLlvm.hs | 1 + + compiler/GHC/Driver/Pipeline/Execute.hs | 7 ------ + configure.ac | 2 +- + 5 files changed, 31 insertions(+), 9 deletions(-) + +diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs +index 7d48693765..b9036daef1 100644 +--- a/compiler/GHC/CmmToLlvm.hs ++++ b/compiler/GHC/CmmToLlvm.hs +@@ -190,7 +190,7 @@ cmmLlvmGen _ = return () + + cmmMetaLlvmPrelude :: LlvmM () + cmmMetaLlvmPrelude = do +- metas <- flip mapM stgTBAA $ \(uniq, name, parent) -> do ++ tbaa_metas <- flip mapM stgTBAA $ \(uniq, name, parent) -> do + -- Generate / lookup meta data IDs + tbaaId <- getMetaUniqueId + setUniqMeta uniq tbaaId +@@ -203,9 +203,36 @@ cmmMetaLlvmPrelude = do + -- just a name on its own. Previously `null` was accepted as the + -- name. + Nothing -> [ MetaStr name ] ++ ++ platform <- getPlatform ++ cfg <- getConfig ++ let stack_alignment_metas = ++ case platformArch platform of ++ ArchX86_64 | llvmCgAvxEnabled cfg -> [mkStackAlignmentMeta 32] ++ _ -> [] ++ module_flags_metas <- mkModuleFlagsMeta stack_alignment_metas ++ let metas = tbaa_metas ++ module_flags_metas + cfg <- getConfig + renderLlvm $ ppLlvmMetas cfg metas + ++mkNamedMeta :: LMString -> [MetaExpr] -> LlvmM [MetaDecl] ++mkNamedMeta name exprs = do ++ (ids, decls) <- unzip <$> mapM f exprs ++ return $ decls ++ [MetaNamed name ids] ++ where ++ f expr = do ++ i <- getMetaUniqueId ++ return (i, MetaUnnamed i expr) ++ ++mkModuleFlagsMeta :: [ModuleFlag] -> LlvmM [MetaDecl] ++mkModuleFlagsMeta = ++ mkNamedMeta "llvm.module.flags" . map moduleFlagToMetaExpr ++ ++mkStackAlignmentMeta :: Integer -> ModuleFlag ++mkStackAlignmentMeta alignment = ++ ModuleFlag MFBError "override-stack-alignment" (MetaLit $ LMIntLit alignment i32) ++ ++ + -- ----------------------------------------------------------------------------- + -- | Marks variables as used where necessary + -- +diff --git a/compiler/GHC/CmmToLlvm/Config.hs b/compiler/GHC/CmmToLlvm/Config.hs +index 649a33c2f6..ecab7fdcc1 100644 +--- a/compiler/GHC/CmmToLlvm/Config.hs ++++ b/compiler/GHC/CmmToLlvm/Config.hs +@@ -36,6 +36,7 @@ data LlvmCgConfig = LlvmCgConfig + , llvmCgContext :: !SDocContext -- ^ Context for LLVM code generation + , llvmCgFillUndefWithGarbage :: !Bool -- ^ Fill undefined literals with garbage values + , llvmCgSplitSection :: !Bool -- ^ Split sections ++ , llvmCgAvxEnabled :: !Bool + , llvmCgBmiVersion :: Maybe BmiVersion -- ^ (x86) BMI instructions + , llvmCgLlvmVersion :: Maybe LlvmVersion -- ^ version of Llvm we're using + , llvmCgDoWarn :: !Bool -- ^ True ==> warn unsupported Llvm version +diff --git a/compiler/GHC/Driver/Config/CmmToLlvm.hs b/compiler/GHC/Driver/Config/CmmToLlvm.hs +index 8097bbec7e..752ba987ca 100644 +--- a/compiler/GHC/Driver/Config/CmmToLlvm.hs ++++ b/compiler/GHC/Driver/Config/CmmToLlvm.hs +@@ -23,6 +23,7 @@ initLlvmCgConfig logger config_cache dflags = do + , llvmCgContext = initSDocContext dflags PprCode + , llvmCgFillUndefWithGarbage = gopt Opt_LlvmFillUndefWithGarbage dflags + , llvmCgSplitSection = gopt Opt_SplitSections dflags ++ , llvmCgAvxEnabled = isAvxEnabled dflags + , llvmCgBmiVersion = case platformArch (targetPlatform dflags) of + ArchX86_64 -> bmiVersion dflags + ArchX86 -> bmiVersion dflags +diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs +index fac2a595f2..4fa72be475 100644 +--- a/compiler/GHC/Driver/Pipeline/Execute.hs ++++ b/compiler/GHC/Driver/Pipeline/Execute.hs +@@ -992,8 +992,6 @@ llvmOptions llvm_config dflags = + [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ] + ++ [("-relocation-model=" ++ rmodel + ,"-relocation-model=" ++ rmodel) | not (null rmodel)] +- ++ [("-stack-alignment=" ++ (show align) +- ,"-stack-alignment=" ++ (show align)) | align > 0 ] + + -- Additional llc flags + ++ [("", "-mcpu=" ++ mcpu) | not (null mcpu) +@@ -1012,11 +1010,6 @@ llvmOptions llvm_config dflags = + + platform = targetPlatform dflags + +- align :: Int +- align = case platformArch platform of +- ArchX86_64 | isAvxEnabled dflags -> 32 +- _ -> 0 +- + attrs :: String + attrs = intercalate "," $ mattr + ++ ["+sse42" | isSse4_2Enabled dflags ] +diff --git a/configure.ac b/configure.ac +index 16f2e8b339..0440d5051b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -555,7 +555,7 @@ AC_SUBST(InstallNameToolCmd) + # tools we are looking for. In the past, GHC supported a number of + # versions of LLVM simultaneously, but that stopped working around + # 3.5/3.6 release of LLVM. +-LlvmMinVersion=11 # inclusive ++LlvmMinVersion=13 # inclusive + LlvmMaxVersion=16 # not inclusive + AC_SUBST([LlvmMinVersion]) + AC_SUBST([LlvmMaxVersion]) +-- +2.50.1 + diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch new file mode 100644 index 000000000000..721909363d6b --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch @@ -0,0 +1,103 @@ +From c1229507e29e5c44b6f23d6f2afb5d55e7fb9606 Mon Sep 17 00:00:00 2001 +From: ARATA Mizuki +Date: Wed, 25 Dec 2024 22:50:46 +0900 +Subject: [PATCH] Fix LLVM version detection + +With a recent LLVM, `llc -version` emits the version on the first line +if the vendor is set. It emits the version on the second line +otherwise. + +Therefore, we need to check the both lines to detect the version. + +GHC now emits a warning if it fails to detect the LLVM version, +so we can notice if the output of `llc -version` changes in the future. + +Also, the warning for using LLVM < 10 on s390x is removed, because +we assume LLVM >= 13 now. + +This fixes the definition of __GLASGOW_HASKELL_LLVM__ macro. + +Fixes #25606 + +(cherry picked from commit a928c326011f1a6bef3289a4c36d4e19b5951229) +--- + compiler/GHC/CmmToLlvm.hs | 14 ++++++++------ + compiler/GHC/SysTools/Tasks.hs | 13 ++++++++----- + docs/users_guide/phases.rst | 2 +- + 3 files changed, 17 insertions(+), 12 deletions(-) + +diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs +index ecf111c636..76541c477c 100644 +--- a/compiler/GHC/CmmToLlvm.hs ++++ b/compiler/GHC/CmmToLlvm.hs +@@ -38,7 +38,7 @@ import GHC.Utils.Logger + import qualified GHC.Data.Stream as Stream + + import Control.Monad ( when, forM_ ) +-import Data.Maybe ( fromMaybe, catMaybes ) ++import Data.Maybe ( fromMaybe, catMaybes, isNothing ) + import System.IO + + -- ----------------------------------------------------------------------------- +@@ -68,11 +68,13 @@ llvmCodeGen logger cfg h cmm_stream + "up to" <+> text (llvmVersionStr supportedLlvmVersionUpperBound) <+> "(non inclusive) is supported." <+> + "System LLVM version: " <> text (llvmVersionStr ver) $$ + "We will try though..." +- let isS390X = platformArch (llvmCgPlatform cfg) == ArchS390X +- let major_ver = head . llvmVersionList $ ver +- when (isS390X && major_ver < 10 && doWarn) $ putMsg logger $ +- "Warning: For s390x the GHC calling convention is only supported since LLVM version 10." <+> +- "You are using LLVM version: " <> text (llvmVersionStr ver) ++ ++ when (isNothing mb_ver) $ do ++ let doWarn = llvmCgDoWarn cfg ++ when doWarn $ putMsg logger $ ++ "Failed to detect LLVM version!" $$ ++ "Make sure LLVM is installed correctly." $$ ++ "We will try though..." + + -- HACK: the Nothing case here is potentially wrong here but we + -- currently don't use the LLVM version to guide code generation +diff --git a/compiler/GHC/SysTools/Tasks.hs b/compiler/GHC/SysTools/Tasks.hs +index 7cd5188d5f..165e1602cf 100644 +--- a/compiler/GHC/SysTools/Tasks.hs ++++ b/compiler/GHC/SysTools/Tasks.hs +@@ -236,14 +236,17 @@ figureLlvmVersion logger dflags = traceToolCommand logger "llc" $ do + (pin, pout, perr, p) <- runInteractiveProcess pgm args' + Nothing Nothing + {- > llc -version +- LLVM (http://llvm.org/): +- LLVM version 3.5.2 ++ LLVM version 15.0.7 + ... ++ OR ++ LLVM (http://llvm.org/): ++ LLVM version 14.0.6 + -} + hSetBinaryMode pout False +- _ <- hGetLine pout +- vline <- hGetLine pout +- let mb_ver = parseLlvmVersion vline ++ line1 <- hGetLine pout ++ mb_ver <- case parseLlvmVersion line1 of ++ mb_ver@(Just _) -> return mb_ver ++ Nothing -> parseLlvmVersion <$> hGetLine pout -- Try the second line + hClose pin + hClose pout + hClose perr +diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst +index 6a2d4b3c20..9ccd2aa034 100644 +--- a/docs/users_guide/phases.rst ++++ b/docs/users_guide/phases.rst +@@ -474,7 +474,7 @@ defined by your local GHC installation, the following trick is useful: + .. index:: + single: __GLASGOW_HASKELL_LLVM__ + +- Only defined when `:ghc-flag:`-fllvm` is specified. When GHC is using version ++ Only defined when :ghc-flag:`-fllvm` is specified. When GHC is using version + ``x.y.z`` of LLVM, the value of ``__GLASGOW_HASKELL_LLVM__`` is the + integer ⟨xyy⟩ (if ⟨y⟩ is a single digit, then a leading zero + is added, so for example when using version 3.7 of LLVM, +-- +2.50.1 + diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch new file mode 100644 index 000000000000..6fbaa6b6c36a --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch @@ -0,0 +1,87 @@ +From 857d84f43f288019d6b926ac562f0d3eff30bc1e Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Wed, 31 Jan 2024 08:58:58 -0500 +Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager. + +We now must use `-passes` in place of `-O` due to #21936. + +Closes #21936. + +(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796) +--- + compiler/GHC/Driver/Flags.hs | 2 -- + compiler/GHC/Driver/Pipeline/Execute.hs | 3 +-- + compiler/GHC/Driver/Session.hs | 2 -- + llvm-passes | 6 +++--- + 4 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs +index 8f6c37d5a7..2e5189f42f 100644 +--- a/compiler/GHC/Driver/Flags.hs ++++ b/compiler/GHC/Driver/Flags.hs +@@ -213,7 +213,6 @@ data GeneralFlag + | Opt_RegsGraph -- do graph coloring register allocation + | Opt_RegsIterative -- do iterative coalescing graph coloring register allocation + | Opt_PedanticBottoms -- Be picky about how we treat bottom +- | Opt_LlvmTBAA -- Use LLVM TBAA infrastructure for improving AA (hidden flag) + | Opt_LlvmFillUndefWithGarbage -- Testing for undef bugs (hidden flag) + | Opt_IrrefutableTuples + | Opt_CmmSink +@@ -446,7 +445,6 @@ optimisationFlags = EnumSet.fromList + , Opt_RegsGraph + , Opt_RegsIterative + , Opt_PedanticBottoms +- , Opt_LlvmTBAA + , Opt_LlvmFillUndefWithGarbage + , Opt_IrrefutableTuples + , Opt_CmmSink +diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs +index b78ed19160..8c752f5546 100644 +--- a/compiler/GHC/Driver/Pipeline/Execute.hs ++++ b/compiler/GHC/Driver/Pipeline/Execute.hs +@@ -882,8 +882,7 @@ getOutputFilename logger tmpfs stop_phase output basename dflags next_phase mayb + llvmOptions :: DynFlags + -> [(String, String)] -- ^ pairs of (opt, llc) arguments + llvmOptions dflags = +- [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ] +- ++ [("-relocation-model=" ++ rmodel ++ [("-relocation-model=" ++ rmodel + ,"-relocation-model=" ++ rmodel) | not (null rmodel)] + + -- Additional llc flags +diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs +index 51d27cd0f8..ae8566ffb2 100644 +--- a/compiler/GHC/Driver/Session.hs ++++ b/compiler/GHC/Driver/Session.hs +@@ -3457,7 +3457,6 @@ fFlagsDeps = [ + flagSpec "late-dmd-anal" Opt_LateDmdAnal, + flagSpec "late-specialise" Opt_LateSpecialise, + flagSpec "liberate-case" Opt_LiberateCase, +- flagHiddenSpec "llvm-tbaa" Opt_LlvmTBAA, + flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage, + flagSpec "loopification" Opt_Loopification, + flagSpec "block-layout-cfg" Opt_CfgBlocklayout, +@@ -3992,7 +3991,6 @@ optLevelFlags :: [([Int], GeneralFlag)] + optLevelFlags -- see Note [Documenting optimisation flags] + = [ ([0,1,2], Opt_DoLambdaEtaExpansion) + , ([0,1,2], Opt_DoEtaReduction) -- See Note [Eta-reduction in -O0] +- , ([0,1,2], Opt_LlvmTBAA) + , ([0,1,2], Opt_ProfManualCcs ) + , ([2], Opt_DictsStrict) + +diff --git a/llvm-passes b/llvm-passes +index 52d203e745..0ee2889d32 100644 +--- a/llvm-passes ++++ b/llvm-passes +@@ -1,5 +1,5 @@ + [ +-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"), +-(1, "-enable-new-pm=0 -O1 -globalopt"), +-(2, "-enable-new-pm=0 -O2") ++(0, "-passes=function(require),function(mem2reg),globalopt,function(lower-expect)"), ++(1, "-passes=default"), ++(2, "-passes=default") + ] +-- +2.50.1 + diff --git a/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch b/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch new file mode 100644 index 000000000000..01f933bebc7d --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch @@ -0,0 +1,12 @@ +diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs +index 7d48693765..6290779a44 100644 +--- a/compiler/GHC/CmmToLlvm.hs ++++ b/compiler/GHC/CmmToLlvm.hs +@@ -28,6 +28,7 @@ + + import GHC.Utils.BufHandle + import GHC.Driver.Session ++import GHC.Platform ( platformArch, Arch(..) ) + import GHC.Utils.Error + import GHC.Data.FastString + import GHC.Utils.Outputable diff --git a/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch new file mode 100644 index 000000000000..e42ae9151a1a --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch @@ -0,0 +1,87 @@ +From 291a336ac81d009b66a2d09c3bb5271e40646e15 Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Wed, 31 Jan 2024 08:58:58 -0500 +Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager. + +We now must use `-passes` in place of `-O` due to #21936. + +Closes #21936. + +(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796) +--- + compiler/GHC/Driver/Flags.hs | 2 -- + compiler/GHC/Driver/Pipeline/Execute.hs | 3 +-- + compiler/GHC/Driver/Session.hs | 2 -- + llvm-passes | 6 +++--- + 4 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs +index bd9e3355f0..970dba81d0 100644 +--- a/compiler/GHC/Driver/Flags.hs ++++ b/compiler/GHC/Driver/Flags.hs +@@ -273,7 +273,6 @@ data GeneralFlag + | Opt_RegsGraph -- do graph coloring register allocation + | Opt_RegsIterative -- do iterative coalescing graph coloring register allocation + | Opt_PedanticBottoms -- Be picky about how we treat bottom +- | Opt_LlvmTBAA -- Use LLVM TBAA infrastructure for improving AA (hidden flag) + | Opt_LlvmFillUndefWithGarbage -- Testing for undef bugs (hidden flag) + | Opt_IrrefutableTuples + | Opt_CmmSink +@@ -511,7 +510,6 @@ optimisationFlags = EnumSet.fromList + , Opt_EnableRewriteRules + , Opt_RegsGraph + , Opt_RegsIterative +- , Opt_LlvmTBAA + , Opt_IrrefutableTuples + , Opt_CmmSink + , Opt_CmmElimCommonBlocks +diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs +index 4fa72be475..d63b409fc1 100644 +--- a/compiler/GHC/Driver/Pipeline/Execute.hs ++++ b/compiler/GHC/Driver/Pipeline/Execute.hs +@@ -989,8 +989,7 @@ llvmOptions :: LlvmConfig + -> DynFlags + -> [(String, String)] -- ^ pairs of (opt, llc) arguments + llvmOptions llvm_config dflags = +- [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ] +- ++ [("-relocation-model=" ++ rmodel ++ [("-relocation-model=" ++ rmodel + ,"-relocation-model=" ++ rmodel) | not (null rmodel)] + + -- Additional llc flags +diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs +index 21d27c406e..9656f1d247 100644 +--- a/compiler/GHC/Driver/Session.hs ++++ b/compiler/GHC/Driver/Session.hs +@@ -3431,7 +3431,6 @@ fFlagsDeps = [ + flagSpec "late-dmd-anal" Opt_LateDmdAnal, + flagSpec "late-specialise" Opt_LateSpecialise, + flagSpec "liberate-case" Opt_LiberateCase, +- flagHiddenSpec "llvm-tbaa" Opt_LlvmTBAA, + flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage, + flagSpec "loopification" Opt_Loopification, + flagSpec "block-layout-cfg" Opt_CfgBlocklayout, +@@ -3992,7 +3991,6 @@ optLevelFlags :: [([Int], GeneralFlag)] + optLevelFlags -- see Note [Documenting optimisation flags] + = [ ([0,1,2], Opt_DoLambdaEtaExpansion) + , ([0,1,2], Opt_DoEtaReduction) -- See Note [Eta-reduction in -O0] +- , ([0,1,2], Opt_LlvmTBAA) + , ([0,1,2], Opt_ProfManualCcs ) + , ([2], Opt_DictsStrict) + +diff --git a/llvm-passes b/llvm-passes +index 52d203e745..0ee2889d32 100644 +--- a/llvm-passes ++++ b/llvm-passes +@@ -1,5 +1,5 @@ + [ +-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"), +-(1, "-enable-new-pm=0 -O1 -globalopt"), +-(2, "-enable-new-pm=0 -O2") ++(0, "-passes=function(require),function(mem2reg),globalopt,function(lower-expect)"), ++(1, "-passes=default"), ++(2, "-passes=default") + ] +-- +2.50.1 + diff --git a/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch new file mode 100644 index 000000000000..1ed19d9d5d46 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch @@ -0,0 +1,92 @@ +From c7667212c958ef00926986782b8e1ac173bce0f9 Mon Sep 17 00:00:00 2001 +From: Ben Gamari +Date: Wed, 31 Jan 2024 08:58:58 -0500 +Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager. + +We now must use `-passes` in place of `-O` due to #21936. + +Closes #21936. + +(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796) +--- + compiler/GHC/Driver/DynFlags.hs | 1 - + compiler/GHC/Driver/Flags.hs | 2 -- + compiler/GHC/Driver/Pipeline/Execute.hs | 3 +-- + compiler/GHC/Driver/Session.hs | 1 - + llvm-passes | 6 +++--- + 5 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/compiler/GHC/Driver/DynFlags.hs b/compiler/GHC/Driver/DynFlags.hs +index ac9e6581cf..edc92e35ad 100644 +--- a/compiler/GHC/Driver/DynFlags.hs ++++ b/compiler/GHC/Driver/DynFlags.hs +@@ -1261,7 +1261,6 @@ optLevelFlags :: [([Int], GeneralFlag)] + optLevelFlags -- see Note [Documenting optimisation flags] + = [ ([0,1,2], Opt_DoLambdaEtaExpansion) + , ([0,1,2], Opt_DoEtaReduction) -- See Note [Eta-reduction in -O0] +- , ([0,1,2], Opt_LlvmTBAA) + , ([0,1,2], Opt_ProfManualCcs ) + , ([2], Opt_DictsStrict) + +diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs +index 0f6715f3cb..32e52b4b9a 100644 +--- a/compiler/GHC/Driver/Flags.hs ++++ b/compiler/GHC/Driver/Flags.hs +@@ -285,7 +285,6 @@ data GeneralFlag + | Opt_RegsGraph -- do graph coloring register allocation + | Opt_RegsIterative -- do iterative coalescing graph coloring register allocation + | Opt_PedanticBottoms -- Be picky about how we treat bottom +- | Opt_LlvmTBAA -- Use LLVM TBAA infrastructure for improving AA (hidden flag) + | Opt_LlvmFillUndefWithGarbage -- Testing for undef bugs (hidden flag) + | Opt_IrrefutableTuples + | Opt_CmmSink +@@ -525,7 +524,6 @@ optimisationFlags = EnumSet.fromList + , Opt_EnableRewriteRules + , Opt_RegsGraph + , Opt_RegsIterative +- , Opt_LlvmTBAA + , Opt_IrrefutableTuples + , Opt_CmmSink + , Opt_CmmElimCommonBlocks +diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs +index 40d0aec44a..ca5c13442a 100644 +--- a/compiler/GHC/Driver/Pipeline/Execute.hs ++++ b/compiler/GHC/Driver/Pipeline/Execute.hs +@@ -968,8 +968,7 @@ llvmOptions :: LlvmConfig + -> DynFlags + -> [(String, String)] -- ^ pairs of (opt, llc) arguments + llvmOptions llvm_config dflags = +- [("-enable-tbaa -tbaa", "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ] +- ++ [("-relocation-model=" ++ rmodel ++ [("-relocation-model=" ++ rmodel + ,"-relocation-model=" ++ rmodel) | not (null rmodel)] + + -- Additional llc flags +diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs +index 582fa5bd8d..1c19f8368b 100644 +--- a/compiler/GHC/Driver/Session.hs ++++ b/compiler/GHC/Driver/Session.hs +@@ -2401,7 +2401,6 @@ fFlagsDeps = [ + flagSpec "late-dmd-anal" Opt_LateDmdAnal, + flagSpec "late-specialise" Opt_LateSpecialise, + flagSpec "liberate-case" Opt_LiberateCase, +- flagHiddenSpec "llvm-tbaa" Opt_LlvmTBAA, + flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage, + flagSpec "loopification" Opt_Loopification, + flagSpec "block-layout-cfg" Opt_CfgBlocklayout, +diff --git a/llvm-passes b/llvm-passes +index 52d203e745..0ee2889d32 100644 +--- a/llvm-passes ++++ b/llvm-passes +@@ -1,5 +1,5 @@ + [ +-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"), +-(1, "-enable-new-pm=0 -O1 -globalopt"), +-(2, "-enable-new-pm=0 -O2") ++(0, "-passes=function(require),function(mem2reg),globalopt,function(lower-expect)"), ++(1, "-passes=default"), ++(2, "-passes=default") + ] +-- +2.50.1 + diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index f95ca4b2e717..ab227224da84 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -182,7 +182,7 @@ else + postBuild; preferLocalBuild = true; passthru = { - inherit (ghc) version targetPrefix; + inherit (ghc) version meta targetPrefix; hoogle = hoogleWithPackages'; @@ -203,9 +203,4 @@ else Also note that withLLVM has been renamed to useLLVM for consistency with the GHC Nix expressions.''; }; - pos = __curPos; - meta = ghc.meta // { - # To be fixed by . - broken = useLLVM; - }; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d81d257c868b..8ee2e48f6d23 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -46,6 +46,16 @@ let # Use this rather than `rec { ... }` below for sake of overlays. inherit (pkgs.haskell) compiler packages; + # The GHC LLVM backend rarely sees significant changes relating to + # LLVM version support, as it uses the textual IR format and invokes + # the LLVM binary tools rather than linking to the C++ libraries. + # + # Consider backporting upstream GHC changes to support new LLVM + # versions in `common-llvm-patches.nix` to allow the version to be + # shared across our supported versions of GHC. If the required + # changes are too invasive, it’s fine to decouple individual versions + # from this default or disable their LLVM support if it’s not load‐ + # bearing (e.g. GHC 9.4.8 is important for cross‐compiling GHC). buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20; llvmPackages = pkgs.llvmPackages_20; From c18a35bdb2dfeae00701f180e85c704c51eee717 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Oct 2025 16:44:09 +0100 Subject: [PATCH 0276/2279] doc/rl-2511: move Darwin libc++ release note further down This is less relevant to users than version support. --- doc/release-notes/rl-2511.section.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index acd5f951ec5a..8d2e36d9035c 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -12,15 +12,15 @@ - The default GHC version has been updated from 9.8 to 9.10. `haskellPackages` correspondingly uses Stackage LTS 24 (instead of LTS 23) as a baseline. -- Darwin has switched to using the system libc++. This was done for improved compatibility and to avoid ODR violations. - If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target. - See the Darwin platform documentation for more details. - - **This release of Nixpkgs requires macOS Sonoma 14.0 or newer, as announced in the 25.05 release notes.** The default SDK is now 14.4, but the minimum version is 14.0. cc-wrapper will enforce that availability annotations are used or an appropriate deployment target is set. See the Darwin platform notes for details. +- Darwin has switched to using the system libc++. This was done for improved compatibility and to avoid ODR violations. + If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target. + See the Darwin platform documentation for more details. + - LLVM has been updated from 19 to 21. ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities} From 2b3df3961657bcbb3a368e8f10aca0d3b290f522 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Oct 2025 18:06:37 +0200 Subject: [PATCH 0277/2279] python3Packages.time-machine: 2.16.0 -> 2.19.0 https://github.com/adamchainz/time-machine/blob/refs/tags/2.19.0/CHANGELOG.rst --- .../python-modules/time-machine/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index b7d5585e8617..0ac251fe8020 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -2,25 +2,22 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, - pythonOlder, setuptools, python-dateutil, + tokenize-rt, pytestCheckHook, }: buildPythonPackage rec { pname = "time-machine"; - version = "2.16.0"; + version = "2.19.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "adamchainz"; repo = "time-machine"; tag = version; - hash = "sha256-xNoLtgON1dfKAgK0XhSMLHLsUr/nST3lepy15YWDEcE="; + hash = "sha256-bPpn+RNlvy/tkFrxDY4Q13fNlNuMFj1+br8M2uU3t9A="; }; build-system = [ setuptools ]; @@ -29,9 +26,16 @@ buildPythonPackage rec { python-dateutil ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies.cli = [ + tokenize-rt + ]; - disabledTests = lib.optionals (pythonAtLeast "3.9") [ + nativeCheckInputs = [ + pytestCheckHook + ] + ++ optional-dependencies.cli; + + disabledTests = [ # https://github.com/adamchainz/time-machine/issues/405 "test_destination_string_naive" # Assertion Errors related to Africa/Addis_Ababa From a0e48fec74df3eaa791239fdc6cb513a00854c1b Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 10 Jun 2025 13:12:01 +0100 Subject: [PATCH 0278/2279] doc/rl-2511: announce projected `x86_64-darwin` deprecation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit macOS 27 is going to drop Intel support, so we’re pre‐announcing the inevitable so that people can prepare. We already announced that we’re aligning our OS support policy with Apple’s starting in 25.11, so it’s very unlikely that we could justify making an exception to devote resources to `x86_64-darwin` support in 28.11 and beyond, after Apple stop releasing security updates for the platform. However, the end of support in Nixpkgs may come sooner than that. Apple have announced that [Rosetta 2 will be pared down] by macOS 28 to not support emulation of arbitrary applications. We use `aarch64-darwin` builder machines exclusively and rely on Rosetta 2 to build packages for `x86_64-darwin`. As we try to keep the builders on the latest OS versions, that would mean that we’d lose the ability to build for `x86_64-darwin` around the release of 27.11, unless we held back on updating the OS on the builders for a year. [Rosetta 2 will be pared down]: https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment Additionally, `x86_64-darwin` is the slowest system to build due to our limited Mac builder resources and the emulation overhead. Dropping support will more than double our effective `aarch64-darwin` build capacity and benefit the whole project by reducing the bottleneck on world rebuilds during `staging-next` cycles. It’s hard to find good data on the relative market share, but the May 2025 [Steam Hardware Survey] shows over 80% of their macOS users already being on Apple Silicon. Therefore, I’d personally expect us to drop support by 26.11, given the trade‐off between the resources it will take to continue supporting `x86_64-darwin` and the number of users it is likely to benefit. (And I’m typing this on a Intel Mac myself…) [Steam Hardware Survey]: https://store.steampowered.com/hwsurvey/processormfg/ --- doc/release-notes/rl-2511.section.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 8d2e36d9035c..748011d46dcb 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -17,6 +17,13 @@ cc-wrapper will enforce that availability annotations are used or an appropriate deployment target is set. See the Darwin platform notes for details. +- **We expect to drop support for `x86_64-darwin` by Nixpkgs 26.11,** in light of Apple’s announcement that macOS 26 will be the final version to support Intel Macs. + When support is fully removed, we will no longer build packages for the platform or guarantee that it can build at all. + This may happen in stages, depending on our available build and maintenance resources and decisions made by projects we rely on. + + By the time of 26.11’s release, Homebrew will offer only limited [Tier 3](https://docs.brew.sh/Support-Tiers#tier-3) support for the platform, but MacPorts will likely continue to support it for a long time. + We also recommend users consider installing NixOS, which should continue to run on essentially all Intel Macs, especially after Apple stops security support for macOS 26 in 2028. + - Darwin has switched to using the system libc++. This was done for improved compatibility and to avoid ODR violations. If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target. See the Darwin platform documentation for more details. From 09a983f4cab4044d2798b3f54db700ce924389fd Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 16 Oct 2025 00:23:33 +0800 Subject: [PATCH 0279/2279] uv: 0.9.2 -> 0.9.3 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 878b11a3735a..9bd7da06a174 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-qT5A3nzYkbzjqv8rk93zAcBlhYsI5SkMUYavsxp5QJg="; + hash = "sha256-wnuAUoyq2CQt5F5LiIsfclv+RXESZFMzGF6UbQhmsBI="; }; - cargoHash = "sha256-3IMOAYRxyMPSJSWnZJ344jHC7nS6TE2CouCr4eTYeaw="; + cargoHash = "sha256-AeqOGZrc0MY+WSR3xrEnSfxf0mgdRvxkpNcQrLsmtiY="; buildInputs = [ rust-jemalloc-sys From b67916e3545147b05d71780c8d20130f76ebd59f Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 16 Oct 2025 00:53:28 +0800 Subject: [PATCH 0280/2279] python3Packages.django-bootstrap4: update uv-build.patch --- pkgs/development/python-modules/django-bootstrap4/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 348ae60e5095..151aaea4894d 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -31,10 +31,9 @@ buildPythonPackage rec { }; patches = [ - # https://github.com/zostera/django-bootstrap4/pull/826 (fetchpatch2 { name = "uv-build.patch"; - url = "https://github.com/Prince213/django-bootstrap4/commit/e3e6b7cc6720568177d37ff0998007c84c294c5a.patch?full_index=1"; + url = "https://github.com/zostera/django-bootstrap4/commit/09b14bc9b70e7da92200c4bc014e2d3c597f0ea6.patch?full_index=1"; hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8="; }) ]; From 0ce8b53f944b0643bd90de493ebc9ecd2a42df71 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 16 Oct 2025 00:58:13 +0800 Subject: [PATCH 0281/2279] python3Packages.django-bootstrap5: update uv-build.patch --- pkgs/development/python-modules/django-bootstrap5/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix index 9327c112676e..538d2adc202e 100644 --- a/pkgs/development/python-modules/django-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-bootstrap5/default.nix @@ -25,10 +25,9 @@ buildPythonPackage rec { }; patches = [ - # https://github.com/zostera/django-bootstrap5/pull/769 (fetchpatch2 { name = "uv-build.patch"; - url = "https://github.com/Prince213/django-bootstrap5/commit/e588b25e0c81d9133ca2b9391c125b41d485aefc.patch?full_index=1"; + url = "https://github.com/zostera/django-bootstrap5/commit/d1d54f5fc8041d2781189321402b4f3937f77913.patch?full_index=1"; hash = "sha256-cFOY+pu2TAZXpAipSIQh1nPPC0ipfncvpObcH667+ac="; }) ]; From 6b37b1747972abe0747f934804ec285f6aa9e8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Oct 2025 11:05:28 -0700 Subject: [PATCH 0282/2279] python3Packages.platformdirs: 4.3.8 -> 4.5.0 Diff: https://github.com/tox-dev/platformdirs/compare/4.3.8...4.5.0 Changelog: https://github.com/tox-dev/platformdirs/releases/tag/4.4.0 https://github.com/tox-dev/platformdirs/releases/tag/4.5.0 --- .../python-modules/platformdirs/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 80d109154203..6ea5d6b7361e 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -12,16 +12,14 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "4.3.8"; + version = "4.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "platformdirs"; + owner = "tox-dev"; repo = "platformdirs"; tag = version; - hash = "sha256-ePaEpsBkTomRX+RJsed8aJtefl5WCW/N9IT8ae4+ln4="; + hash = "sha256-ESXp9I6SL13BdsQLCUcfS8kwqayURCEguhINnK6Dd6k="; }; build-system = [ @@ -37,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "platformdirs" ]; - meta = with lib; { + meta = { description = "Module for determining appropriate platform-specific directories"; homepage = "https://platformdirs.readthedocs.io/"; - changelog = "https://github.com/platformdirs/platformdirs/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/tox-dev/platformdirs/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 186ef5ae3057fb32ba69549ce97f5fb1fc66f261 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:45 -0700 Subject: [PATCH 0283/2279] edencommon: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebookexperimental/edencommon/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/ed/edencommon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 2dbf5e9fbb2c..87ca034575fd 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-KyJAosCLGnpEG968GV9BOyOrsoHS7BbRatTfBqzTelU="; + hash = "sha256-yR0J1tfzdAFopApKsiv9yUXlU0W0Q6n6ZlmKlcVbi0E="; }; patches = [ From f2293f52e1daa6755b15ed3f98d97a9bb97375e6 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:09:11 -0700 Subject: [PATCH 0284/2279] watchman: 2025.09.15.00 -> 2025.10.13.00 This update is being done to relocate the state directory into the user's home directory, which fixes all the following prominent bugs caused by multiple instances: Fixes: https://github.com/jj-vcs/jj/issues/5817 Fixes: https://github.com/NixOS/nixpkgs/issues/438257 CC: https://github.com/facebook/watchman/pull/1236 --- pkgs/by-name/wa/watchman/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 960f02a70355..0dcd7685782d 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -26,21 +26,17 @@ cpptoml, gtest, - - nix-update-script, - - stateDir ? "", }: stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZIFGCOoIuy4Ns51oek3HnBLtCSnI742FTA2YmorBpyk="; + hash = "sha256-yD8OaA6n2aqwgyQ58VEiBw6+IbwUgXrWEUPinJDip+U="; }; patches = [ @@ -78,8 +74,11 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true) + # If we want to have one watchman per system, we need to have the state in + # $HOME for reliability in face of differing TMPDIR values. + # https://github.com/facebook/watchman/issues/1092 + (lib.cmakeBool "WATCHMAN_USE_XDG_STATE_HOME" true) - (lib.cmakeFeature "WATCHMAN_STATE_DIR" stateDir) (lib.cmakeFeature "WATCHMAN_VERSION_OVERRIDE" finalAttrs.version) ]; @@ -118,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; mainProgram = "watchman"; platforms = lib.platforms.unix; From 0234fbb0b1016a1b996f6cf9eb6a4f322deef77b Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Wed, 15 Oct 2025 15:08:07 -0700 Subject: [PATCH 0285/2279] nixos/google-compute-image: add buildMemSize option --- nixos/modules/virtualisation/google-compute-image.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index e1021c755aea..305758756a38 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -57,6 +57,12 @@ in ''; }; + virtualisation.googleComputeImage.buildMemSize = mkOption { + type = types.int; + default = 1024; + description = "Memory size (in MiB) for the temporary VM used to build the image."; + }; + virtualisation.googleComputeImage.contents = mkOption { type = with types; listOf attrs; default = [ ]; @@ -129,6 +135,7 @@ in inherit (cfg) contents; partitionTableType = if cfg.efi then "efi" else "legacy"; inherit (config.virtualisation) diskSize; + memSize = cfg.buildMemSize; inherit config lib pkgs; }; From 4a7701a2f3208a0cb02c0b0fef3a2ddf00894a5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Oct 2025 02:27:16 +0000 Subject: [PATCH 0286/2279] rhythmbox: 3.4.8 -> 3.4.9 --- pkgs/by-name/rh/rhythmbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix index 1bdd2929bb7a..12696be0fd5f 100644 --- a/pkgs/by-name/rh/rhythmbox/package.nix +++ b/pkgs/by-name/rh/rhythmbox/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "rhythmbox"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI="; + sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE="; }; nativeBuildInputs = [ From 75e171bdfacc52cda5213a9fb107b2aba7521789 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 16 Oct 2025 09:47:35 +0300 Subject: [PATCH 0287/2279] python3Packages.numpy: 2.3.3 -> 2.3.4 Diff: https://github.com/numpy/numpy/compare/v2.3.3...v2.3.4 Changelog: https://github.com/numpy/numpy/releases/tag/v2.3.4 --- pkgs/development/python-modules/numpy/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 84d1173a0465..7bbd7781cb83 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -70,7 +70,7 @@ buildPythonPackage rec { repo = "numpy"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-6RMzF5vOWSX7gL3mps9ECClJF3mNqL1mexM6j8/yfdc="; + hash = "sha256-MfL7UQeSuxJIEQzY/0LIuScyBCilINt8e+zAeUNPmH0="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From aff8623e5354e77fd01f1889d75aa7639ac05052 Mon Sep 17 00:00:00 2001 From: bstanderline <153822813+bstanderline@users.noreply.github.com> Date: Thu, 16 Oct 2025 10:10:32 +0100 Subject: [PATCH 0288/2279] zabbix: 6.0.41 -> 6.0.42 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2332e8dbfb2f..0930b0e983f2 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -12,7 +12,7 @@ generic: { hash = "sha256-ML7wFzSTsZk3fJBhs06KLhaijrDW9+nHuUJDPkt1Nn8="; }; v60 = generic { - version = "6.0.41"; - hash = "sha256-E5dtwTdSMV4RIR90eEqh+2keDYmeKWeEDRM0PuA4dxM="; + version = "6.0.42"; + hash = "sha256-Ale517dbuqzjmBMYqJlAtY01F9Bd+W7spegjTHyTJWA="; }; } From 1ab437d8561bec9706026be67612adebc5454290 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 16 Oct 2025 10:00:26 +0000 Subject: [PATCH 0289/2279] protobuf: 32.1 -> 33.0 Diff: https://github.com/protocolbuffers/protobuf/compare/v32.1...v33.0 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v33.0 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e67e0497c898..2000c887a9a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8391,7 +8391,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf_32; + protobuf = protobuf_33; inherit ({ From 936baadc02eb5f094c3ac1d1e1af2036d18a5967 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 16 Oct 2025 13:26:56 +0200 Subject: [PATCH 0290/2279] graphite-gtk-theme: drop gnome-themes-extra dependency This does not change the output of the build. --- pkgs/by-name/gr/graphite-gtk-theme/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix index e91f3485181b..7c87ce9a3d71 100644 --- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix +++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix @@ -3,7 +3,6 @@ stdenvNoCC, fetchFromGitHub, gitUpdater, - gnome-themes-extra, gtk-engine-murrine, jdupes, sassc, @@ -76,10 +75,6 @@ lib.checkListOfEnum "${pname}: theme variants" sassc ]; - buildInputs = [ - gnome-themes-extra - ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From f3682348cf647ab9504238faeb1cd5dc6965b782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Oct 2025 11:49:37 +0000 Subject: [PATCH 0291/2279] sitespeed-io: 38.3.0 -> 38.4.1 --- pkgs/by-name/si/sitespeed-io/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix index e273ba9ce236..40ae19639e26 100644 --- a/pkgs/by-name/si/sitespeed-io/package.nix +++ b/pkgs/by-name/si/sitespeed-io/package.nix @@ -26,13 +26,13 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "38.3.0"; + version = "38.4.1"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; tag = "v${version}"; - hash = "sha256-45lvEM8vkoXdbZNJamUR94PD0EwtoNEhWSNyV68yzPo="; + hash = "sha256-7aqZ63q+17MmUjHwh5Z9yqvwRq/Av+UOswIlSA2V14E="; }; postPatch = '' @@ -50,7 +50,7 @@ buildNpmPackage rec { dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-rXGoIIbKNZCBhhuRM/0WcaciH/bLQamipmOIh1EXJlU="; + npmDepsHash = "sha256-2v/3Ygy6pAyfoQKcbJphIExcU46xc9c6+yXP2JbX11Y="; postInstall = '' mv $out/bin/sitespeed{.,-}io From 6d08a85d42263e0d0e69ce261de6dea659c7ad9c Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 16 Oct 2025 09:55:29 -0400 Subject: [PATCH 0292/2279] libarchive: 3.8.1 -> 3.8.2 The removed patches both have had their relevant changes merged by upstream. Changes: https://github.com/libarchive/libarchive/releases/tag/v3.8.2 Signed-off-by: Samuel Dionne-Riel --- .../fix-darwin-tmpdir-handling.patch | 22 ------------------- pkgs/by-name/li/libarchive/package.nix | 19 ++-------------- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch diff --git a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch deleted file mode 100644 index 3e88c15dbdf2..000000000000 --- a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 87bbe8ec8d343c70ae42ccb9606ec80ad73ceffb Mon Sep 17 00:00:00 2001 -From: Emily -Date: Tue, 29 Jul 2025 16:53:15 +0100 -Subject: [PATCH] Fix setup_mac_metadata when TMPDIR does not end with a slash - ---- - libarchive/archive_read_disk_entry_from_file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c -index 19d049770b..87389642db 100644 ---- a/libarchive/archive_read_disk_entry_from_file.c -+++ b/libarchive/archive_read_disk_entry_from_file.c -@@ -364,7 +364,7 @@ setup_mac_metadata(struct archive_read_disk *a, - tempdir = _PATH_TMP; - archive_string_init(&tempfile); - archive_strcpy(&tempfile, tempdir); -- archive_strcat(&tempfile, "tar.md.XXXXXX"); -+ archive_strcat(&tempfile, "/tar.md.XXXXXX"); - tempfd = mkstemp(tempfile.s); - if (tempfd < 0) { - archive_set_error(&a->archive, errno, diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index a6034a421eaa..f0bfd5355b44 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -6,7 +6,6 @@ attr, autoreconfHook, bzip2, - fetchpatch, glibcLocalesUtf8, lzo, openssl, @@ -32,29 +31,15 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-KN5SvQ+/g/OOa+hntMX3D8p5IEWO0smke5WK+DwrOH0="; + hash = "sha256-s7duwuNFyYq8obTS3qc6JewJ9f8LJhItlEx8wxnMgwk="; }; - patches = [ - # https://github.com/libarchive/libarchive/pull/2689 - # Remove after next release. - (fetchpatch { - url = "https://github.com/libarchive/libarchive/commit/489d0b8e2f1fafd3b7ebf98f389ca67462c34651.patch?full_index=1"; - hash = "sha256-r+tSJ+WA0VKCjg+8MfS5/RqcB+aAMZ2dK0YUh+U1q78="; - }) - # Fix the tests on Darwin when `$TMPDIR` does not end with a slash - # and its parent directory is not writable by the build user, as on - # Nix ≥ 2.30.0 and Lix ≥ 2.91.2, ≥ 2.92.2, ≥ 2.93.1. - # - ./fix-darwin-tmpdir-handling.patch - ]; - outputs = [ "out" "lib" From 89be9a622525dd5dcb09bdfe2b353a3990a9db9b Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Thu, 16 Oct 2025 14:28:36 -0400 Subject: [PATCH 0293/2279] copyDesktopItems: Support derivations with structuredAttrs --- pkgs/build-support/setup-hooks/copy-desktop-items.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh index 313ebc980344..6d9e8966ec81 100644 --- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh +++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -28,8 +28,10 @@ copyDesktopItems() { return fi + concatTo desktopItemsArray desktopItems + applications="${!outputBin}/share/applications" - for desktopItem in $desktopItems; do + for desktopItem in "${desktopItemsArray[@]}"; do if [[ -f "$desktopItem" ]]; then echo "Copying '$desktopItem' into '${applications}'" install -D -m 444 -t "${applications}" "$desktopItem" From 9d1e30379d26b0049c6eaba1e939242d57f31aa1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 16 Oct 2025 22:41:06 +0200 Subject: [PATCH 0294/2279] python3Packages.uvloop: 0.21.0 -> 0.22.0 https://github.com/MagicStack/uvloop/releases/tag/v0.22.0 --- .../python-modules/uvloop/default.nix | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 9c4be78c1c72..63251d02f9cf 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, fetchpatch, # build-system @@ -21,30 +21,16 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.21.0"; + version = "0.22.0"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-O/ErD9poRHgGp62Ee/pZFhMXcnXTW2ckse5XP6o3BOM="; + src = fetchFromGitHub { + owner = "MagicStack"; + repo = "uvloop"; + tag = "v${version}"; + hash = "sha256-LAOa+Oshssy4ZHl4eE6dn2DeZQ9d5tRDV5Hv9BCJJ3c="; }; - patches = [ - # fix test failures on Python 3.13 - # (remove on next update) - (fetchpatch { - url = "https://github.com/MagicStack/uvloop/commit/96b7ed31afaf02800d779a395591da6a2c8c50e1.patch"; - hash = "sha256-Nbe3BuIuwlylll5fIYij+OiP90ZeFNI0GKHK9SwWRk8="; - excludes = [ ".github/workflows/tests.yml" ]; - }) - (fetchpatch { - url = "https://github.com/MagicStack/uvloop/commit/56807922f847ddac231a53d5b03eef70092b987c.patch"; - hash = "sha256-X5Ob1t/CRy9csw2JrWvwS55G6qTqZhIuGLTy83O03GU="; - }) - ]; - postPatch = '' rm -rf vendor @@ -82,6 +68,8 @@ buildPythonPackage rec { "tests/test_dns.py" # Asserts on exact wording of error message "tests/test_tcp.py::Test_AIO_TCP::test_create_connection_open_con_addr" + # ConnectionAbortedError: SSL handshake is taking longer than 15.0 seconds + "tests/test_tcp.py::Test_AIO_TCPSSL::test_create_connection_ssl_1" ] ++ lib.optionals (pythonOlder "3.11") [ "tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" From 922c5f556e0134ee609e04463dbae3a2e31abc54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 16 Oct 2025 23:09:27 +0200 Subject: [PATCH 0295/2279] python3Packages.pillow: 11.3.0 -> 12.0.0 https://pillow.readthedocs.io/en/stable/releasenotes/12.0.0.html --- pkgs/development/python-modules/pillow/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 153192fb6dbf..a2cfc6de6be0 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -8,6 +8,7 @@ # build-system setuptools, pkg-config, + pybind11, # native dependencies freetype, @@ -43,17 +44,20 @@ buildPythonPackage rec { pname = "pillow"; - version = "11.3.0"; + version = "12.0.0"; pyproject = true; src = fetchFromGitHub { owner = "python-pillow"; repo = "pillow"; tag = version; - hash = "sha256-VOOIxzTyERI85CvA2oIutybiivU14kIko8ysXpmwUN8="; + hash = "sha256-58mjwHErEZPkkGBVZznkkMQN5Zo4ZBBiXnhqVp1F81g="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + pybind11 + ]; nativeBuildInputs = [ pkg-config ]; From 10ab50d9d0c5938876be6bea9771c0188922329a Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Fri, 10 Oct 2025 19:40:28 -0500 Subject: [PATCH 0296/2279] nlohmann_json: add char8_t patch --- pkgs/by-name/nl/nlohmann_json/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix index 23b36c48cffd..d32c7366011b 100644 --- a/pkgs/by-name/nl/nlohmann_json/package.nix +++ b/pkgs/by-name/nl/nlohmann_json/package.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Fix missing char8_t support + # https://github.com/nlohmann/json/pull/4736 + (fetchpatch { + name = "fix-char8_t.patch"; + url = "https://github.com/nlohmann/json/commit/756ca22ec5b0d89b5d107b4c30891d1293650c87.patch?full_index=1"; + hash = "sha256-OK8FIXClj5paZNiEvPwJWr5PxyVYtJ3zkRlcZoe8d20="; + }) # Musl does not support LC_NUMERIC, causing a test failure. # Turn the error into a warning to make the test succeed. # https://github.com/nlohmann/json/pull/4770 From 1a9efda28b2bb11d1f10aeade83175eb93001709 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 01:01:44 +0000 Subject: [PATCH 0297/2279] minio: 2025-09-07T16-13-09Z -> 2025-10-15T17-29-55Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 64ae1151400e..48b422fd72c7 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2025-09-07T16-13-09Z"; + version = "2025-10-15T17-29-55Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-0IVxxeM+h3josP+wnS3q4Nrmd3fT9V+KlHxlwz3QyIQ="; + hash = "sha256-HbjmCJYkWyRRHKriLP6QohaXYLk3QEVfi32Krq3ujjo="; }; - vendorHash = "sha256-JrDLUVGtwYqwwB+Suutewi6snHyIpG3DOnDn5O0C+L0="; + vendorHash = "sha256-BFnTJE9QFWmPsx90hDTG8MusdnwaBPYJxM5bCFk3hew="; doCheck = false; From 0a186c61618c84b75c887a9e8a3d59e712c04109 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 01:42:18 +0000 Subject: [PATCH 0298/2279] mieru: 3.20.1 -> 3.21.0 --- pkgs/by-name/mi/mieru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 6f4445aee9ab..e4ec674222c4 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.20.1"; + version = "3.21.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-r4QMETKt8EMSX9BsSizlvlMdlJ+SjlLScNfOxSm84Ec="; + hash = "sha256-9e2V+WwcBp16DsMf31IzANdMlc/r3KFDYjSCKvKKGwM="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; From bf0d024cad6aeb3832ee60506227485d91896007 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 16 Oct 2025 22:34:53 -0400 Subject: [PATCH 0299/2279] sbcl: 2.5.7 -> 2.5.9 --- pkgs/development/compilers/sbcl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index bc4d345f0e3f..943c9ca627e2 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -29,8 +29,8 @@ let "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.5.5".sha256 = "sha256-ZQJnCvs2G6m+RKL6/pr5tZ57JK5QmnkaZrVIHylVlQs="; "2.5.7".sha256 = "sha256-xPr+t5VpnVvP+QhQkazHYtz15V+FI1Yl89eu8SyJ0dM="; + "2.5.9".sha256 = "sha256-0bGQItQ9xJPtyXK25ZyTrmaEyWP90rQTsJZeGM1r0eI="; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5634a13c2734..70ef8cf167af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9071,14 +9071,6 @@ with pkgs; "3000" ]; }; - sbcl_2_5_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.5.5"; }; - faslExt = "fasl"; - flags = [ - "--dynamic-space-size" - "3000" - ]; - }; sbcl_2_5_7 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.7"; }; faslExt = "fasl"; @@ -9087,7 +9079,15 @@ with pkgs; "3000" ]; }; - sbcl = sbcl_2_5_7; + sbcl_2_5_9 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.9"; }; + faslExt = "fasl"; + flags = [ + "--dynamic-space-size" + "3000" + ]; + }; + sbcl = sbcl_2_5_9; sbclPackages = recurseIntoAttrs sbcl.pkgs; From e4ff028cb80d883515340ecb6bdaa86a16281451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 04:05:15 +0000 Subject: [PATCH 0300/2279] appdaemon: 4.5.11 -> 4.5.12 --- pkgs/servers/home-assistant/appdaemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 40e2c2b4ba63..18ca5ac5d03e 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "appdaemon"; - version = "4.5.11"; + version = "4.5.12"; pyproject = true; src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; rev = "refs/tags/${version}"; - hash = "sha256-1wnAniw7fdyfH6QeFjdIAxX5mU92ZZxLLJ/QkKge1eY="; + hash = "sha256-lcGQQz+kPefHSyc2RNQ4gHgraRJPvn/FcgMJGvCtC48="; }; pythonRelaxDeps = true; From 66f0d55c17f7aafa3360f5257a3e06cac25a38c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 17 Oct 2025 09:15:55 +0200 Subject: [PATCH 0301/2279] Revert "python3Packages.setproctitle: avoid rebuild on linux for now" This reverts commit 72a533422c2257f50cf240d8ba21339b4eb09dd8. --- pkgs/development/python-modules/setproctitle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index e99a26990139..aa1211029abb 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; # Setting the process title fails on macOS in the Nix builder environment (regardless of sandboxing) - disabledTests = if stdenv.hostPlatform.isDarwin then [ "test_setproctitle_darwin" ] else null; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_setproctitle_darwin" ]; pythonImportsCheck = [ "setproctitle" ]; From b27d1d5a5f1617730e2e3f18cb1f4c7805f0e9cc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 17 Oct 2025 09:49:35 +0100 Subject: [PATCH 0302/2279] libdrm: 2.4.126 -> 2.4.127 Changes: https://lists.x.org/archives/xorg-announce/2025-October/003634.html --- pkgs/by-name/li/libdrm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index e9bb0c3d449b..9c38c381502e 100644 --- a/pkgs/by-name/li/libdrm/package.nix +++ b/pkgs/by-name/li/libdrm/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.126"; + version = "2.4.127"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-bKsW1NJZtqvJ9IUjOGNFQRSjwwfsqAZnmq0+2+lnv0I="; + hash = "sha256-BRrrPlQqV2IQGP/EQ/sIjdabeO7wzkgItgTOD+rJ9H8="; }; outputs = [ From ac3eccd29684d6332025dc6b3683c338ed44df45 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 30 Sep 2025 12:53:18 +0400 Subject: [PATCH 0303/2279] fetchNpmDeps: add an npmRegistryOverrides argument Adds an `npmRegistryOverrides` argument & variable to fetchNpmDeps & prefetch-npm-deps. This is similar in usage to `url..insteadOf` in `.gitconfig`, allowing one to redirect requests to a registry to another URL. --- .../node/fetch-npm-deps/default.nix | 26 +++++++++++++++++++ .../node/fetch-npm-deps/src/util.rs | 16 ++++++++++++ 2 files changed, 42 insertions(+) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index cac50cb7401a..3e89a1a3b29d 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -68,6 +68,7 @@ hash, forceGitDeps ? false, forceEmptyCache ? false, + npmRegistryOverrides ? { }, }: testers.invalidateFetcherByDrvHash fetchNpmDeps { inherit @@ -75,6 +76,7 @@ hash forceGitDeps forceEmptyCache + npmRegistryOverrides ; src = makeTestSrc { inherit name src; }; @@ -175,6 +177,23 @@ hash = "sha256-FhxlJ0HdJMPiWe7+n1HaGLWOr/2HJEPwiS65uqXZM8Y="; }; + + # Test that npmRegistryOverrides work + npmRegistryOverrides = makeTest { + name = "npm-registry-overrides"; + + src = fetchurl { + url = "https://cyberchaos.dev/yuka/trainsearch/-/raw/e3cba6427e8ecfd843d0f697251ddaf5e53c2327/package-lock.json"; + postFetch = "sed -i 's/registry.npmjs.org/broken.link/' $out"; + hash = "sha256-Qo24ei1d9Ql4zCLjQJ04zVgS4qhBUpew9NZrhrsBds4="; + }; + + npmRegistryOverrides = builtins.toJSON { + "broken.link" = "https://registry.npmjs.org"; + }; + + hash = "sha256-QGObVDd9qVtf/U78+ayP6RHVWsU+HXhg70BFblQ1PZs="; + }; }; meta = with lib; { @@ -192,6 +211,9 @@ forceGitDeps ? false, forceEmptyCache ? false, nativeBuildInputs ? [ ], + # A string with a JSON attrset specifying registry mirrors, for example + # {"registry.example.org": "my-mirror.local/registry.example.org"} + npmRegistryOverrides ? null, ... }@args: let @@ -208,6 +230,9 @@ forceGitDeps_ = lib.optionalAttrs forceGitDeps { FORCE_GIT_DEPS = true; }; forceEmptyCache_ = lib.optionalAttrs forceEmptyCache { FORCE_EMPTY_CACHE = true; }; + npmRegistryOverrides_ = lib.optionalAttrs (!isNull npmRegistryOverrides) { + NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverrides; + }; in stdenvNoCC.mkDerivation ( args @@ -261,5 +286,6 @@ // hash_ // forceGitDeps_ // forceEmptyCache_ + // npmRegistryOverrides_ ); } diff --git a/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/pkgs/build-support/node/fetch-npm-deps/src/util.rs index 36e2333a3e1a..835f77a2f52c 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/util.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/util.rs @@ -18,6 +18,22 @@ use std::{ use url::Url; pub fn get_url(url: &Url) -> Result { + let url_ = url.clone(); + let mut url = url.clone(); + // Respect NIX_NPM_REGISTRY_OVERRIDES environment variable, which should be a JSON mapping in the shape of: + // `{ "registry.example.com": "my-registry.local", ... }` + if let Some(host) = url.host_str() { + if let Ok(npm_mirrors) = env::var("NIX_NPM_REGISTRY_OVERRIDES") { + if let Ok(mirrors) = serde_json::from_str::>(&npm_mirrors) { + if let Some(mirror) = mirrors.get(host).and_then(serde_json::Value::as_str) { + let mirror_url = Url::parse(mirror)?; + url.set_path(&(mirror_url.path().to_owned() + url.path())); + url.set_host(Some(mirror_url.host_str().expect(format!("Mirror URL without host part: {mirror_url}").as_str())))?; + eprintln!("Replaced URL {url_} with {url}"); + } + } + } + } let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10)); // Respect SSL_CERT_FILE if environment variable exists From c3a465a6dea8232bd5f1fcc68177ca00f9eb3f66 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 30 Sep 2025 15:19:04 +0400 Subject: [PATCH 0304/2279] config: add npmRegistryOverrides option Adds npmRegistryOverrides, to be passed through to `fetchNpmDeps`. --- .../node/fetch-npm-deps/default.nix | 15 +++++------ pkgs/top-level/config.nix | 27 +++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 3e89a1a3b29d..1f5ea5a5f17b 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -12,6 +12,7 @@ cacert, prefetch-npm-deps, fetchNpmDeps, + config, }: { @@ -68,7 +69,7 @@ hash, forceGitDeps ? false, forceEmptyCache ? false, - npmRegistryOverrides ? { }, + npmRegistryOverridesString ? "{}", }: testers.invalidateFetcherByDrvHash fetchNpmDeps { inherit @@ -76,7 +77,7 @@ hash forceGitDeps forceEmptyCache - npmRegistryOverrides + npmRegistryOverridesString ; src = makeTestSrc { inherit name src; }; @@ -188,7 +189,7 @@ hash = "sha256-Qo24ei1d9Ql4zCLjQJ04zVgS4qhBUpew9NZrhrsBds4="; }; - npmRegistryOverrides = builtins.toJSON { + npmRegistryOverridesString = builtins.toJSON { "broken.link" = "https://registry.npmjs.org"; }; @@ -213,7 +214,7 @@ nativeBuildInputs ? [ ], # A string with a JSON attrset specifying registry mirrors, for example # {"registry.example.org": "my-mirror.local/registry.example.org"} - npmRegistryOverrides ? null, + npmRegistryOverridesString ? config.npmRegistryOverridesString, ... }@args: let @@ -230,9 +231,6 @@ forceGitDeps_ = lib.optionalAttrs forceGitDeps { FORCE_GIT_DEPS = true; }; forceEmptyCache_ = lib.optionalAttrs forceEmptyCache { FORCE_EMPTY_CACHE = true; }; - npmRegistryOverrides_ = lib.optionalAttrs (!isNull npmRegistryOverrides) { - NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverrides; - }; in stdenvNoCC.mkDerivation ( args @@ -268,6 +266,8 @@ # `{ "registry.example.com": "example-registry-bearer-token", ... }` impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ]; + NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString; + SSL_CERT_FILE = if ( @@ -286,6 +286,5 @@ // hash_ // forceGitDeps_ // forceEmptyCache_ - // npmRegistryOverrides_ ); } diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 09d31a2d117c..ca445f9c0ab7 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -139,6 +139,33 @@ let null; }; + npmRegistryOverrides = mkOption { + type = types.attrsOf types.str; + description = '' + The default NPM registry overrides for all `fetchNpmDeps` calls, as an attribute set. + + For each attribute, all files fetched from the host corresponding to the name will instead be fetched from the host (and sub-path) specified in the value. + + For example, an override like `"registry.npmjs.org" = "my-mirror.local/registry.npmjs.org"` will replace a URL like `https://registry.npmjs.org/foo.tar.gz` with `https://my-mirror.local/registry.npmjs.org/foo.tar.gz`. + + To set the string directly, see [`npmRegistryOverridesString`)](#opt-npmRegistryOverridesString). + ''; + default = { }; + example = { + "registry.npmjs.org" = "my-mirror.local/registry.npmjs.org"; + }; + }; + + npmRegistryOverridesString = mkOption { + type = types.nullOr types.str; + description = '' + A string containing a string with a JSON representation of NPM registry overrides for `fetchNpmDeps`. + + This overrides the [`npmRegistryOverrides`](#opt-npmRegistryOverrides) option, see its documentation for more details. + ''; + default = builtins.toJSON config.npmRegistryOverrides; + }; + doCheckByDefault = mkMassRebuild { feature = "run `checkPhase` by default"; }; From 0f7b0e9eda822564a133ce4d24aa83a20670f08c Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 30 Sep 2025 15:20:28 +0400 Subject: [PATCH 0305/2279] release notes: add npmRegistryOverrides --- doc/release-notes/rl-2511.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index cee71a7652da..24dffe781727 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -260,6 +260,8 @@ - Added `gitConfig` and `gitConfigFile` option to the nixpkgs `config`, to allow for setting a default `gitConfigFile` for all `fetchgit` invocations. +- Added `npmRegistryOverrides` and `npmRegistryOverridesString` option to the nixpkgs `config`, to allow for setting a default `npmRegistryOverridesString` for all `fetchNpmDeps` invocations. + - The `dockerTools.streamLayeredImage` builder now uses a better algorithm for generating layered docker images, such that much more sharing is possible when the number of store paths exceeds the layer limit. It gives each of the largest store paths its own layer and adds dependencies to those layers when they aren't used elsewhere. - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes. @@ -302,6 +304,8 @@ - `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only). +- `fetchNpmDeps`: Add `npmRegistryOverridesString` argument to pass NPM registry overrides to the fetcher. + - `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI. For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1). From 712a4af338eb98ffc1c0c51c5f3a7a5f9fdcaa57 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Fri, 17 Oct 2025 16:41:50 +0400 Subject: [PATCH 0306/2279] fixup! config: add npmRegistryOverrides option --- pkgs/top-level/config.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index ca445f9c0ab7..c8e8a3f58590 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -148,7 +148,7 @@ let For example, an override like `"registry.npmjs.org" = "my-mirror.local/registry.npmjs.org"` will replace a URL like `https://registry.npmjs.org/foo.tar.gz` with `https://my-mirror.local/registry.npmjs.org/foo.tar.gz`. - To set the string directly, see [`npmRegistryOverridesString`)](#opt-npmRegistryOverridesString). + To set the string directly, see [`npmRegistryOverridesString`](#opt-npmRegistryOverridesString). ''; default = { }; example = { @@ -157,7 +157,13 @@ let }; npmRegistryOverridesString = mkOption { - type = types.nullOr types.str; + type = types.addCheck types.str ( + s: + let + j = builtins.fromJSON s; + in + lib.isAttrs j && lib.all builtins.isString (builtins.attrValues j) + ); description = '' A string containing a string with a JSON representation of NPM registry overrides for `fetchNpmDeps`. From 10abb1cf769e02094f1aabd72e571495b7552011 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Fri, 17 Oct 2025 09:16:33 -0400 Subject: [PATCH 0307/2279] git: 2.51.0 -> 2.51.1 --- pkgs/applications/version-management/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 0e3fd51885d6..7a5a83b8a27e 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.51.0"; + version = "2.51.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-YKfCJRzC5YjVzYe65WcmBhfG3gwi3KnNv8TH0riZC2I="; + hash = "sha256-qD/Z/67X7uZ57ZLOsG91tGFev2bTrE+9v7yVZ9xTP0o="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From 1ea4b9d66efc922b0bbda71ee582547c95a82072 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 17 Oct 2025 20:36:26 +0200 Subject: [PATCH 0308/2279] Revert "ffmpeg: switch to new source repo" This reverts commit 9192040894caa87e0c6a4a0fce758d86cb72150f. --- pkgs/development/libraries/ffmpeg/generic.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 288c7becbb71..2a3b167e91c0 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -15,11 +15,9 @@ # NOTICE: Always use this argument to override the version. Do not use overrideAttrs. version, # ffmpeg ABI version. Also declare this if you're overriding the source. hash ? "", # hash of the upstream source for the given ABI version - source ? fetchFromGitea { - domain = "code.ffmpeg.org"; - owner = "FFmpeg"; - repo = "FFmpeg"; - tag = "n${version}"; + source ? fetchgit { + url = "https://git.ffmpeg.org/ffmpeg.git"; + rev = "n${version}"; inherit hash; }, @@ -42,7 +40,7 @@ # instead. withFullDeps ? ffmpegVariant == "full", - fetchFromGitea, + fetchgit, fetchpatch2, # Feature flags From 2e4ae00a23c524ff0b0f11366cb61118baebcd1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 19:32:08 +0000 Subject: [PATCH 0309/2279] luwen: 0.7.13 -> 0.7.14 --- pkgs/by-name/lu/luwen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix index 545910442f5a..0a075faf559e 100644 --- a/pkgs/by-name/lu/luwen/package.nix +++ b/pkgs/by-name/lu/luwen/package.nix @@ -6,13 +6,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "luwen"; - version = "0.7.13"; + version = "0.7.14"; src = fetchFromGitHub { owner = "tenstorrent"; repo = "luwen"; tag = "v${finalAttrs.version}"; - hash = "sha256-2l+rcWP9Ms0bvvSvZIA4DjH6bIloQGxzRTE1ShP6hEE="; + hash = "sha256-KhkABISkR37MjEwgroVtywYNCxgfwXyM5LG2CIJhu3M="; }; postUnpack = '' From 72e993be3b88699560728ca1402e66041b944e69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 20:21:24 +0000 Subject: [PATCH 0310/2279] python3Packages.avro: 1.12.0 -> 1.12.1 --- pkgs/development/python-modules/avro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 512377ff053c..80cd0de5213b 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "avro"; - version = "1.12.0"; + version = "1.12.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ytnFOyPO7Wmceva93O1C4sVy/WtAjCV6fU/E6M8uLWs="; + hash = "sha256-xbjdLdTBCBbw3BJ8wpz9Q7XkBc9+aEDolGCgJL89CY0="; }; build-system = [ setuptools ]; From 77ad38bf77a8760106cf2594c3fdb91bdb46d2b8 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 17 Oct 2025 13:19:41 -0700 Subject: [PATCH 0311/2279] fmt_12: init at 12.0.0 --- pkgs/development/libraries/fmt/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index a88e41c95873..3caa55292a91 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -97,4 +97,9 @@ in }) ]; }; + + fmt_12 = generic { + version = "12.0.0"; + hash = "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b82ab0671f01..89b3f11f481f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7251,7 +7251,12 @@ with pkgs; fltk = fltk13; fltk-minimal = fltk13-minimal; - inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11; + inherit (callPackages ../development/libraries/fmt { }) + fmt_9 + fmt_10 + fmt_11 + fmt_12 + ; fmt = fmt_11; From 505e531eb7742d93ebf42377205ccdb73e105311 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 17 Oct 2025 13:20:22 -0700 Subject: [PATCH 0312/2279] fmt: fmt_11 -> fmt_12 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89b3f11f481f..7a78ce54b5e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7258,7 +7258,7 @@ with pkgs; fmt_12 ; - fmt = fmt_11; + fmt = fmt_12; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; From 7f4e302f7d53852cca8b95765bd4ff8d45bebb2c Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 14 Oct 2025 20:37:12 -0700 Subject: [PATCH 0313/2279] sv-lang: 7.0 -> 9.1 --- pkgs/by-name/sv/sv-lang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index b72ba3e6316b..b04eca78a498 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "sv-lang"; - version = "7.0"; + version = "9.1"; src = fetchFromGitHub { owner = "MikePopoloski"; repo = "slang"; rev = "v${version}"; - sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g="; + sha256 = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA="; }; postPatch = '' substituteInPlace external/CMakeLists.txt \ - --replace-fail 'set(mimalloc_min_version "2.1")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' + --replace-fail 'set(mimalloc_min_version "2.2")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' ''; cmakeFlags = [ From f18df57364f4d89ba08968774eba0c649748f6b4 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Wed, 15 Oct 2025 14:05:07 -0700 Subject: [PATCH 0314/2279] sv-lang: cleanup --- pkgs/by-name/sv/sv-lang/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix index b04eca78a498..ee4ef1d3c843 100644 --- a/pkgs/by-name/sv/sv-lang/package.nix +++ b/pkgs/by-name/sv/sv-lang/package.nix @@ -11,20 +11,21 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sv-lang"; version = "9.1"; src = fetchFromGitHub { owner = "MikePopoloski"; repo = "slang"; - rev = "v${version}"; - sha256 = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA="; }; postPatch = '' - substituteInPlace external/CMakeLists.txt \ - --replace-fail 'set(mimalloc_min_version "2.2")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' + substituteInPlace external/CMakeLists.txt --replace-fail \ + 'set(mimalloc_min_version "2.2")' \ + 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")' ''; cmakeFlags = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" - "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}" + "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; nativeBuildInputs = [ @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { ninja ]; + strictDeps = true; + buildInputs = [ boost fmt @@ -62,4 +65,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 40c0bbc6b59f534879d5f7608b038f8f8029dd0f Mon Sep 17 00:00:00 2001 From: Alexis Williams Date: Fri, 17 Oct 2025 16:49:04 -0700 Subject: [PATCH 0315/2279] fakeredis: 2.30.3 -> 2.32.0 --- .../python-modules/fakeredis/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 0a475eccd8ec..99893382c7b9 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -14,11 +14,12 @@ redis, redisTestHook, sortedcontainers, + valkey, }: buildPythonPackage rec { pname = "fakeredis"; - version = "2.30.3"; + version = "2.32.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; tag = "v${version}"; - hash = "sha256-SQVLuO5cA+XO7hEBph7XGlnomTcysB3ye9jZ8sy9GAI="; + hash = "sha256-esouWM32qe4iO5AcRC0HuUF+lwEDHnyXoknwqsZhr+o="; }; build-system = [ hatchling ]; @@ -35,6 +36,7 @@ buildPythonPackage rec { dependencies = [ redis sortedcontainers + valkey ]; optional-dependencies = { @@ -60,6 +62,14 @@ buildPythonPackage rec { disabledTests = [ "test_init_args" # AttributeError: module 'fakeredis' has no attribute 'FakeValkey' "test_async_init_kwargs" # AttributeError: module 'fakeredis' has no attribute 'FakeAsyncValkey'" + + # KeyError: 'tot-mem' + "test_acl_log_auth_exist" + "test_acl_log_invalid_channel" + "test_acl_log_invalid_key" + "test_client_id" + "test_client_info" + "test_client_list" ]; preCheck = '' From 6842e9363e645af40600cd1391838a7381300a3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 05:01:05 +0000 Subject: [PATCH 0316/2279] go-ethereum: 1.16.3 -> 1.16.5 --- pkgs/by-name/go/go-ethereum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index fd3f655978c7..9c6c53173b12 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -15,17 +15,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.16.3"; + version = "1.16.5"; src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - hash = "sha256-9g+RlOnV3DMLkak+RbSm8RgFB14Yuap8CT1w6kuZRv0="; + hash = "sha256-f9MBHO3oh1Nh+YI1E8cPPaNRj4T12063YLqTDrdZWWA="; }; proxyVendor = true; - vendorHash = "sha256-GEPSkuEdrYvPGXEGhAT3U765rjY6w6kwOVYOMCgOaCo="; + vendorHash = "sha256-6tGSyx4OXMXUjhIvLJo+vyRkNzHmwiikzrLL0cQPBLo="; doCheck = false; From 766df53f7bfb34a5cf36e293852307c2f56554b1 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Mon, 13 Oct 2025 07:55:53 +0200 Subject: [PATCH 0317/2279] curl: enable c-ares This enables the `--dns-servers` option. Fixes: https://github.com/NixOS/nixpkgs/issues/451543 Signed-off-by: David Wronek --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02b551f0f366..128e1b25ced3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2590,6 +2590,7 @@ with pkgs; pslSupport = true; zstdSupport = true; http3Support = true; + c-aresSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { brotliSupport = true; From d2dc6ee5d1cfa62571d48a2bc1276f64dde27ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Tue, 14 Oct 2025 12:05:48 +0200 Subject: [PATCH 0318/2279] nixos/gonic: assert that required paths are set --- nixos/modules/services/audio/gonic.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/audio/gonic.nix b/nixos/modules/services/audio/gonic.nix index 30b1f91ce7eb..8a6bdebcb9f8 100644 --- a/nixos/modules/services/audio/gonic.nix +++ b/nixos/modules/services/audio/gonic.nix @@ -10,6 +10,10 @@ let mkKeyValue = lib.generators.mkKeyValueDefault { } " "; listsAsDuplicateKeys = true; }; + assertKey = key: { + assertion = cfg.settings ? ${key}; + message = "Please set services.gonic.settings.${key}. See https://github.com/sentriz/gonic#configuration-options for supported values."; + }; in { options = { @@ -29,6 +33,7 @@ in example = { music-path = [ "/mnt/music" ]; podcast-path = "/mnt/podcasts"; + playlists-path = "/mnt/playlists"; }; description = '' Configuration for Gonic, see for supported values. @@ -39,6 +44,12 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + (assertKey "music-path") + (assertKey "podcast-path") + (assertKey "playlists-path") + ]; + systemd.services.gonic = { description = "Gonic Media Server"; after = [ "network.target" ]; From 8c0f2d94254f713ef9b8c53b7d8d37b21bd00edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutensk=C3=BD?= Date: Sat, 18 Oct 2025 10:48:39 +0200 Subject: [PATCH 0319/2279] nixos/gonic: make non-default cache writable --- nixos/modules/services/audio/gonic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/audio/gonic.nix b/nixos/modules/services/audio/gonic.nix index 8a6bdebcb9f8..5ed639fb8a75 100644 --- a/nixos/modules/services/audio/gonic.nix +++ b/nixos/modules/services/audio/gonic.nix @@ -73,6 +73,7 @@ in BindPaths = [ cfg.settings.playlists-path cfg.settings.podcast-path + cfg.settings.cache-path ]; BindReadOnlyPaths = [ # gonic can access scrobbling services From 114875cf07ef5498cb525371ded75ab106ebaea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 12:26:50 +0000 Subject: [PATCH 0320/2279] groovy: 5.0.1 -> 5.0.2 --- pkgs/by-name/gr/groovy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/groovy/package.nix b/pkgs/by-name/gr/groovy/package.nix index f42e3044250e..d61f411f2fb9 100644 --- a/pkgs/by-name/gr/groovy/package.nix +++ b/pkgs/by-name/gr/groovy/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; - sha256 = "sha256-vmahfzT2n0c7I5WOvuB3Doiq9zXXm6liRUN1w40oVKU="; + sha256 = "sha256-cPgvEbG3ZOIH3PVWiILHjcdyk/MHgWJCOUo/enTyDoE="; }; nativeBuildInputs = [ From 7942561d266ff47c34937bf6b2596d181b9225d5 Mon Sep 17 00:00:00 2001 From: Godefroid Chapelle Date: Mon, 13 Oct 2025 11:58:35 +0200 Subject: [PATCH 0321/2279] goose-cli: 1.6.0 -> 1.11.0 --- pkgs/by-name/go/goose-cli/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index cee070520bed..b8869a459448 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -27,16 +27,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "goose-cli"; - version = "1.6.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "block"; repo = "goose"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZfS0U7PpGWWuqGKd7IjRaavqZSySx93F9S1d7r2wMkE="; + hash = "sha256-0pDJp/sWFn16HlWU+OYk0K9kIbNohC8NckZywinBRH8="; }; - cargoHash = "sha256-uYgYzP75QkN1VksYL3KeNMNy7wb0TgCP8HPN1QrfZoo="; + cargoHash = "sha256-bspPOgMEnSjICJWIicrD7B+APuUvlVZFarpwzzdLwPc="; nativeBuildInputs = [ pkg-config @@ -81,9 +81,17 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=transport::streamable_http::tests::test_handle_outgoing_message_session_id_handling" "--skip=transport::streamable_http::tests::test_handle_outgoing_message_session_not_found" "--skip=transport::streamable_http::tests::test_handle_outgoing_message_successful_request" + "--skip=routes::audio::tests::test_transcribe_endpoint_requires_auth" + "--skip=routes::config_management::tests::test_get_provider_models_openai_configured" + # integration tests that need network access + "--skip=test_replayed_session::vec_uvx_mcp_server_fetch_vec_calltoolrequestparam_name_fetch_into_arguments_some_object_url_https_example_com_vec_expects" + "--skip=test_replayed_session::vec_github_mcp_server_stdio_vec_calltoolrequestparam_name_get_file_contents_into_arguments_some_object_owner_block_repo_goose_path_readme_md_sha_ab62b863c1666232a67048b6c4e10007a2a5b83c_vec_github_personal_access_token_expects" + "--skip=test_replayed_session::vec_cargo_run_quiet_p_goose_server_bin_goosed_mcp_developer_vec_calltoolrequestparam_name_text_editor_into_arguments_some_object_command_view_path_goose_crates_goose_tests_tmp_goose_txt_calltoolrequestparam_name_text_editor_into_arguments_some_object_command_str_replace_path_goose_crates_goose_tests_tmp_goose_txt_old_str_goose_new_str_goose_modified_by_test_calltoolrequestparam_name_shell_into_arguments_some_object_command_cat_goose_crates_goose_tests_tmp_goose_txt_calltoolrequestparam_name_text_editor_into_arguments_some_object_command_str_replace_path_goose_crates_goose_tests_tmp_goose_txt_old_str_goose_modified_by_test_new_str_goose_calltoolrequestparam_name_list_windows_into_arguments_some_object_vec_expects" + "--skip=test_replayed_session::vec_npx_y_modelcontextprotocol_server_everything_vec_calltoolrequestparam_name_echo_into_arguments_some_object_message_hello_world_calltoolrequestparam_name_add_into_arguments_some_object_a_1_b_2_calltoolrequestparam_name_longrunningoperation_into_arguments_some_object_duration_1_steps_5_calltoolrequestparam_name_structuredcontent_into_arguments_some_object_location_11238_vec_expects" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--skip=context_mgmt::auto_compact::tests::test_auto_compact_respects_config" + "--skip=scheduler::tests::test_scheduled_session_has_schedule_id" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=logging::tests::test_log_file_name_no_session" From b349beae2a59ef716aed745ddb900a4209632894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 15:28:11 +0000 Subject: [PATCH 0322/2279] python3Packages.aioconsole: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index d4a473ebeefe..94360f89d706 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -19,7 +19,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aioconsole"; tag = "v${version}"; - hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs="; + hash = "sha256-j4nzt8mvn+AYObh1lvgxS8wWK662KN+OxjJ2b5ZNAcQ="; }; postPatch = '' From c3ee85867eaf21528f6945d1a43b508ef096366f Mon Sep 17 00:00:00 2001 From: dramforever Date: Sat, 18 Oct 2025 22:49:30 +0800 Subject: [PATCH 0323/2279] mercurial: Use google-re2 instead Facebook's fb-re2 hasn't been maintained for 6 years. Move Mercurial to use google-re2, which is maintained, instead. Mercurial has internal checks that make it work with either fb-re2 or google-re2, so this should be fine. As a bonus this also unblocks full Musl build of Nix, which depends on Mercurial for tests. --- pkgs/by-name/me/mercurial/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix index 7df8e2b3955e..c6137a31a783 100644 --- a/pkgs/by-name/me/mercurial/package.nix +++ b/pkgs/by-name/me/mercurial/package.nix @@ -30,7 +30,7 @@ let inherit (python3Packages) docutils python - fb-re2 + google-re2 pygit2 pygments setuptools @@ -64,7 +64,7 @@ let cargoRoot = if rustSupport then "rust" else null; propagatedBuildInputs = - lib.optional re2Support fb-re2 + lib.optional re2Support google-re2 ++ lib.optional gitSupport pygit2 ++ lib.optional highlightSupport pygments; nativeBuildInputs = [ From 87b9f47d65aaf4c76698a8d3d039c7849a1ea610 Mon Sep 17 00:00:00 2001 From: dramforever Date: Sat, 18 Oct 2025 23:39:08 +0800 Subject: [PATCH 0324/2279] python3Packages.fb-re2: drop It's unmaintained upstream for 6 years. google-re2 is maintained and provides a similar re2 module for re2 bindings. --- pkgs/by-name/re/re2/package.nix | 2 +- .../python-modules/fb-re2/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/fb-re2/default.nix diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix index 28e9bb9432b0..faa843290e1c 100644 --- a/pkgs/by-name/re/re2/package.nix +++ b/pkgs/by-name/re/re2/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit chromium grpc mercurial; - inherit (python3Packages) fb-re2 google-re2; + inherit (python3Packages) google-re2; haskell-re2 = haskellPackages.re2; }; diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix deleted file mode 100644 index 11defafe3953..000000000000 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchpatch, - fetchPypi, - re2, -}: - -buildPythonPackage rec { - pname = "fb-re2"; - version = "1.0.7"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf"; - }; - - patches = [ - # Bump stdlib to c++17 to fix build with recent re2 - # https://github.com/facebook/pyre2/issues/24 - # https://github.com/facebook/pyre2/pull/25 - (fetchpatch { - url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch"; - hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0="; - }) - ]; - - buildInputs = [ re2 ]; - - # no tests in PyPI tarball - doCheck = false; - - meta = { - description = "Python wrapper for Google's RE2"; - homepage = "https://github.com/facebook/pyre2"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ivan ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a812d5dcb0c3..127121fbed1b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -726,6 +726,7 @@ mapAliases { ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rauth = throw "rauth has beed removed, since it is unmaintained upstream"; # added 2024-07-27 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 + fb-re2 = throw "fb-re2 has been removed since it is unmaintained upstream, consider google-re2 instead"; # added 2025-10-18 readme_renderer = readme-renderer; # added 2024-01-07 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 recursivePthLoader = recursive-pth-loader; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6b1806bb642..567e95c0828a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5133,8 +5133,6 @@ self: super: with self; { favicon = callPackage ../development/python-modules/favicon { }; - fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - fe25519 = callPackage ../development/python-modules/fe25519 { }; feather-format = callPackage ../development/python-modules/feather-format { }; From a93e29f2c74ea8c8c9d8a8ef5785cd772b425af5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 16:30:25 +0000 Subject: [PATCH 0325/2279] dpt-rp1-py: 0.1.16 -> 0.1.18 --- pkgs/by-name/dp/dpt-rp1-py/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix index e3b1f84af9b0..363b6ba695c2 100644 --- a/pkgs/by-name/dp/dpt-rp1-py/package.nix +++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "dpt-rp1-py"; - version = "0.1.16"; + version = "0.1.18"; format = "pyproject"; src = fetchFromGitHub { owner = "janten"; repo = "dpt-rp1-py"; rev = "v${version}"; - sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj"; + sha256 = "sha256-5Ny62Kp1GHH9vmPSZ6smNqyEt9PZYPHAiungHZQMB/A="; }; doCheck = false; From e14c4f6aba4e677250d4440bb74af22ec8a31052 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 18:52:33 +0000 Subject: [PATCH 0326/2279] dash: 0.5.12 -> 0.5.13.1 --- pkgs/by-name/da/dash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix index 6c21d4edeff1..3fe956dd6f1d 100644 --- a/pkgs/by-name/da/dash/package.nix +++ b/pkgs/by-name/da/dash/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dash"; - version = "0.5.12"; + version = "0.5.13.1"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz"; - hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo="; + hash = "sha256-2ScbzgnBJ9mGbiXAEVgt3HWrmIlYoEvE2FU6O48w43A="; }; strictDeps = true; From 0bef84258f28c3d23bc7c6b6eddde0f805253c88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 19:27:30 +0000 Subject: [PATCH 0327/2279] normaliz: 3.10.5 -> 3.11.0 --- pkgs/by-name/no/normaliz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix index 66e5671f83c5..bcfddfda396f 100644 --- a/pkgs/by-name/no/normaliz/package.nix +++ b/pkgs/by-name/no/normaliz/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "normaliz"; - version = "3.10.5"; + version = "3.11.0"; src = fetchFromGitHub { owner = "normaliz"; repo = "normaliz"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ku5OTtRxrs9qaSE0mle17eJSE2yKZUUsflEZk4k91jM="; + hash = "sha256-O8zUhuR+e9yNxj9jC2xK7UZ2aUHoEWjwxn3XxTyP8hQ="; }; buildInputs = [ From 4955d85c5ba882756470c1816ab69dadd60ff8a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 19:49:05 +0000 Subject: [PATCH 0328/2279] inja: 3.4.0 -> 3.5.0 --- pkgs/by-name/in/inja/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inja/package.nix b/pkgs/by-name/in/inja/package.nix index 01310b2aac14..db06c68ef254 100644 --- a/pkgs/by-name/in/inja/package.nix +++ b/pkgs/by-name/in/inja/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "inja"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "pantor"; repo = "inja"; rev = "v${finalAttrs.version}"; - hash = "sha256-B1EaR+qN32nLm3rdnlZvXQ/dlSd5XSc+5+gzBTPzUZU="; + hash = "sha256-P4XKz2FcMfP0HRMoEC2+RKE/ljZSpusUTDmF9Ao5txo="; }; nativeBuildInputs = [ cmake ]; From 9f5b62ff6207f0e68878b7a78ff9da5a58469592 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Oct 2025 19:06:26 +0200 Subject: [PATCH 0329/2279] ocamlPackages.dune_{2,3}: don't throw when evaling --- pkgs/top-level/ocaml-packages.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 86e4c306066e..baa374dfbc35 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -464,21 +464,9 @@ let dune_1 = callPackage ../development/tools/ocaml/dune/1.nix { }; - dune_2 = - if lib.versionAtLeast ocaml.version "4.08" then - callPackage ../development/tools/ocaml/dune/2.nix { } - else if lib.versionAtLeast ocaml.version "4.02" then - pkgs.dune_2 - else - throw "dune_2 is not available for OCaml ${ocaml.version}"; + dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; - dune_3 = - if lib.versionAtLeast ocaml.version "4.08" then - callPackage ../development/tools/ocaml/dune/3.nix { } - else if lib.versionAtLeast ocaml.version "4.02" then - pkgs.dune_3 - else - throw "dune_3 is not available for OCaml ${ocaml.version}"; + dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; From 5a83fc7432b84587cda81b79e344bea1e8e5180f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Oct 2025 19:11:42 +0200 Subject: [PATCH 0330/2279] ocamlPackages.labltk: mark as broken on unsupported versions --- pkgs/development/ocaml-modules/labltk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 2a15aecfe0c9..0782692d7713 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -134,5 +134,6 @@ param.stdenv.mkDerivation { license = lib.licenses.lgpl21; inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.vbgl ]; + broken = !(params ? ${lib.versions.majorMinor ocaml.version}); }; } From 1e1cef625b2108f3d3cab7fb6daff2fe62233243 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 13 Oct 2025 19:14:09 +0200 Subject: [PATCH 0331/2279] ocamlPackages: swap throws to meta.broken throws no longer work with the current ci we have in nixpkgs --- pkgs/build-support/ocaml/oasis.nix | 75 ++++--- pkgs/by-name/li/libnbd/package.nix | 137 +++++++------ pkgs/development/compilers/mezzo/default.nix | 111 +++++----- pkgs/development/ocaml-modules/b0/default.nix | 90 ++++----- .../development/ocaml-modules/bap/default.nix | 189 +++++++++--------- .../ocaml-modules/bitstring/ppx.nix | 39 ++-- .../brisk-reconciler/default.nix | 7 +- .../development/ocaml-modules/bz2/default.nix | 65 +++--- .../ocaml-modules/camlpdf/default.nix | 53 +++-- .../development/ocaml-modules/cil/default.nix | 61 +++--- .../ocaml-modules/cmarkit/default.nix | 61 +++--- .../ocaml-modules/cmdliner/1_0.nix | 3 +- .../ocaml-modules/cmdliner/1_1.nix | 55 +++-- .../ocaml-modules/config-file/default.nix | 49 +++-- .../ocaml-modules/cpdf/default.nix | 69 +++---- .../ocaml-modules/cryptgps/default.nix | 69 +++---- .../ocaml-modules/eliom/default.nix | 100 +++++---- .../ocaml-modules/erm_xml/default.nix | 53 +++-- .../ocaml-modules/expat/default.nix | 65 +++--- .../ocaml-modules/facile/default.nix | 36 ++-- .../ocaml-modules/farfadet/default.nix | 55 +++-- .../development/ocaml-modules/fmt/default.nix | 59 +++--- .../ocaml-modules/fpath/default.nix | 55 +++-- .../ocaml-modules/functory/default.nix | 49 +++-- pkgs/development/ocaml-modules/gg/default.nix | 65 +++--- .../ocaml-modules/hmap/default.nix | 3 +- .../ocaml-modules/javalib/default.nix | 77 ++++--- .../ocaml-modules/kafka/default.nix | 41 ++-- pkgs/development/ocaml-modules/kafka/lwt.nix | 29 ++- .../ocaml-modules/lablgl/default.nix | 127 ++++++------ .../ocaml-modules/lablgtk-extras/default.nix | 65 +++--- .../development/ocaml-modules/lem/default.nix | 81 ++++---- .../ocaml-modules/linksem/default.nix | 51 +++-- .../ocaml-modules/mariadb/default.nix | 109 +++++----- .../ocaml-modules/memprof-limits/default.nix | 38 ++-- .../ocaml-modules/mtime/default.nix | 53 +++-- .../ocaml-modules/nonstd/default.nix | 40 ++-- .../ocaml-modules/note/default.nix | 51 +++-- .../ocaml-modules/ocaml-cairo/default.nix | 98 +++++---- .../ocaml-modules/ocaml-libvirt/default.nix | 77 ++++--- .../ocaml-migrate-parsetree/1.8.x.nix | 45 ++--- .../ocaml-migrate-parsetree/2.x.nix | 41 ++-- .../ocaml-modules/ocamlformat/ocamlformat.nix | 60 +++--- .../ocaml-modules/ocamlnet/default.nix | 113 +++++------ .../ocaml-modules/ocp-ocamlres/default.nix | 65 +++--- .../ocaml-modules/ocurl/default.nix | 67 +++---- .../ocaml-modules/osdp/default.nix | 57 +++--- .../ocaml-modules/piqi/default.nix | 83 ++++---- .../ocaml-modules/ppx_cstubs/default.nix | 69 +++---- .../ocaml-modules/ppx_tools/default.nix | 172 ++++++++-------- .../ocaml-modules/ppxlib/default.nix | 57 +++--- .../ocaml-modules/ptime/default.nix | 75 ++++--- .../ocaml-modules/rresult/default.nix | 55 +++-- .../ocaml-modules/sawja/default.nix | 72 ++++--- .../ocaml-modules/sodium/default.nix | 69 +++---- .../ocaml-modules/sosa/default.nix | 67 +++---- .../ocaml-modules/stdcompat/default.nix | 37 ++-- .../ocaml-modules/tsdl/default.nix | 89 ++++----- .../development/ocaml-modules/twt/default.nix | 65 +++--- .../ocaml-modules/ulex/default.nix | 66 +++--- pkgs/development/ocaml-modules/uri/sexp.nix | 30 +-- .../ocaml-modules/uuidm/default.nix | 73 ++++--- .../ocaml-modules/uunf/default.nix | 80 ++++---- pkgs/development/ocaml-modules/vg/default.nix | 100 +++++---- .../development/ocaml-modules/vlq/default.nix | 35 ++-- .../ocaml-modules/xmlm/default.nix | 56 +++--- pkgs/development/ocaml-modules/z3/default.nix | 63 +++--- .../ocaml-modules/zarith/default.nix | 83 ++++---- .../ocaml-modules/zipc/default.nix | 55 +++-- .../tools/ocaml/camlidl/default.nix | 93 +++++---- .../tools/ocaml/camlp5/default.nix | 165 ++++++++------- pkgs/development/tools/ocaml/dune/1.nix | 63 +++--- .../development/tools/ocaml/oasis/default.nix | 94 +++++---- .../ocaml/ocaml-recovery-parser/default.nix | 63 +++--- .../tools/ocaml/ocamlscript/default.nix | 59 +++--- .../tools/ocaml/ocp-build/default.nix | 91 ++++----- .../tools/ocaml/reanalyze/default.nix | 43 ++-- 77 files changed, 2520 insertions(+), 2760 deletions(-) diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index 269a433caad4..de8b7039e84e 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -20,48 +20,47 @@ ... }@args: -if args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion then - throw "${pname}-${version} is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation ( + args + // { + name = "ocaml${ocaml.version}-${pname}-${version}"; - stdenv.mkDerivation ( - args - // { - name = "ocaml${ocaml.version}-${pname}-${version}"; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + ocaml_oasis + ] + ++ nativeBuildInputs; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ocaml_oasis - ] - ++ nativeBuildInputs; + inherit createFindlibDestdir; + inherit dontStrip; - inherit createFindlibDestdir; - inherit dontStrip; + strictDeps = true; - strictDeps = true; + buildPhase = '' + runHook preBuild + oasis setup + ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out + ocaml setup.ml -build + runHook postBuild + ''; - buildPhase = '' - runHook preBuild - oasis setup - ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out - ocaml setup.ml -build - runHook postBuild - ''; + checkPhase = '' + runHook preCheck + ocaml setup.ml -test + runHook postCheck + ''; - checkPhase = '' - runHook preCheck - ocaml setup.ml -test - runHook postCheck - ''; + installPhase = '' + runHook preInstall + mkdir -p $out + ocaml setup.ml -install + runHook postInstall + ''; - installPhase = '' - runHook preInstall - mkdir -p $out - ocaml setup.ml -install - runHook postInstall - ''; - - } - ) + meta = args.meta // { + broken = args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion; + }; + } +) diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix index 55fca95e0493..b0a9b3fd78d1 100644 --- a/pkgs/by-name/li/libnbd/package.nix +++ b/pkgs/by-name/li/libnbd/package.nix @@ -16,83 +16,80 @@ autoreconfHook, }: -lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05") - "OCaml binding are not available for OCaml < 4.05" +stdenv.mkDerivation rec { + pname = "libnbd"; + version = "1.22.1"; - stdenv.mkDerivation - rec { - pname = "libnbd"; - version = "1.22.1"; + src = fetchurl { + url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; + hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI="; + }; - src = fetchurl { - url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI="; - }; - - nativeBuildInputs = [ - bash-completion - pkg-config - perl - autoreconfHook + nativeBuildInputs = [ + bash-completion + pkg-config + perl + autoreconfHook + ] + ++ lib.optionals buildPythonBindings [ python3 ] + ++ lib.optionals buildOcamlBindings ( + with ocamlPackages; + [ + findlib + ocaml ] - ++ lib.optionals buildPythonBindings [ python3 ] - ++ lib.optionals buildOcamlBindings ( - with ocamlPackages; - [ - findlib - ocaml - ] - ); + ); - buildInputs = [ - fuse - fuse3 - gnutls - libxml2 - ]; + buildInputs = [ + fuse + fuse3 + gnutls + libxml2 + ]; - postPatch = lib.optionalString buildOcamlBindings '' - substituteInPlace ocaml/Makefile.am \ - --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib' + postPatch = lib.optionalString buildOcamlBindings '' + substituteInPlace ocaml/Makefile.am \ + --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib' + ''; + + configureFlags = lib.optionals buildPythonBindings [ + "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" + ]; + + installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ]; + + postInstall = lib.optionalString buildPythonBindings '' + LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA' + install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA + substituteAllInPlace $LIBNBD_PYTHON_METADATA + ''; + + meta = with lib; { + homepage = "https://gitlab.com/nbdkit/libnbd"; + description = "Network Block Device client library in userspace"; + longDescription = '' + NBD — Network Block Device — is a protocol for accessing Block Devices + (hard disks and disk-like things) over a Network. This is the NBD client + library in userspace, a simple library for writing NBD clients. + + The key features are: + - Synchronous API for ease of use. + - Asynchronous API for writing non-blocking, multithreaded clients. You + can mix both APIs freely. + - High performance. + - Minimal dependencies for the basic library. + - Well-documented, stable API. + - Bindings in several programming languages. + - Shell (nbdsh) for command line and scripting. ''; - - configureFlags = lib.optionals buildPythonBindings [ - "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" + license = with licenses; lgpl21Plus; + maintainers = with maintainers; [ + humancalico ]; - - installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ]; - - postInstall = lib.optionalString buildPythonBindings '' - LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA' - install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA - substituteAllInPlace $LIBNBD_PYTHON_METADATA - ''; - - meta = with lib; { - homepage = "https://gitlab.com/nbdkit/libnbd"; - description = "Network Block Device client library in userspace"; - longDescription = '' - NBD — Network Block Device — is a protocol for accessing Block Devices - (hard disks and disk-like things) over a Network. This is the NBD client - library in userspace, a simple library for writing NBD clients. - - The key features are: - - Synchronous API for ease of use. - - Asynchronous API for writing non-blocking, multithreaded clients. You - can mix both APIs freely. - - High performance. - - Minimal dependencies for the basic library. - - Well-documented, stable API. - - Bindings in several programming languages. - - Shell (nbdsh) for command line and scripting. - ''; - license = with licenses; lgpl21Plus; - maintainers = with maintainers; [ - humancalico - ]; - platforms = with platforms; linux; - }; - } + platforms = with platforms; linux; + broken = buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05"; + }; +} # TODO: package the 1.6-stable version too # TODO: git version needs ocaml # TODO: bindings for go diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 51df8e7062d4..033266efa564 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -15,69 +15,66 @@ functory, }: -if lib.versionAtLeast ocaml.version "4.06" then - throw "mezzo is not available for OCaml ${ocaml.version}" -else +let + check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml); +in - let - check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml); - in +assert check-ocaml-version "4"; - assert check-ocaml-version "4"; +stdenv.mkDerivation { - stdenv.mkDerivation { + pname = "mezzo"; + version = "0.0.m8"; - pname = "mezzo"; - version = "0.0.m8"; + src = fetchFromGitHub { + owner = "protz"; + repo = "mezzo"; + rev = "m8"; + sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; + }; - src = fetchFromGitHub { - owner = "protz"; - repo = "mezzo"; - rev = "m8"; - sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + camlp4 + menhir + ]; + buildInputs = [ + yojson + menhirLib + ulex + pprint + fix + functory + ocamlbuild + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - camlp4 - menhir - ]; - buildInputs = [ - yojson - menhirLib - ulex - pprint - fix - functory - ocamlbuild - ]; - - # Sets warning 3 as non-fatal - prePatch = - lib.optionalString (check-ocaml-version "4.02") '' - substituteInPlace myocamlbuild.pre.ml \ - --replace '@1..3' '@1..2+3' - '' - # Compatibility with PPrint ≥ 20220103 - + '' - substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml - ''; - - createFindlibDestdir = true; - - postInstall = '' - mkdir $out/bin - cp mezzo $out/bin/ + # Sets warning 3 as non-fatal + prePatch = + lib.optionalString (check-ocaml-version "4.02") '' + substituteInPlace myocamlbuild.pre.ml \ + --replace '@1..3' '@1..2+3' + '' + # Compatibility with PPrint ≥ 20220103 + + '' + substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml ''; - meta = with lib; { - homepage = "http://protz.github.io/mezzo/"; - description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory"; - license = licenses.gpl2; - platforms = ocaml.meta.platforms or [ ]; - }; - } + createFindlibDestdir = true; + + postInstall = '' + mkdir $out/bin + cp mezzo $out/bin/ + ''; + + meta = with lib; { + homepage = "http://protz.github.io/mezzo/"; + description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory"; + license = licenses.gpl2; + broken = lib.versionAtLeast ocaml.version "4.06"; + platforms = ocaml.meta.platforms or [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/b0/default.nix b/pkgs/development/ocaml-modules/b0/default.nix index a6c0bb4327d8..f18002ccfc13 100644 --- a/pkgs/development/ocaml-modules/b0/default.nix +++ b/pkgs/development/ocaml-modules/b0/default.nix @@ -9,57 +9,51 @@ cmdliner, }: -let +stdenv.mkDerivation rec { -in -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "b0 is not available for OCaml ${ocaml.version}" + pname = "ocaml${ocaml.version}-b0"; + version = "0.0.5"; - stdenv.mkDerivation - rec { + src = fetchurl { + url = "${meta.homepage}/releases/b0-${version}.tbz"; + sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I="; + }; - pname = "ocaml${ocaml.version}-b0"; - version = "0.0.5"; + strictDeps = true; - src = fetchurl { - url = "${meta.homepage}/releases/b0-${version}.tbz"; - sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I="; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ + topkg + cmdliner + ]; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ - topkg - cmdliner - ]; - - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - description = "Software construction and deployment kit"; - longDescription = '' - WARNING this package is unstable and work in progress, do not depend on - it. - B0 describes software construction and deployments using modular and - customizable definitions written in OCaml. B0 describes: - * Build environments. - * Software configuration, build and testing. - * Source and binary deployments. - * Software life-cycle procedures. - B0 also provides the B00 build library which provides abitrary build - abstraction with reliable and efficient incremental rebuilds. The B00 - library can be – and has been – used on its own to devise domain specific - build systems. - ''; - homepage = "https://erratique.ch/software/b0"; - inherit (ocaml.meta) platforms; - license = licenses.isc; - maintainers = [ maintainers.Julow ]; - }; - } + meta = with lib; { + description = "Software construction and deployment kit"; + longDescription = '' + WARNING this package is unstable and work in progress, do not depend on + it. + B0 describes software construction and deployments using modular and + customizable definitions written in OCaml. B0 describes: + * Build environments. + * Software configuration, build and testing. + * Source and binary deployments. + * Software life-cycle procedures. + B0 also provides the B00 build library which provides abitrary build + abstraction with reliable and efficient incremental rebuilds. The B00 + library can be – and has been – used on its own to devise domain specific + build systems. + ''; + homepage = "https://erratique.ch/software/b0"; + inherit (ocaml.meta) platforms; + license = licenses.isc; + maintainers = [ maintainers.Julow ]; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 4120f81a1a02..57fc0f208589 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -42,111 +42,108 @@ z3, }: -if lib.versionOlder ocaml.version "4.08" then - throw "BAP is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-bap"; + version = "2.5.0+pr1621"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap"; + rev = "65c282d94e8b7028e8a986c637db3a2378a753f6"; + hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0="; + }; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-bap"; - version = "2.5.0+pr1621"; - src = fetchFromGitHub { - owner = "BinaryAnalysisPlatform"; - repo = "bap"; - rev = "65c282d94e8b7028e8a986c637db3a2378a753f6"; - hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0="; - }; + sigs = fetchurl { + url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; + sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk"; + }; - sigs = fetchurl { - url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk"; - }; + createFindlibDestdir = true; - createFindlibDestdir = true; + setupHook = writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" + ''; - setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/" - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" - ''; + nativeBuildInputs = [ + which + makeWrapper + ocaml + findlib + ocamlbuild + ocaml_oasis + ]; - nativeBuildInputs = [ - which - makeWrapper - ocaml - findlib - ocamlbuild - ocaml_oasis - ]; + buildInputs = [ + ocamlbuild + linenoise + ounit + ppx_bitstring + z3 + utop + libxml2 + ncurses + ]; - buildInputs = [ - ocamlbuild - linenoise - ounit - ppx_bitstring - z3 - utop - libxml2 - ncurses - ]; + propagatedBuildInputs = [ + bitstring + camlzip + cmdliner + ppx_bap + core_kernel + ezjsonm + fileutils + jane_rope + mmap + lwt + ocamlgraph + ocurl + re + uri + zarith + piqi + parsexp + piqi-ocaml + uuidm + frontc + yojson + ]; - propagatedBuildInputs = [ - bitstring - camlzip - cmdliner - ppx_bap - core_kernel - ezjsonm - fileutils - jane_rope - mmap - lwt - ocamlgraph - ocurl - re - uri - zarith - piqi - parsexp - piqi-ocaml - uuidm - frontc - yojson - ]; + installPhase = '' + runHook preInstall + export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; + export PATH=$PATH:$out/bin + export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ + mkdir -p $out/lib/bap + make install + rm $out/bin/baptop + makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\"" + wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH + ln -s $sigs $out/share/bap/sigs.zip + runHook postInstall + ''; - installPhase = '' - runHook preInstall - export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; - export PATH=$PATH:$out/bin - export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ - mkdir -p $out/lib/bap - make install - rm $out/bin/baptop - makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\"" - wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH - ln -s $sigs $out/share/bap/sigs.zip - runHook postInstall - ''; + disableIda = "--disable-ida"; + disableGhidra = "--disable-ghidra"; - disableIda = "--disable-ida"; - disableGhidra = "--disable-ghidra"; + patches = [ + ./curses_is_ncurses.patch + ]; - patches = [ - ./curses_is_ncurses.patch - ]; + preConfigure = '' + substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope + ''; - preConfigure = '' - substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope - ''; + configureFlags = [ + "--enable-everything ${disableIda} ${disableGhidra}" + "--with-llvm-config=${llvm.dev}/bin/llvm-config" + ]; - configureFlags = [ - "--enable-everything ${disableIda} ${disableGhidra}" - "--with-llvm-config=${llvm.dev}/bin/llvm-config" - ]; - - meta = with lib; { - description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages"; - homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; - license = licenses.mit; - maintainers = [ maintainers.maurer ]; - mainProgram = "bap"; - }; - } + meta = with lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages"; + homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; + license = licenses.mit; + maintainers = [ maintainers.maurer ]; + mainProgram = "bap"; + broken = lib.versionOlder ocaml.version "4.08"; + }; +} diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix index 18055887c8c6..9215c8293d28 100644 --- a/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -8,28 +8,25 @@ ounit, }: -if lib.versionOlder ppxlib.version "0.18.0" then - throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}" -else +buildDunePackage { + pname = "ppx_bitstring"; + inherit (bitstring) version src; - buildDunePackage { - pname = "ppx_bitstring"; - inherit (bitstring) version src; + patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { + url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch"; + hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g="; + }); - patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { - url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch"; - hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g="; - }); + buildInputs = [ + bitstring + ppxlib + ]; - buildInputs = [ - bitstring - ppxlib - ]; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ ounit ]; - - meta = bitstring.meta // { - description = "Bitstrings and bitstring matching for OCaml - PPX extension"; - }; - } + meta = bitstring.meta // { + description = "Bitstrings and bitstring matching for OCaml - PPX extension"; + broken = lib.versionOlder ppxlib.version "0.18.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index d99e050d7642..aa918ae4d674 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -8,11 +8,7 @@ }: let - version = - if lib.versionAtLeast ocaml.version "5.3" then - throw "brisk-reconciler is not available for OCaml ${ocaml.version}" - else - "1.0.0-alpha1"; + version = "1.0.0-alpha1"; in buildDunePackage { @@ -42,5 +38,6 @@ buildDunePackage { homepage = "https://github.com/briskml/brisk-reconciler"; maintainers = with lib.maintainers; [ momeemt ]; license = lib.licenses.mit; + broken = lib.versionAtLeast ocaml.version "5.3"; }; } diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix index 4fabc3418885..3d096571e86e 100644 --- a/pkgs/development/ocaml-modules/bz2/default.nix +++ b/pkgs/development/ocaml-modules/bz2/default.nix @@ -8,44 +8,41 @@ autoreconfHook, }: -if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0" then - throw "bz2 is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-bz2"; + version = "0.7.0"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-bz2"; - version = "0.7.0"; + src = fetchFromGitLab { + owner = "irill"; + repo = "camlbz2"; + rev = version; + sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U="; + }; - src = fetchFromGitLab { - owner = "irill"; - repo = "camlbz2"; - rev = version; - sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U="; - }; + autoreconfFlags = [ + "-I" + "." + ]; - autoreconfFlags = [ - "-I" - "." - ]; + nativeBuildInputs = [ + autoreconfHook + ocaml + findlib + ]; - nativeBuildInputs = [ - autoreconfHook - ocaml - findlib - ]; + propagatedBuildInputs = [ + bzip2 + ]; - propagatedBuildInputs = [ - bzip2 - ]; + strictDeps = true; - strictDeps = true; + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; - preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; - - meta = with lib; { - description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library"; - downloadPage = "https://gitlab.com/irill/camlbz2"; - license = licenses.lgpl21; - maintainers = [ ]; - }; - } + meta = with lib; { + description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library"; + downloadPage = "https://gitlab.com/irill/camlbz2"; + license = licenses.lgpl21; + broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0"; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 3bd8856bf1ce..65eafc11744d 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -6,36 +6,33 @@ findlib, }: -if lib.versionOlder ocaml.version "4.10" then - throw "camlpdf is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + version = "2.8"; + pname = "ocaml${ocaml.version}-camlpdf"; - stdenv.mkDerivation rec { - version = "2.8"; - pname = "ocaml${ocaml.version}-camlpdf"; + src = fetchFromGitHub { + owner = "johnwhitington"; + repo = "camlpdf"; + rev = "v${version}"; + hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk="; + }; - src = fetchFromGitHub { - owner = "johnwhitington"; - repo = "camlpdf"; - rev = "v${version}"; - hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk="; - }; + nativeBuildInputs = [ + ocaml + findlib + ]; - nativeBuildInputs = [ - ocaml - findlib - ]; + strictDeps = true; - strictDeps = true; + preInstall = '' + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + ''; - preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs - ''; - - meta = with lib; { - description = "OCaml library for reading, writing and modifying PDF files"; - homepage = "https://github.com/johnwhitington/camlpdf"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ vbgl ]; - }; - } + meta = with lib; { + description = "OCaml library for reading, writing and modifying PDF files"; + homepage = "https://github.com/johnwhitington/camlpdf"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ vbgl ]; + broken = lib.versionOlder ocaml.version "4.10"; + }; +} diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index da1c0aa10c2b..a0b36953bf47 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -8,41 +8,38 @@ ocamlbuild, }: -if lib.versionAtLeast ocaml.version "4.06" then - throw "cil is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml-cil"; + version = "1.7.3"; - stdenv.mkDerivation rec { - pname = "ocaml-cil"; - version = "1.7.3"; + src = fetchurl { + url = "mirror://sourceforge/cil/cil-${version}.tar.gz"; + sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; + }; - src = fetchurl { - url = "mirror://sourceforge/cil/cil-${version}.tar.gz"; - sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; - }; + nativeBuildInputs = [ + perl + ocaml + findlib + ocamlbuild + ]; - nativeBuildInputs = [ - perl - ocaml - findlib - ocamlbuild - ]; + strictDeps = true; - strictDeps = true; + createFindlibDestdir = true; - createFindlibDestdir = true; + preConfigure = '' + substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)' + export FORCE_PERL_PREFIX=1 + ''; + prefixKey = "-prefix="; - preConfigure = '' - substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)' - export FORCE_PERL_PREFIX=1 - ''; - prefixKey = "-prefix="; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/cil/"; - description = "Front-end for the C programming language that facilitates program analysis and transformation"; - license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; - }; - } + meta = with lib; { + homepage = "https://sourceforge.net/projects/cil/"; + description = "Front-end for the C programming language that facilitates program analysis and transformation"; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + broken = lib.versionAtLeast ocaml.version "4.06"; + platforms = ocaml.meta.platforms or [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cmarkit/default.nix b/pkgs/development/ocaml-modules/cmarkit/default.nix index 7589b9dd9a7f..b4828756f5cd 100644 --- a/pkgs/development/ocaml-modules/cmarkit/default.nix +++ b/pkgs/development/ocaml-modules/cmarkit/default.nix @@ -9,41 +9,38 @@ topkg, }: -if lib.versionOlder ocaml.version "4.14.0" then - throw "cmarkit is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "cmarkit"; + version = "0.3.0"; - stdenv.mkDerivation rec { - pname = "cmarkit"; - version = "0.3.0"; + src = fetchurl { + url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz"; + hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c="; + }; - src = fetchurl { - url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz"; - hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c="; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; + buildInputs = [ + topkg + cmdliner + ]; - buildInputs = [ - topkg - cmdliner - ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - description = "CommonMark parser and renderer for OCaml"; - homepage = "https://erratique.ch/software/cmarkit"; - changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md"; - license = licenses.isc; - maintainers = [ ]; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "CommonMark parser and renderer for OCaml"; + homepage = "https://erratique.ch/software/cmarkit"; + changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md"; + license = licenses.isc; + maintainers = [ ]; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.14.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix index ee57846783f9..32dbdff6a8fc 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_0.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_0.nix @@ -5,8 +5,6 @@ ocaml, }: -assert (lib.versionAtLeast ocaml.version "4.03"); - stdenv.mkDerivation rec { pname = "cmdliner"; version = "1.0.4"; @@ -34,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.isc; inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; + broken = !(lib.versionAtLeast ocaml.version "4.03"); }; } diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix index 31ec0e69ef2f..521b9b53168c 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix @@ -5,36 +5,33 @@ ocaml, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "cmdliner 1.1 is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "cmdliner"; + version = "1.3.0"; - stdenv.mkDerivation - rec { - pname = "cmdliner"; - version = "1.3.0"; + src = fetchurl { + url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; + sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs="; + }; - src = fetchurl { - url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs="; - }; + nativeBuildInputs = [ ocaml ]; - nativeBuildInputs = [ ocaml ]; + makeFlags = [ "PREFIX=$(out)" ]; + installTargets = "install install-doc"; + installFlags = [ + "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}" + "DOCDIR=$(out)/share/doc/${pname}" + ]; + postInstall = '' + mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam} + ''; - makeFlags = [ "PREFIX=$(out)" ]; - installTargets = "install install-doc"; - installFlags = [ - "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}" - "DOCDIR=$(out)/share/doc/${pname}" - ]; - postInstall = '' - mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam} - ''; - - meta = with lib; { - homepage = "https://erratique.ch/software/cmdliner"; - description = "OCaml module for the declarative definition of command line interfaces"; - license = licenses.isc; - inherit (ocaml.meta) platforms; - maintainers = [ maintainers.vbgl ]; - }; - } + meta = with lib; { + homepage = "https://erratique.ch/software/cmdliner"; + description = "OCaml module for the declarative definition of command line interfaces"; + license = licenses.isc; + inherit (ocaml.meta) platforms; + maintainers = [ maintainers.vbgl ]; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 4bb913d544bf..149425301a6d 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -7,34 +7,31 @@ camlp4, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "config-file is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml-config-file"; + version = "1.2"; - stdenv.mkDerivation - rec { - pname = "ocaml-config-file"; - version = "1.2"; + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz"; + sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; + }; - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz"; - sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; - }; + nativeBuildInputs = [ + ocaml + findlib + camlp4 + ]; - nativeBuildInputs = [ - ocaml - findlib - camlp4 - ]; + strictDeps = true; - strictDeps = true; + createFindlibDestdir = true; - createFindlibDestdir = true; - - meta = { - homepage = "http://config-file.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or [ ]; - description = "OCaml library used to manage the configuration file(s) of an application"; - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ vbgl ]; - }; - } + meta = { + homepage = "http://config-file.forge.ocamlcore.org/"; + platforms = ocaml.meta.platforms or [ ]; + description = "OCaml library used to manage the configuration file(s) of an application"; + license = lib.licenses.lgpl2Plus; + broken = lib.versionAtLeast ocaml.version "5.0"; + maintainers = with lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 66823ce21fa1..8dff973a92e1 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -7,44 +7,41 @@ camlpdf, }: -if lib.versionOlder ocaml.version "4.10" then - throw "cpdf is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-cpdf"; + version = "2.8"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-cpdf"; - version = "2.8"; + src = fetchFromGitHub { + owner = "johnwhitington"; + repo = "cpdf-source"; + rev = "v${version}"; + hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg="; + }; - src = fetchFromGitHub { - owner = "johnwhitington"; - repo = "cpdf-source"; - rev = "v${version}"; - hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg="; - }; + nativeBuildInputs = [ + ocaml + findlib + ]; + propagatedBuildInputs = [ camlpdf ]; - nativeBuildInputs = [ - ocaml - findlib - ]; - propagatedBuildInputs = [ camlpdf ]; + strictDeps = true; - strictDeps = true; + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR + mkdir -p $out/bin + cp cpdf $out/bin + mkdir -p $out/share/ + cp -r doc $out/share + cp cpdfmanual.pdf $out/share/doc/cpdf/ + ''; - preInstall = '' - mkdir -p $OCAMLFIND_DESTDIR - mkdir -p $out/bin - cp cpdf $out/bin - mkdir -p $out/share/ - cp -r doc $out/share - cp cpdfmanual.pdf $out/share/doc/cpdf/ - ''; - - meta = with lib; { - description = "PDF Command Line Tools"; - homepage = "https://www.coherentpdf.com/"; - license = licenses.agpl3Only; - maintainers = [ maintainers.vbgl ]; - mainProgram = "cpdf"; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "PDF Command Line Tools"; + homepage = "https://www.coherentpdf.com/"; + license = licenses.agpl3Only; + maintainers = [ maintainers.vbgl ]; + mainProgram = "cpdf"; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.10"; + }; +} diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index b69342f19add..da0d475f6796 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -6,43 +6,40 @@ findlib, }: -if lib.versionAtLeast ocaml.version "4.06" then - throw "cryptgps is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation { + pname = "ocaml-cryptgps"; + version = "0.2.1"; - stdenv.mkDerivation { - pname = "ocaml-cryptgps"; - version = "0.2.1"; + src = fetchurl { + url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz"; + sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s"; + }; - src = fetchurl { - url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz"; - sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s"; - }; + nativeBuildInputs = [ + ocaml + findlib + ]; - nativeBuildInputs = [ - ocaml - findlib + strictDeps = true; + + dontConfigure = true; # Skip configure phase + + createFindlibDestdir = true; + + meta = { + homepage = "http://projects.camlcity.org/projects/cryptgps.html"; + description = "Cryptographic functions for OCaml"; + longDescription = '' + This library implements the symmetric cryptographic algorithms + Blowfish, DES, and 3DES. The algorithms are written in O'Caml, + i.e. this is not a binding to some C library, but the implementation + itself. + ''; + license = lib.licenses.mit; + broken = lib.versionAtLeast ocaml.version "4.06"; + inherit (ocaml.meta) platforms; + maintainers = [ + lib.maintainers.maggesi ]; - - strictDeps = true; - - dontConfigure = true; # Skip configure phase - - createFindlibDestdir = true; - - meta = { - homepage = "http://projects.camlcity.org/projects/cryptgps.html"; - description = "Cryptographic functions for OCaml"; - longDescription = '' - This library implements the symmetric cryptographic algorithms - Blowfish, DES, and 3DES. The algorithms are written in O'Caml, - i.e. this is not a binding to some C library, but the implementation - itself. - ''; - license = lib.licenses.mit; - inherit (ocaml.meta) platforms; - maintainers = [ - lib.maintainers.maggesi - ]; - }; - } + }; +} diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 001656d6c65a..38f02a0be256 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,63 +17,59 @@ ocsipersist, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.3") - "eliom is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "eliom"; + version = "11.1.1"; - buildDunePackage - rec { - pname = "eliom"; - version = "11.1.1"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "eliom"; + rev = version; + hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo="; + }; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "eliom"; - rev = version; - hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo="; - }; + nativeBuildInputs = [ + which + ]; + buildInputs = [ + js_of_ocaml-ocamlbuild + js_of_ocaml-ppx_deriving_json + ppx_optcomp + ]; - nativeBuildInputs = [ - which - ]; - buildInputs = [ - js_of_ocaml-ocamlbuild - js_of_ocaml-ppx_deriving_json - ppx_optcomp - ]; + propagatedBuildInputs = [ + js_of_ocaml-lwt + js_of_ocaml-ppx + js_of_ocaml-tyxml + lwt_ppx + lwt_react + ocsigen_server + ocsipersist + ppx_deriving + ]; - propagatedBuildInputs = [ - js_of_ocaml-lwt - js_of_ocaml-ppx - js_of_ocaml-tyxml - lwt_ppx - lwt_react - ocsigen_server - ocsipersist - ppx_deriving - ]; + strictDeps = true; - strictDeps = true; + setupHook = [ ./setup-hook.sh ]; - setupHook = [ ./setup-hook.sh ]; + meta = { + homepage = "http://ocsigen.org/eliom/"; + description = "OCaml Framework for programming Web sites and client/server Web applications"; - meta = { - homepage = "http://ocsigen.org/eliom/"; - description = "OCaml Framework for programming Web sites and client/server Web applications"; + longDescription = '' + Eliom is a framework for programming Web sites + and client/server Web applications. It introduces new concepts to + simplify programming common behaviours and uses advanced static + typing features of OCaml to check many properties of the Web site + at compile time. If you want to write a Web application, Eliom + makes possible to write the whole application as a single program + (client and server parts). A syntax extension is used to + distinguish both parts and the client side is compiled to JS using + Ocsigen Js_of_ocaml. + ''; - longDescription = '' - Eliom is a framework for programming Web sites - and client/server Web applications. It introduces new concepts to - simplify programming common behaviours and uses advanced static - typing features of OCaml to check many properties of the Web site - at compile time. If you want to write a Web application, Eliom - makes possible to write the whole application as a single program - (client and server parts). A syntax extension is used to - distinguish both parts and the client side is compiled to JS using - Ocsigen Js_of_ocaml. - ''; - - license = lib.licenses.lgpl21; - - maintainers = [ lib.maintainers.gal_bolle ]; - }; - } + license = lib.licenses.lgpl21; + broken = lib.versionAtLeast ocaml.version "5.3"; + maintainers = [ lib.maintainers.gal_bolle ]; + }; +} diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index de1e15115e7b..a68c56a495e2 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -7,36 +7,33 @@ ocamlbuild, }: -if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0" then - throw "erm_xml is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-erm_xml"; + version = "0.3+20180112"; - stdenv.mkDerivation { - pname = "ocaml${ocaml.version}-erm_xml"; - version = "0.3+20180112"; + src = fetchFromGitHub { + owner = "hannesm"; + repo = "xml"; + rev = "bbabdade807d8281fc48806da054b70dfe482479"; + sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; + }; - src = fetchFromGitHub { - owner = "hannesm"; - repo = "xml"; - rev = "bbabdade807d8281fc48806da054b70dfe482479"; - sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; + strictDeps = true; - strictDeps = true; + createFindlibDestdir = true; - createFindlibDestdir = true; - - meta = { - homepage = "https://github.com/hannesm/xml"; - description = "XML Parser for discrete data"; - platforms = ocaml.meta.platforms or [ ]; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ vbgl ]; - }; - } + meta = { + homepage = "https://github.com/hannesm/xml"; + description = "XML Parser for discrete data"; + platforms = ocaml.meta.platforms or [ ]; + license = lib.licenses.bsd3; + broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0"; + maintainers = with lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 17bc6e628c5d..f62fef29a4e6 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -8,44 +8,41 @@ ounit, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") - "ocaml_expat is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-expat"; + version = "1.3.0"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-expat"; - version = "1.3.0"; + src = fetchFromGitHub { + owner = "whitequark"; + repo = "ocaml-expat"; + rev = "v${version}"; + hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg="; + }; - src = fetchFromGitHub { - owner = "whitequark"; - repo = "ocaml-expat"; - rev = "v${version}"; - hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg="; - }; + prePatch = '' + substituteInPlace Makefile --replace "gcc" "\$(CC)" + ''; - prePatch = '' - substituteInPlace Makefile --replace "gcc" "\$(CC)" - ''; + nativeBuildInputs = [ + ocaml + findlib + ]; + buildInputs = [ expat ]; - nativeBuildInputs = [ - ocaml - findlib - ]; - buildInputs = [ expat ]; + strictDeps = true; - strictDeps = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkTarget = "testall"; + checkInputs = [ ounit ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkTarget = "testall"; - checkInputs = [ ounit ]; + createFindlibDestdir = true; - createFindlibDestdir = true; - - meta = { - description = "OCaml wrapper for the Expat XML parsing library"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "OCaml wrapper for the Expat XML parsing library"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.02"); + }; +} diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index d2ebf8b8805f..2981640c6b19 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -5,26 +5,24 @@ ocaml, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "facile is not available for OCaml ≥ 5.0" +buildDunePackage rec { + pname = "facile"; + version = "1.1.4"; - buildDunePackage - rec { - pname = "facile"; - version = "1.1.4"; + src = fetchurl { + url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; + sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; + }; - src = fetchurl { - url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; - sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; - }; + doCheck = true; - doCheck = true; + duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1"; + postPatch = lib.optionalString (duneVersion != "1") "dune upgrade"; - duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1"; - postPatch = lib.optionalString (duneVersion != "1") "dune upgrade"; - - meta = { - homepage = "http://opti.recherche.enac.fr/facile/"; - license = lib.licenses.lgpl21Plus; - description = "Functional Constraint Library"; - }; - } + meta = { + homepage = "http://opti.recherche.enac.fr/facile/"; + license = lib.licenses.lgpl21Plus; + description = "Functional Constraint Library"; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index ddc73697d8ef..83395d161a7a 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -9,38 +9,35 @@ faraday, }: -if lib.versionOlder ocaml.version "4.3" then - throw "farfadet is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-farfadet"; + version = "0.3"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-farfadet"; - version = "0.3"; + src = fetchurl { + url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz"; + sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; + }; - src = fetchurl { - url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz"; - sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; + propagatedBuildInputs = [ faraday ]; - propagatedBuildInputs = [ faraday ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = { - description = "Printf-like for Faraday library"; - homepage = "https://github.com/oklm-wsh/Farfadet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "Printf-like for Faraday library"; + homepage = "https://github.com/oklm-wsh/Farfadet"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.3"; + }; +} diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index d33e709f731a..254ca3f51c5c 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -9,39 +9,36 @@ cmdliner, }: -if lib.versionOlder ocaml.version "4.08" then - throw "fmt is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + version = "0.11.0"; + pname = "ocaml${ocaml.version}-fmt"; - stdenv.mkDerivation rec { - version = "0.11.0"; - pname = "ocaml${ocaml.version}-fmt"; + src = fetchurl { + url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz"; + sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs="; + }; - src = fetchurl { - url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz"; - sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs="; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ + cmdliner + topkg + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ - cmdliner - topkg - ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - homepage = "https://erratique.ch/software/fmt"; - license = licenses.isc; - description = "OCaml Format pretty-printer combinators"; - inherit (ocaml.meta) platforms; - maintainers = [ maintainers.vbgl ]; - }; - } + meta = with lib; { + homepage = "https://erratique.ch/software/fmt"; + license = licenses.isc; + description = "OCaml Format pretty-printer combinators"; + inherit (ocaml.meta) platforms; + maintainers = [ maintainers.vbgl ]; + broken = lib.versionOlder ocaml.version "4.08"; + }; +} diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 861b91901e55..b0bfbe507f6c 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -9,38 +9,35 @@ astring, }: -if lib.versionOlder ocaml.version "4.03" then - throw "fpath is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-fpath"; + version = "0.7.3"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-fpath"; - version = "0.7.3"; + src = fetchurl { + url = "https://erratique.ch/software/fpath/releases/fpath-${version}.tbz"; + sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; + }; - src = fetchurl { - url = "https://erratique.ch/software/fpath/releases/fpath-${version}.tbz"; - sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; + propagatedBuildInputs = [ astring ]; - propagatedBuildInputs = [ astring ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = { - description = "OCaml module for handling file system paths with POSIX and Windows conventions"; - homepage = "https://erratique.ch/software/fpath"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "OCaml module for handling file system paths with POSIX and Windows conventions"; + homepage = "https://erratique.ch/software/fpath"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.03"; + }; +} diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 84b16d678de8..44b7adfa6fff 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -20,35 +20,32 @@ let }; in -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "functory is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-functory"; + inherit (param) version; - stdenv.mkDerivation - { - pname = "ocaml${ocaml.version}-functory"; - inherit (param) version; + src = fetchurl { + url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; + inherit (param) sha256; + }; - src = fetchurl { - url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; - inherit (param) sha256; - }; + nativeBuildInputs = [ + ocaml + findlib + ]; - nativeBuildInputs = [ - ocaml - findlib - ]; + strictDeps = true; - strictDeps = true; + installTargets = [ "ocamlfind-install" ]; - installTargets = [ "ocamlfind-install" ]; + createFindlibDestdir = true; - createFindlibDestdir = true; - - meta = with lib; { - homepage = "https://www.lri.fr/~filliatr/functory/"; - description = "Distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; - license = licenses.lgpl21; - maintainers = [ maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + homepage = "https://www.lri.fr/~filliatr/functory/"; + description = "Distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; + license = licenses.lgpl21; + maintainers = [ maintainers.vbgl ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 7b015cf6840c..8e6c205695e1 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -13,43 +13,40 @@ let version = "1.0.0"; in -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "gg is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation { - stdenv.mkDerivation - { + pname = "ocaml${ocaml.version}-gg"; + inherit version; - pname = "ocaml${ocaml.version}-gg"; - inherit version; + src = fetchurl { + url = "${homepage}/releases/gg-${version}.tbz"; + sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; + }; - src = fetchurl { - url = "${homepage}/releases/gg-${version}.tbz"; - sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - description = "Basic types for computer graphics in OCaml"; - longDescription = '' - Gg is an OCaml module providing basic types for computer graphics. It - defines types and functions for floats, vectors, points, sizes, - matrices, quaternions, axis aligned boxes, colors, color spaces, and - raster data. - ''; - inherit homepage; - inherit (ocaml.meta) platforms; - license = licenses.bsd3; - maintainers = [ maintainers.jirkamarsik ]; - }; - } + meta = with lib; { + description = "Basic types for computer graphics in OCaml"; + longDescription = '' + Gg is an OCaml module providing basic types for computer graphics. It + defines types and functions for floats, vectors, points, sizes, + matrices, quaternions, axis aligned boxes, colors, color spaces, and + raster data. + ''; + inherit homepage; + inherit (ocaml.meta) platforms; + license = licenses.bsd3; + maintainers = [ maintainers.jirkamarsik ]; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix index 61892116d6e9..7021af3b8f3d 100644 --- a/pkgs/development/ocaml-modules/hmap/default.nix +++ b/pkgs/development/ocaml-modules/hmap/default.nix @@ -11,8 +11,6 @@ let minimumSupportedOcamlVersion = "4.02.0"; in -assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version; - stdenv.mkDerivation rec { pname = "hmap"; version = "0.8.1"; @@ -46,5 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/hmap"; license = lib.licenses.isc; maintainers = [ lib.maintainers.pmahoney ]; + broken = !(lib.versionOlder minimumSupportedOcamlVersion ocaml.version); }; } diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 43a6424f7c04..7fca71f2035a 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -9,51 +9,48 @@ extlib, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "javalib is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-javalib"; + version = "3.2.2"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-javalib"; - version = "3.2.2"; + src = fetchFromGitHub { + owner = "javalib-team"; + repo = "javalib"; + rev = version; + hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s="; + }; - src = fetchFromGitHub { - owner = "javalib-team"; - repo = "javalib"; - rev = version; - hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s="; - }; + nativeBuildInputs = [ + which + ocaml + findlib + ]; - nativeBuildInputs = [ - which - ocaml - findlib - ]; + strictDeps = true; - strictDeps = true; + patches = [ + ./configure.sh.patch + ./Makefile.config.example.patch + ]; - patches = [ - ./configure.sh.patch - ./Makefile.config.example.patch - ]; + createFindlibDestdir = true; - createFindlibDestdir = true; + configureScript = "./configure.sh"; + dontAddPrefix = "true"; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; - configureScript = "./configure.sh"; - dontAddPrefix = "true"; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; + propagatedBuildInputs = [ + camlzip + extlib + ]; - propagatedBuildInputs = [ - camlzip - extlib - ]; - - meta = with lib; { - description = "Library that parses Java .class files into OCaml data structures"; - homepage = "https://javalib-team.github.io/javalib/"; - license = licenses.lgpl3; - maintainers = [ maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "Library that parses Java .class files into OCaml data structures"; + homepage = "https://javalib-team.github.io/javalib/"; + license = licenses.lgpl3; + maintainers = [ maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 9c0698878a58..f096b7f3190c 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -7,28 +7,25 @@ zlib, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "kafka is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "kafka"; + version = "0.5"; - buildDunePackage - rec { - pname = "kafka"; - version = "0.5"; + src = fetchurl { + url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; + sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; + }; - src = fetchurl { - url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; - sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; - }; + propagatedBuildInputs = [ + rdkafka + zlib + ]; - propagatedBuildInputs = [ - rdkafka - zlib - ]; - - meta = with lib; { - homepage = "https://github.com/didier-wenzek/ocaml-kafka"; - description = "OCaml bindings for Kafka"; - license = licenses.mit; - maintainers = [ maintainers.vbgl ]; - }; - } + meta = with lib; { + homepage = "https://github.com/didier-wenzek/ocaml-kafka"; + description = "OCaml bindings for Kafka"; + license = licenses.mit; + maintainers = [ maintainers.vbgl ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix index e638fe513f3b..0ee37ea0f657 100644 --- a/pkgs/development/ocaml-modules/kafka/lwt.nix +++ b/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -7,23 +7,20 @@ cmdliner, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "kafka_lwt is not available for OCaml ${ocaml.version}" +buildDunePackage { + pname = "kafka_lwt"; - buildDunePackage - { - pname = "kafka_lwt"; + inherit (kafka) version src; - inherit (kafka) version src; + buildInputs = [ cmdliner ]; - buildInputs = [ cmdliner ]; + propagatedBuildInputs = [ + kafka + lwt + ]; - propagatedBuildInputs = [ - kafka - lwt - ]; - - meta = kafka.meta // { - description = "OCaml bindings for Kafka, Lwt bindings"; - }; - } + meta = kafka.meta // { + description = "OCaml bindings for Kafka, Lwt bindings"; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 3736fc84a8d4..06b7f64157d3 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -9,73 +9,70 @@ camlp-streams, }: -if lib.versionOlder ocaml.version "4.06" then - throw "lablgl is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-lablgl"; + version = "1.07"; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-lablgl"; - version = "1.07"; + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgl"; + rev = "v${version}"; + hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4="; + }; - src = fetchFromGitHub { - owner = "garrigue"; - repo = "lablgl"; - rev = "v${version}"; - hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4="; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + ocaml + findlib + ]; + buildInputs = [ + libglut + camlp-streams + ]; + propagatedBuildInputs = [ + libGLU + ]; - nativeBuildInputs = [ - ocaml - findlib + patches = [ ./META.patch ]; + + preConfigure = '' + mkdir -p $out/bin + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + cp \ + Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \ + Makefile.config + ''; + + makeFlags = [ + "BINDIR=${placeholder "out"}/bin/" + "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/" + "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/" + "XINCLUDES=" + "TKINCLUDES=" + "TKLIBS=" + ]; + + buildFlags = [ + "lib" + "libopt" + "glut" + "glutopt" + ]; + + postInstall = '' + cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl + ''; + + meta = with lib; { + description = "OpenGL bindings for ocaml"; + homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; + license = licenses.gpl2; + maintainers = with maintainers; [ + pSub + vbgl ]; - buildInputs = [ - libglut - camlp-streams - ]; - propagatedBuildInputs = [ - libGLU - ]; - - patches = [ ./META.patch ]; - - preConfigure = '' - mkdir -p $out/bin - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs - cp \ - Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \ - Makefile.config - ''; - - makeFlags = [ - "BINDIR=${placeholder "out"}/bin/" - "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/" - "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/" - "XINCLUDES=" - "TKINCLUDES=" - "TKLIBS=" - ]; - - buildFlags = [ - "lib" - "libopt" - "glut" - "glutopt" - ]; - - postInstall = '' - cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl - ''; - - meta = with lib; { - description = "OpenGL bindings for ocaml"; - homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; - license = licenses.gpl2; - maintainers = with maintainers; [ - pSub - vbgl - ]; - mainProgram = "lablglut"; - }; - } + mainProgram = "lablglut"; + broken = lib.versionOlder ocaml.version "4.06"; + }; +} diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 469c3750cafc..172e1d539e27 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -10,41 +10,38 @@ xmlm, }: -if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.13" then - throw "lablgtk-extras is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + version = "1.6"; + pname = "ocaml${ocaml.version}-lablgtk-extras"; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "zoggy"; + repo = "lablgtk-extras"; + rev = "release-${version}"; + sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; + }; - stdenv.mkDerivation rec { - version = "1.6"; - pname = "ocaml${ocaml.version}-lablgtk-extras"; - src = fetchFromGitLab { - domain = "framagit.org"; - owner = "zoggy"; - repo = "lablgtk-extras"; - rev = "release-${version}"; - sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + ocaml + findlib + camlp4 + ]; + propagatedBuildInputs = [ + config-file + lablgtk + xmlm + ]; - nativeBuildInputs = [ - ocaml - findlib - camlp4 - ]; - propagatedBuildInputs = [ - config-file - lablgtk - xmlm - ]; + createFindlibDestdir = true; - createFindlibDestdir = true; - - meta = { - inherit (ocaml.meta) platforms; - maintainers = with lib.maintainers; [ vbgl ]; - homepage = "https://framagit.org/zoggy/lablgtk-extras/"; - description = "Collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; - license = lib.licenses.lgpl2Plus; - }; - } + meta = { + inherit (ocaml.meta) platforms; + maintainers = with lib.maintainers; [ vbgl ]; + homepage = "https://framagit.org/zoggy/lablgtk-extras/"; + description = "Collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; + license = lib.licenses.lgpl2Plus; + broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.13"; + }; +} diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix index 8a2ac28d8289..150b7a9519ca 100644 --- a/pkgs/development/ocaml-modules/lem/default.nix +++ b/pkgs/development/ocaml-modules/lem/default.nix @@ -10,49 +10,46 @@ zarith, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") - "lem is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-lem"; + version = "2025-03-13"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-lem"; - version = "2025-03-13"; + src = fetchFromGitHub { + owner = "rems-project"; + repo = "lem"; + rev = version; + hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY="; + }; - src = fetchFromGitHub { - owner = "rems-project"; - repo = "lem"; - rev = version; - hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY="; - }; + nativeBuildInputs = [ + makeWrapper + ocamlbuild + findlib + ocaml + ]; + propagatedBuildInputs = [ + zarith + num + ]; - nativeBuildInputs = [ - makeWrapper - ocamlbuild - findlib - ocaml + installFlags = [ "INSTALL_DIR=$(out)" ]; + + createFindlibDestdir = true; + + postInstall = '' + wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library + ''; + + meta = with lib; { + homepage = "https://github.com/rems-project/lem"; + description = "Tool for lightweight executable mathematics"; + mainProgram = "lem"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = with licenses; [ + bsd3 + gpl2 ]; - propagatedBuildInputs = [ - zarith - num - ]; - - installFlags = [ "INSTALL_DIR=$(out)" ]; - - createFindlibDestdir = true; - - postInstall = '' - wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library - ''; - - meta = with lib; { - homepage = "https://github.com/rems-project/lem"; - description = "Tool for lightweight executable mathematics"; - mainProgram = "lem"; - maintainers = with maintainers; [ genericnerdyusername ]; - license = with licenses; [ - bsd3 - gpl2 - ]; - platforms = ocaml.meta.platforms; - }; - } + platforms = ocaml.meta.platforms; + broken = !(lib.versionAtLeast ocaml.version "4.07"); + }; +} diff --git a/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix index ccefd91c06cf..40930e21f94f 100644 --- a/pkgs/development/ocaml-modules/linksem/default.nix +++ b/pkgs/development/ocaml-modules/linksem/default.nix @@ -7,35 +7,32 @@ lem, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") - "linksem is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-linksem"; + version = "0.8"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-linksem"; - version = "0.8"; + src = fetchFromGitHub { + owner = "rems-project"; + repo = "linksem"; + rev = version; + hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA="; + }; - src = fetchFromGitHub { - owner = "rems-project"; - repo = "linksem"; - rev = version; - hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA="; - }; + nativeBuildInputs = [ + findlib + ocaml + ]; - nativeBuildInputs = [ - findlib - ocaml - ]; + propagatedBuildInputs = [ lem ]; - propagatedBuildInputs = [ lem ]; + createFindlibDestdir = true; - createFindlibDestdir = true; - - meta = with lib; { - homepage = "https://github.com/rems-project/linksem"; - description = "Formalisation of substantial parts of ELF linking and DWARF debug information"; - maintainers = with maintainers; [ genericnerdyusername ]; - license = licenses.bsd2; - platforms = ocaml.meta.platforms; - }; - } + meta = with lib; { + homepage = "https://github.com/rems-project/linksem"; + description = "Formalisation of substantial parts of ELF linking and DWARF debug information"; + maintainers = with maintainers; [ genericnerdyusername ]; + license = licenses.bsd2; + platforms = ocaml.meta.platforms; + broken = !(lib.versionAtLeast ocaml.version "4.07"); + }; +} diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index 4fbc81bfc313..a53a996da8a4 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -12,66 +12,63 @@ libmysqlclient, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") - "mariadb is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-mariadb"; + version = "1.1.6"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-mariadb"; - version = "1.1.6"; + src = fetchurl { + url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz"; + sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; + }; - src = fetchurl { - url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz"; - sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; - }; + patches = + lib.lists.map + ( + x: + fetchpatch { + url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch"; + inherit (x) hash; + } + ) + [ + { + path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5"; + hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; + } + { + path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581"; + hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg="; + } + ]; - patches = - lib.lists.map - ( - x: - fetchpatch { - url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch"; - inherit (x) hash; - } - ) - [ - { - path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5"; - hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; - } - { - path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581"; - hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg="; - } - ]; + postPatch = '' + substituteInPlace setup.ml --replace '#use "topfind"' \ + '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"' + ''; - postPatch = '' - substituteInPlace setup.ml --replace '#use "topfind"' \ - '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"' - ''; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + ]; + buildInputs = [ + mariadb + libmysqlclient + camlp-streams + ocamlbuild + ]; + propagatedBuildInputs = [ ctypes ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - buildInputs = [ - mariadb - libmysqlclient - camlp-streams - ocamlbuild - ]; - propagatedBuildInputs = [ ctypes ]; + strictDeps = true; - strictDeps = true; + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; - preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; - - meta = { - description = "OCaml bindings for MariaDB"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bcc32 ]; - homepage = "https://github.com/andrenth/ocaml-mariadb"; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "OCaml bindings for MariaDB"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcc32 ]; + homepage = "https://github.com/andrenth/ocaml-mariadb"; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.07"); + }; +} diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix index 32ffbd5f82cf..e469c9daff9d 100644 --- a/pkgs/development/ocaml-modules/memprof-limits/default.nix +++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix @@ -5,26 +5,24 @@ ocaml, }: -if !(lib.versionOlder ocaml.version "5.0.0") then - throw "memprof-limits is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { - pname = "memprof-limits"; - version = "0.2.1"; +buildDunePackage rec { + pname = "memprof-limits"; + version = "0.2.1"; - src = fetchFromGitLab { - owner = "gadmm"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc="; - }; + src = fetchFromGitLab { + owner = "gadmm"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc="; + }; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.12"; - meta = with lib; { - homepage = "https://ocaml.org/p/memprof-limits/latest"; - description = "Memory limits, allocation limits, and thread cancellation for OCaml"; - license = licenses.lgpl3; - maintainers = with maintainers; [ alizter ]; - }; - } + meta = with lib; { + homepage = "https://ocaml.org/p/memprof-limits/latest"; + description = "Memory limits, allocation limits, and thread cancellation for OCaml"; + license = licenses.lgpl3; + maintainers = with maintainers; [ alizter ]; + broken = !(lib.versionOlder ocaml.version "5.0.0"); + }; +} diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 4c6677114b09..ff7e19c89ce0 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -8,36 +8,33 @@ topkg, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "mtime is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-mtime"; + version = "2.1.0"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-mtime"; - version = "2.1.0"; + src = fetchurl { + url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; + sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg="; + }; - src = fetchurl { - url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg="; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - description = "Monotonic wall-clock time for OCaml"; - homepage = "https://erratique.ch/software/mtime"; - inherit (ocaml.meta) platforms; - maintainers = [ maintainers.vbgl ]; - license = licenses.bsd3; - }; - } + meta = with lib; { + description = "Monotonic wall-clock time for OCaml"; + homepage = "https://erratique.ch/software/mtime"; + inherit (ocaml.meta) platforms; + maintainers = [ maintainers.vbgl ]; + license = licenses.bsd3; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 7d547d3818f9..32baf666f8b1 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -5,28 +5,26 @@ ocaml, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "nonstd is not available for OCaml ≥ 5.0" +buildDunePackage rec { + pname = "nonstd"; + version = "0.0.3"; - buildDunePackage - rec { - pname = "nonstd"; - version = "0.0.3"; + minimalOCamlVersion = "4.02"; - minimalOCamlVersion = "4.02"; + src = fetchzip { + url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; + sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; + }; - src = fetchzip { - url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; - sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; - }; + duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1"; + postPatch = lib.optionalString (duneVersion != "1") "dune upgrade"; + doCheck = true; - duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1"; - postPatch = lib.optionalString (duneVersion != "1") "dune upgrade"; - doCheck = true; - - meta = with lib; { - homepage = "https://bitbucket.org/smondet/nonstd"; - description = "Non-standard mini-library"; - license = licenses.isc; - maintainers = [ maintainers.alexfmpe ]; - }; - } + meta = with lib; { + homepage = "https://bitbucket.org/smondet/nonstd"; + description = "Non-standard mini-library"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/note/default.nix b/pkgs/development/ocaml-modules/note/default.nix index c5e801456a47..176d6581e82d 100644 --- a/pkgs/development/ocaml-modules/note/default.nix +++ b/pkgs/development/ocaml-modules/note/default.nix @@ -9,32 +9,29 @@ brr, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "note is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-note"; + version = "0.0.3"; + src = fetchurl { + url = "https://erratique.ch/software/note/releases/note-${version}.tbz"; + hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k="; + }; + buildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + inherit (topkg) buildPhase installPhase; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-note"; - version = "0.0.3"; - src = fetchurl { - url = "https://erratique.ch/software/note/releases/note-${version}.tbz"; - hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k="; - }; - buildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - inherit (topkg) buildPhase installPhase; + propagatedBuildInputs = [ brr ]; - propagatedBuildInputs = [ brr ]; - - meta = { - homepage = "https://erratique.ch/software/note"; - description = "OCaml module for functional reactive programming"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = { + homepage = "https://erratique.ch/software/note"; + description = "OCaml module for functional reactive programming"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index c0cfa54ca997..6a5a696aa20e 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -20,63 +20,59 @@ let pname = "ocaml-cairo"; in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.2.0"; -if lib.versionAtLeast ocaml.version "4.06" then - throw "${pname} is not available for OCaml ${ocaml.version}" -else + src = fetchurl { + url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip"; + sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l"; + }; - stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.2.0"; + patches = [ ./META.patch ]; - src = fetchurl { - url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip"; - sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l"; - }; + strictDeps = true; - patches = [ ./META.patch ]; + nativeBuildInputs = [ + pkg-config + unzip + ocaml + automake + gnum4 + autoconf + findlib + ]; + buildInputs = [ + freetype + lablgtk + cairo + gdk-pixbuf + gtk2 + pango + ]; - strictDeps = true; + createFindlibDestdir = true; - nativeBuildInputs = [ - pkg-config - unzip - ocaml - automake - gnum4 - autoconf - findlib - ]; - buildInputs = [ - freetype - lablgtk - cairo - gdk-pixbuf - gtk2 - pango - ]; + preConfigure = '' + aclocal -I support + autoconf + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`" + export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 + cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src + cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src + ''; - createFindlibDestdir = true; + postInstall = '' + cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/ + ''; - preConfigure = '' - aclocal -I support - autoconf - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`" - export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 - cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src - cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src - ''; + makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ]; - postInstall = '' - cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/ - ''; - - makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ]; - - meta = { - homepage = "http://cairographics.org/cairo-ocaml"; - description = "Ocaml bindings for cairo library"; - license = lib.licenses.gpl2; - inherit (ocaml.meta) platforms; - }; - } + meta = { + homepage = "http://cairographics.org/cairo-ocaml"; + description = "Ocaml bindings for cairo library"; + license = lib.licenses.gpl2; + broken = lib.versionAtLeast ocaml.version "4.06"; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 43fead8c172e..584e1b307dda 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -10,49 +10,46 @@ perl, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") - "libvirt is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml-libvirt"; + version = "0.6.1.5"; - stdenv.mkDerivation - rec { - pname = "ocaml-libvirt"; - version = "0.6.1.5"; + src = fetchFromGitLab { + owner = "libvirt"; + repo = "libvirt-ocaml"; + rev = "v${version}"; + sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k"; + }; - src = fetchFromGitLab { - owner = "libvirt"; - repo = "libvirt-ocaml"; - rev = "v${version}"; - sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k"; - }; + propagatedBuildInputs = [ libvirt ]; - propagatedBuildInputs = [ libvirt ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + findlib + perl + ocaml + ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - findlib - perl - ocaml - ]; + strictDeps = true; - strictDeps = true; + buildFlags = [ + "all" + "opt" + "CPPFLAGS=-Wno-error" + ]; + installTargets = "install-opt"; + preInstall = '' + # Fix 'dllmllibvirt.so' install failure into non-existent directory. + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; - buildFlags = [ - "all" - "opt" - "CPPFLAGS=-Wno-error" - ]; - installTargets = "install-opt"; - preInstall = '' - # Fix 'dllmllibvirt.so' install failure into non-existent directory. - mkdir -p $OCAMLFIND_DESTDIR/stublibs - ''; - - meta = with lib; { - description = "OCaml bindings for libvirt"; - homepage = "https://libvirt.org/ocaml/"; - license = licenses.gpl2; - maintainers = [ ]; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "OCaml bindings for libvirt"; + homepage = "https://libvirt.org/ocaml/"; + license = licenses.gpl2; + maintainers = [ ]; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.02"); + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index 6e16fd2f2556..725371018e08 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -7,30 +7,27 @@ ppx_derivers, }: -if lib.versionOlder "4.13" ocaml.version then - throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "ocaml-migrate-parsetree"; + version = "1.8.0"; - buildDunePackage rec { - pname = "ocaml-migrate-parsetree"; - version = "1.8.0"; + src = fetchFromGitHub { + owner = "ocaml-ppx"; + repo = pname; + rev = "v${version}"; + sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"; + }; - src = fetchFromGitHub { - owner = "ocaml-ppx"; - repo = pname; - rev = "v${version}"; - sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"; - }; + propagatedBuildInputs = [ + ppx_derivers + result + ]; - propagatedBuildInputs = [ - ppx_derivers - result - ]; - - meta = { - description = "Convert OCaml parsetrees between different major versions"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; - } + meta = { + description = "Convert OCaml parsetrees between different major versions"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + broken = lib.versionOlder "4.13" ocaml.version; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix index 2c66caae99f9..129e2a9be198 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix @@ -5,28 +5,25 @@ ocaml, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.1") - "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "ocaml-migrate-parsetree"; + version = "2.4.0"; - buildDunePackage - rec { - pname = "ocaml-migrate-parsetree"; - version = "2.4.0"; + minimalOCamlVersion = "4.02"; - minimalOCamlVersion = "4.02"; + src = fetchurl { + url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ="; + }; - src = fetchurl { - url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ="; - }; - - meta = { - description = "Convert OCaml parsetrees between different major versions"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ - vbgl - sternenseemann - ]; - homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"; - }; - } + meta = { + description = "Convert OCaml parsetrees between different major versions"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ + vbgl + sternenseemann + ]; + homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"; + broken = lib.versionAtLeast ocaml.version "5.1"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index 65f9dadbd957..05a9eac165b6 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -13,41 +13,35 @@ let inherit (callPackage ./generic.nix args) src version library_deps; in +buildDunePackage { + pname = "ocamlformat"; + inherit src version; -lib.throwIf - ( - lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23" - || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25" - || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2" - || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27" - ) - "ocamlformat ${version} is not available for OCaml ${ocaml.version}" + minimalOCamlVersion = "4.08"; - buildDunePackage - { - pname = "ocamlformat"; - inherit src version; + nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ]; - minimalOCamlVersion = "4.08"; + buildInputs = [ + re + ] + ++ library_deps + ++ lib.optionals (lib.versionAtLeast version "0.25.1") [ + (ocamlformat-lib.override { inherit version; }) + ]; - nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ]; - - buildInputs = [ - re - ] - ++ library_deps - ++ lib.optionals (lib.versionAtLeast version "0.25.1") [ - (ocamlformat-lib.override { inherit version; }) + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = with lib.maintainers; [ + Zimmi48 + Julow ]; - - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = with lib.maintainers; [ - Zimmi48 - Julow - ]; - license = lib.licenses.mit; - mainProgram = "ocamlformat"; - }; - } + license = lib.licenses.mit; + mainProgram = "ocamlformat"; + broken = + lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23" + || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25" + || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2" + || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 72ecf9ada9cb..ff7ec4d750eb 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -13,65 +13,62 @@ nettle, }: -lib.throwIf (lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0") - "ocamlnet is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-ocamlnet"; + version = "4.1.9"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-ocamlnet"; - version = "4.1.9"; + src = fetchurl { + url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; + sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr"; + }; - src = fetchurl { - url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr"; - }; + nativeBuildInputs = [ + pkg-config + which + ocaml + findlib + ]; + buildInputs = [ + ncurses + ocaml_pcre + camlzip + gnutls + nettle + ]; - nativeBuildInputs = [ - pkg-config - which - ocaml - findlib + strictDeps = true; + + createFindlibDestdir = true; + + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; + + preConfigure = '' + configureFlagsArray=( + -bindir $out/bin + -enable-gnutls + -enable-zip + -enable-pcre + -disable-gtk2 + -with-nethttpd + -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet + ) + ''; + + buildPhase = '' + make all + make opt + ''; + + meta = { + homepage = "http://projects.camlcity.org/projects/ocamlnet.html"; + description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; + license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; + inherit (ocaml.meta) platforms; + maintainers = [ + lib.maintainers.maggesi ]; - buildInputs = [ - ncurses - ocaml_pcre - camlzip - gnutls - nettle - ]; - - strictDeps = true; - - createFindlibDestdir = true; - - dontAddPrefix = true; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - - preConfigure = '' - configureFlagsArray=( - -bindir $out/bin - -enable-gnutls - -enable-zip - -enable-pcre - -disable-gtk2 - -with-nethttpd - -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet - ) - ''; - - buildPhase = '' - make all - make opt - ''; - - meta = { - homepage = "http://projects.camlcity.org/projects/ocamlnet.html"; - description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; - license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; - inherit (ocaml.meta) platforms; - maintainers = [ - lib.maintainers.maggesi - ]; - }; - } + broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 263caad54863..766758489fcc 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -8,42 +8,39 @@ pprint, }: -if lib.versionOlder ocaml.version "4.02" then - throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-ocp-ocamlres"; + version = "0.4"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "ocp-ocamlres"; + rev = "v${version}"; + sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; + }; - stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-ocp-ocamlres"; - version = "0.4"; - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = "ocp-ocamlres"; - rev = "v${version}"; - sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; - }; + nativeBuildInputs = [ + ocaml + findlib + ]; + buildInputs = [ + astring + pprint + ]; - nativeBuildInputs = [ - ocaml - findlib - ]; - buildInputs = [ - astring - pprint - ]; + strictDeps = true; - strictDeps = true; + createFindlibDestdir = true; - createFindlibDestdir = true; + installFlags = [ "BINDIR=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; - installFlags = [ "BINDIR=$(out)/bin" ]; - preInstall = "mkdir -p $out/bin"; - - meta = { - description = "Simple tool and library to embed files and directories inside OCaml executables"; - homepage = "https://www.typerex.org/ocp-ocamlres.html"; - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.vbgl ]; - mainProgram = "ocp-ocamlres"; - inherit (ocaml.meta) platforms; - }; - } + meta = { + description = "Simple tool and library to embed files and directories inside OCaml executables"; + homepage = "https://www.typerex.org/ocp-ocamlres.html"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "ocp-ocamlres"; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.02"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 8f30944d3590..625e59ff5bb5 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -9,40 +9,39 @@ lwt, lwt_ppx, }: -if lib.versionOlder ocaml.version "4.04" then - throw "ocurl is not available for OCaml ${ocaml.version}" -else - stdenv.mkDerivation rec { - pname = "ocurl"; - version = "0.9.2"; - src = fetchurl { - url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz"; - sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M="; - }; +stdenv.mkDerivation rec { + pname = "ocurl"; + version = "0.9.2"; - nativeBuildInputs = [ - pkg-config - ocaml - findlib + src = fetchurl { + url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz"; + sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M="; + }; + + nativeBuildInputs = [ + pkg-config + ocaml + findlib + ]; + propagatedBuildInputs = [ + curl + lwt + lwt_ppx + ]; + + strictDeps = true; + + createFindlibDestdir = true; + meta = { + description = "OCaml bindings to libcurl"; + license = lib.licenses.mit; + homepage = "http://ygrek.org.ua/p/ocurl/"; + maintainers = with lib.maintainers; [ + dandellion + bennofs ]; - propagatedBuildInputs = [ - curl - lwt - lwt_ppx - ]; - - strictDeps = true; - - createFindlibDestdir = true; - meta = { - description = "OCaml bindings to libcurl"; - license = lib.licenses.mit; - homepage = "http://ygrek.org.ua/p/ocurl/"; - maintainers = with lib.maintainers; [ - dandellion - bennofs - ]; - platforms = ocaml.meta.platforms or [ ]; - }; - } + platforms = ocaml.meta.platforms or [ ]; + broken = lib.versionOlder ocaml.version "4.04"; + }; +} diff --git a/pkgs/development/ocaml-modules/osdp/default.nix b/pkgs/development/ocaml-modules/osdp/default.nix index 05af890d045a..1f11669e8f39 100644 --- a/pkgs/development/ocaml-modules/osdp/default.nix +++ b/pkgs/development/ocaml-modules/osdp/default.nix @@ -10,37 +10,34 @@ autoconf, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "osdp is not available for OCaml ${ocaml.version}" +buildDunePackage { + pname = "osdp"; + version = "1.1.1"; - buildDunePackage - { - pname = "osdp"; - version = "1.1.1"; + src = fetchurl { + url = "https://github.com/Embedded-SW-VnV/osdp/releases/download/v1.1.1/osdp-1.1.1.tgz"; + hash = "sha256-X7CS2g+MyQPDjhUCvFS/DoqcCXTEw8SCsSGED64TGKQ="; + }; - src = fetchurl { - url = "https://github.com/Embedded-SW-VnV/osdp/releases/download/v1.1.1/osdp-1.1.1.tgz"; - hash = "sha256-X7CS2g+MyQPDjhUCvFS/DoqcCXTEw8SCsSGED64TGKQ="; - }; + preConfigure = '' + autoconf + ''; - preConfigure = '' - autoconf - ''; + nativeBuildInputs = [ + autoconf + findlib + csdp + ]; + propagatedBuildInputs = [ + zarith + ocplib-simplex + csdp + ]; - nativeBuildInputs = [ - autoconf - findlib - csdp - ]; - propagatedBuildInputs = [ - zarith - ocplib-simplex - csdp - ]; - - meta = { - description = "OCaml Interface to SDP solvers"; - homepage = "https://github.com/Embedded-SW-VnV/osdp"; - license = lib.licenses.lgpl3Plus; - }; - } + meta = { + description = "OCaml Interface to SDP solvers"; + homepage = "https://github.com/Embedded-SW-VnV/osdp"; + license = lib.licenses.lgpl3Plus; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 1c45d67324d6..6a60fd9cf176 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -11,54 +11,51 @@ base64, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "piqi is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + version = "0.6.16"; + pname = "piqi"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - stdenv.mkDerivation - rec { - version = "0.6.16"; - pname = "piqi"; - name = "ocaml${ocaml.version}-${pname}-${version}"; + src = fetchFromGitHub { + owner = "alavrik"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU="; + }; - src = fetchFromGitHub { - owner = "alavrik"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU="; - }; + nativeBuildInputs = [ + ocaml + findlib + which + ]; + propagatedBuildInputs = [ + sedlex + xmlm + easy-format + base64 + ]; - nativeBuildInputs = [ - ocaml - findlib - which - ]; - propagatedBuildInputs = [ - sedlex - xmlm - easy-format - base64 - ]; + strictDeps = true; - strictDeps = true; + patches = [ + ./no-stream.patch + ./no-ocamlpath-override.patch + ]; - patches = [ - ./no-stream.patch - ./no-ocamlpath-override.patch - ]; + createFindlibDestdir = true; - createFindlibDestdir = true; + postBuild = "make -C piqilib piqilib.cma"; - postBuild = "make -C piqilib piqilib.cma"; + installTargets = [ + "install" + "ocaml-install" + ]; - installTargets = [ - "install" - "ocaml-install" - ]; - - meta = with lib; { - homepage = "https://piqi.org"; - description = "Universal schema language and a collection of tools built around it"; - license = licenses.asl20; - maintainers = [ maintainers.maurer ]; - }; - } + meta = with lib; { + homepage = "https://piqi.org"; + description = "Universal schema language and a collection of tools built around it"; + license = licenses.asl20; + maintainers = [ maintainers.maurer ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 75bdee5783a8..e8ed1e4540e2 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -14,46 +14,43 @@ findlib, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.2") - "ppx_cstubs is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "ppx_cstubs"; + version = "0.7.0"; - buildDunePackage - rec { - pname = "ppx_cstubs"; - version = "0.7.0"; + minimalOCamlVersion = "4.08"; - minimalOCamlVersion = "4.08"; + src = fetchFromGitHub { + owner = "fdopen"; + repo = "ppx_cstubs"; + rev = version; + hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs="; + }; - src = fetchFromGitHub { - owner = "fdopen"; - repo = "ppx_cstubs"; - rev = version; - hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs="; - }; + patches = [ ./ppxlib.patch ]; - patches = [ ./ppxlib.patch ]; + nativeBuildInputs = [ cppo ]; - nativeBuildInputs = [ cppo ]; + buildInputs = [ + bigarray-compat + containers + findlib + integers + num + ppxlib + re + ]; - buildInputs = [ - bigarray-compat - containers - findlib - integers - num - ppxlib - re - ]; + propagatedBuildInputs = [ + ctypes + ]; - propagatedBuildInputs = [ - ctypes - ]; - - meta = with lib; { - homepage = "https://github.com/fdopen/ppx_cstubs"; - changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; - description = "Preprocessor for easier stub generation with ocaml-ctypes"; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.osener ]; - }; - } + meta = with lib; { + homepage = "https://github.com/fdopen/ppx_cstubs"; + changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; + description = "Preprocessor for easier stub generation with ocaml-ctypes"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.osener ]; + broken = lib.versionAtLeast ocaml.version "5.2"; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 21d6f116b9e7..086b0da2576f 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -8,97 +8,85 @@ cppo, }: -if lib.versionAtLeast ocaml.version "5.2" then - throw "ppx_tools is not available for OCaml ${ocaml.version}" -else - - let - param = - let - v6_6 = { - version = "6.6"; - sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc="; - nativeBuildInputs = [ cppo ]; - buildInputs = [ cppo ]; - }; - in - { - "4.02" = { - version = "5.0+4.02.0"; - sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; - }; - "4.03" = { - version = "5.0+4.03.0"; - sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; - }; - "4.04" = { - version = "unstable-20161114"; - rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac"; - sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; - }; - "4.05" = { - version = "5.0+4.05.0"; - sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4"; - }; - "4.06" = { - version = "5.1+4.06.0"; - sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; - }; - "4.07" = { - version = "5.1+4.06.0"; - sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; - }; - "4.08" = v6_6; - "4.09" = v6_6; - "4.10" = v6_6; - "4.11" = v6_6; - "4.12" = v6_6; - "4.13" = v6_6; - "4.14" = v6_6; - "5.0" = v6_6; - "5.1" = v6_6; - } - .${ocaml.meta.branch}; - in - - let - src = fetchFromGitHub { - owner = "alainfrisch"; - repo = pname; - rev = param.rev or param.version; - inherit (param) sha256; - }; - pname = "ppx_tools"; - meta = with lib; { - description = "Tools for authors of ppx rewriters"; - homepage = "https://www.lexifi.com/ppx_tools"; - license = licenses.mit; - maintainers = with maintainers; [ vbgl ]; - }; - in - if lib.versionAtLeast param.version "6.0" then - buildDunePackage { - inherit pname src meta; - inherit (param) version buildInputs nativeBuildInputs; - } - else - stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${param.version}"; - - inherit src; - - nativeBuildInputs = [ - ocaml - findlib - ]; - - strictDeps = true; - - createFindlibDestdir = true; - - dontStrip = true; - - meta = meta // { - inherit (ocaml.meta) platforms; +let + param = + let + v6_6 = { + version = "6.6"; + sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc="; + nativeBuildInputs = [ cppo ]; + buildInputs = [ cppo ]; + }; + in + { + "4.02" = { + version = "5.0+4.02.0"; + sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; + }; + "4.03" = { + version = "5.0+4.03.0"; + sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; + }; + "4.04" = { + version = "unstable-20161114"; + rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac"; + sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; + }; + "4.05" = { + version = "5.0+4.05.0"; + sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4"; + }; + "4.06" = { + version = "5.1+4.06.0"; + sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; + }; + "4.07" = { + version = "5.1+4.06.0"; + sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; } + .${ocaml.meta.branch} or v6_6; +in + +let + src = fetchFromGitHub { + owner = "alainfrisch"; + repo = pname; + rev = param.rev or param.version; + inherit (param) sha256; + }; + pname = "ppx_tools"; + meta = with lib; { + description = "Tools for authors of ppx rewriters"; + homepage = "https://www.lexifi.com/ppx_tools"; + license = licenses.mit; + maintainers = with maintainers; [ vbgl ]; + broken = lib.versionAtLeast ocaml.version "5.2"; + }; +in +if lib.versionAtLeast param.version "6.0" then + buildDunePackage { + inherit pname src meta; + inherit (param) version buildInputs nativeBuildInputs; + } +else + stdenv.mkDerivation { + name = "ocaml${ocaml.version}-${pname}-${param.version}"; + + inherit src; + + nativeBuildInputs = [ + ocaml + findlib + ]; + + strictDeps = true; + + createFindlibDestdir = true; + + dontStrip = true; + + meta = meta // { + inherit (ocaml.meta) platforms; + }; + } diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 759d92bb4467..76aabf9f8194 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -103,37 +103,32 @@ let ."${version}"; in -if - param ? max_version && lib.versionAtLeast ocaml.version param.max_version - || param ? min_version && lib.versionOlder ocaml.version param.min_version -then - throw "ppxlib-${version} is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "ppxlib"; + inherit version; - buildDunePackage rec { - pname = "ppxlib"; - inherit version; + src = fetchurl { + url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz"; + inherit (param) sha256; + }; - src = - param.src or (fetchurl { - url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz"; - inherit (param) sha256; - }); + propagatedBuildInputs = [ + ocaml-compiler-libs + ] + ++ (param.OMP or [ ]) + ++ [ + ppx_derivers + stdio + stdlib-shims + ]; - propagatedBuildInputs = [ - ocaml-compiler-libs - ] - ++ (param.OMP or [ ]) - ++ [ - ppx_derivers - stdio - stdlib-shims - ]; - - meta = { - description = "Comprehensive ppx tool set"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/ocaml-ppx/ppxlib"; - }; - } + meta = { + description = "Comprehensive ppx tool set"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/ocaml-ppx/ppxlib"; + broken = + param ? max_version && lib.versionAtLeast ocaml.version param.max_version + || param ? min_version && lib.versionOlder ocaml.version param.min_version; + }; +} diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 4624e22600a1..a29060b191bb 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -8,50 +8,47 @@ topkg, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "ptime is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation (finalAttrs: { + version = "1.2.0"; + pname = "ocaml${ocaml.version}-ptime"; - stdenv.mkDerivation - (finalAttrs: { - version = "1.2.0"; - pname = "ocaml${ocaml.version}-ptime"; + src = fetchurl { + url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz"; + hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA="; + }; - src = fetchurl { - url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz"; - hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA="; - }; + nativeBuildInputs = [ + findlib + ocaml + ocamlbuild + topkg + ]; - nativeBuildInputs = [ - findlib - ocaml - ocamlbuild - topkg - ]; + buildInputs = [ + topkg + ]; - buildInputs = [ - topkg - ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; + meta = { + description = "POSIX time for OCaml"; + homepage = "https://erratique.ch/software/ptime"; + license = lib.licenses.isc; + longDescription = '' + Ptime has platform independent POSIX time support in pure OCaml. + It provides a type to represent a well-defined range of POSIX timestamps + with picosecond precision, conversion with date-time values, conversion + with RFC 3339 timestamps and pretty printing to a human-readable, + locale-independent representation. - meta = { - description = "POSIX time for OCaml"; - homepage = "https://erratique.ch/software/ptime"; - license = lib.licenses.isc; - longDescription = '' - Ptime has platform independent POSIX time support in pure OCaml. - It provides a type to represent a well-defined range of POSIX timestamps - with picosecond precision, conversion with date-time values, conversion - with RFC 3339 timestamps and pretty printing to a human-readable, - locale-independent representation. + The additional Ptime_clock library provides access to a system POSIX clock + and to the system's current time zone offset. - The additional Ptime_clock library provides access to a system POSIX clock - and to the system's current time zone offset. - - Ptime is not a calendar library. - ''; - maintainers = with lib.maintainers; [ sternenseemann ]; - }; - }) + Ptime is not a calendar library. + ''; + maintainers = with lib.maintainers; [ sternenseemann ]; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +}) diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index cc559c1c1740..43a860367b58 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -9,37 +9,34 @@ result, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") - "rresult is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-rresult"; + version = "0.7.0"; + src = fetchurl { + url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; + sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA="; + }; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-rresult"; - version = "0.7.0"; - src = fetchurl { - url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; - sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA="; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; + propagatedBuildInputs = [ result ]; - propagatedBuildInputs = [ result ]; + strictDeps = true; - strictDeps = true; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = { - license = lib.licenses.isc; - homepage = "https://erratique.ch/software/rresult"; - description = "Result value combinators for OCaml"; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = { + license = lib.licenses.isc; + homepage = "https://erratique.ch/software/rresult"; + description = "Result value combinators for OCaml"; + maintainers = [ lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.07"); + }; +} diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 57cf08744cb3..5bb16cd6e86b 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -12,51 +12,47 @@ let pname = "sawja"; version = "1.5.12"; in +stdenv.mkDerivation { -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "${pname} is not available for OCaml ${ocaml.version}" + pname = "ocaml${ocaml.version}-${pname}"; - stdenv.mkDerivation - { + inherit version; - pname = "ocaml${ocaml.version}-${pname}"; + src = fetchFromGitHub { + owner = "javalib-team"; + repo = pname; + rev = version; + hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw="; + }; - inherit version; + nativeBuildInputs = [ + which + ocaml + findlib + ]; - src = fetchFromGitHub { - owner = "javalib-team"; - repo = pname; - rev = version; - hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw="; - }; + strictDeps = true; - nativeBuildInputs = [ - which - ocaml - findlib - ]; + patches = [ + ./configure.sh.patch + ./Makefile.config.example.patch + ]; - strictDeps = true; + createFindlibDestdir = true; - patches = [ - ./configure.sh.patch - ./Makefile.config.example.patch - ]; + configureScript = "./configure.sh"; + dontAddPrefix = "true"; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; - createFindlibDestdir = true; + propagatedBuildInputs = [ javalib ]; - configureScript = "./configure.sh"; - dontAddPrefix = "true"; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - - propagatedBuildInputs = [ javalib ]; - - meta = with lib; { - description = "Library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; - homepage = "http://sawja.inria.fr/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "Library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; + homepage = "http://sawja.inria.fr/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 7ca2e65935ad..77b91c113790 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -9,46 +9,43 @@ libsodium, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "sodium is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-sodium"; + version = "0.6.0"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-sodium"; - version = "0.6.0"; + src = fetchFromGitHub { + owner = "dsheets"; + repo = "ocaml-sodium"; + rev = version; + sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv"; + }; - src = fetchFromGitHub { - owner = "dsheets"; - repo = "ocaml-sodium"; - rev = version; - sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv"; - }; + patches = [ + # ctypes.stubs no longer pulls in bigarray automatically + ./lib-gen-link-bigarray.patch + ]; - patches = [ - # ctypes.stubs no longer pulls in bigarray automatically - ./lib-gen-link-bigarray.patch - ]; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + ]; + propagatedBuildInputs = [ + ctypes + libsodium + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - propagatedBuildInputs = [ - ctypes - libsodium - ]; + strictDeps = true; - strictDeps = true; + createFindlibDestdir = true; - createFindlibDestdir = true; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; - hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow"; - - meta = with lib; { - homepage = "https://github.com/dsheets/ocaml-sodium"; - description = "Binding to libsodium 1.0.9+"; - inherit (ocaml.meta) platforms; - maintainers = [ maintainers.rixed ]; - }; - } + meta = with lib; { + homepage = "https://github.com/dsheets/ocaml-sodium"; + description = "Binding to libsodium 1.0.9+"; + inherit (ocaml.meta) platforms; + maintainers = [ maintainers.rixed ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index ded25d88f58e..5659bb4fa380 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -7,46 +7,43 @@ ocamlbuild, }: -lib.throwIf (lib.versionOlder ocaml.version "4.02") - "sosa is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-sosa"; + version = "0.3.0"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-sosa"; - version = "0.3.0"; + src = fetchFromGitHub { + owner = "hammerlab"; + repo = "sosa"; + rev = "sosa.${version}"; + sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; + }; - src = fetchFromGitHub { - owner = "hammerlab"; - repo = "sosa"; - rev = "sosa.${version}"; - sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; - }; + postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") '' + for p in functors list_of of_mutable + do + substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib. + done + ''; - postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") '' - for p in functors list_of of_mutable - do - substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib. - done - ''; + nativeBuildInputs = [ + ocaml + ocamlbuild + findlib + ]; - nativeBuildInputs = [ - ocaml - ocamlbuild - findlib - ]; + strictDeps = true; - strictDeps = true; + buildPhase = "make build"; - buildPhase = "make build"; + createFindlibDestdir = true; - createFindlibDestdir = true; + doCheck = true; - doCheck = true; - - meta = with lib; { - homepage = "http://www.hammerlab.org/docs/sosa/master/index.html"; - description = "Sane OCaml String API"; - license = licenses.isc; - maintainers = [ maintainers.alexfmpe ]; - }; - } + meta = with lib; { + homepage = "http://www.hammerlab.org/docs/sosa/master/index.html"; + description = "Sane OCaml String API"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + broken = !(lib.versionOlder ocaml.version "4.02"); + }; +} diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index dd1a26e1ebac..d75b4839a8b0 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -5,27 +5,24 @@ fetchurl, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.2") - "stdcompat is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "stdcompat"; + version = "19"; - buildDunePackage - rec { - pname = "stdcompat"; - version = "19"; + minimalOCamlVersion = "4.06"; - minimalOCamlVersion = "4.06"; + src = fetchurl { + url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; + sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; + }; - src = fetchurl { - url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; - }; + # Otherwise ./configure script will run and create files conflicting with dune. + dontConfigure = true; - # Otherwise ./configure script will run and create files conflicting with dune. - dontConfigure = true; - - meta = { - homepage = "https://github.com/thierry-martinez/stdcompat"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.vbgl ]; - }; - } + meta = { + homepage = "https://github.com/thierry-martinez/stdcompat"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + broken = lib.versionAtLeast ocaml.version "5.2"; + }; +} diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 092d3973db90..d5b5517411f1 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -13,56 +13,53 @@ pkg-config, }: -if lib.versionOlder ocaml.version "4.03" then - throw "tsdl is not available for OCaml ${ocaml.version}" -else +let + pname = "tsdl"; + version = "1.1.0"; + webpage = "https://erratique.ch/software/${pname}"; +in - let - pname = "tsdl"; - version = "1.1.0"; - webpage = "https://erratique.ch/software/${pname}"; - in +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; - stdenv.mkDerivation { - pname = "ocaml${ocaml.version}-${pname}"; - inherit version; + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs="; + }; - src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs="; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + pkg-config + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; + propagatedBuildInputs = [ + SDL2 + ctypes + ctypes-foreign + ]; - nativeBuildInputs = [ - pkg-config - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; - propagatedBuildInputs = [ - SDL2 - ctypes - ctypes-foreign - ]; + preConfigure = '' + # The following is done to avoid an additional dependency (ncurses) + # due to linking in the custom bytecode runtime. Instead, just + # compile directly into a native binary, even if it's just a + # temporary build product. + substituteInPlace myocamlbuild.ml \ + --replace ".byte" ".native" + ''; - preConfigure = '' - # The following is done to avoid an additional dependency (ncurses) - # due to linking in the custom bytecode runtime. Instead, just - # compile directly into a native binary, even if it's just a - # temporary build product. - substituteInPlace myocamlbuild.ml \ - --replace ".byte" ".native" - ''; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - homepage = webpage; - description = "Thin bindings to the cross-platform SDL library"; - license = licenses.isc; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + homepage = webpage; + description = "Thin bindings to the cross-platform SDL library"; + license = licenses.isc; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.03"; + }; +} diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index ef5fae48b37c..eb30e395c749 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -6,45 +6,42 @@ findlib, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "twt is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-twt"; + version = "0.94.0"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-twt"; - version = "0.94.0"; + src = fetchFromGitHub { + owner = "mlin"; + repo = "twt"; + rev = "v${version}"; + sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk="; + }; - src = fetchFromGitHub { - owner = "mlin"; - repo = "twt"; - rev = "v${version}"; - sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk="; - }; + nativeBuildInputs = [ + ocaml + findlib + ]; - nativeBuildInputs = [ - ocaml - findlib - ]; + strictDeps = true; - strictDeps = true; + preInstall = '' + mkdir -p $out/bin + mkdir -p $OCAMLFIND_DESTDIR + ''; - preInstall = '' - mkdir -p $out/bin - mkdir -p $OCAMLFIND_DESTDIR - ''; + dontBuild = true; - dontBuild = true; + installFlags = [ "PREFIX=$(out)" ]; - installFlags = [ "PREFIX=$(out)" ]; + dontStrip = true; - dontStrip = true; - - meta = with lib; { - description = "“The Whitespace Thing” for OCaml"; - homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; - license = licenses.mit; - maintainers = [ maintainers.vbgl ]; - mainProgram = "ocaml+twt"; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "“The Whitespace Thing” for OCaml"; + homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; + license = licenses.mit; + maintainers = [ maintainers.vbgl ]; + mainProgram = "ocaml+twt"; + broken = lib.versionAtLeast ocaml.version "5.0"; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 512be9b782f4..d6f3781fe588 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -22,44 +22,40 @@ let sha256 = "0cmscxcmcxhlshh4jd0lzw5ffzns12x3bj7h27smbc8waxkwffhl"; }; in +stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-${pname}"; + inherit (param) version; -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "ulex is not available for OCaml ${ocaml.version}" + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = "v${param.version}"; + inherit (param) sha256; + }; - stdenv.mkDerivation - { - pname = "ocaml${ocaml.version}-${pname}"; - inherit (param) version; + createFindlibDestdir = true; - src = fetchFromGitHub { - owner = "ocaml-community"; - repo = pname; - rev = "v${param.version}"; - inherit (param) sha256; - }; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + camlp4 + ]; + propagatedBuildInputs = [ camlp4 ]; - createFindlibDestdir = true; + strictDeps = true; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - camlp4 - ]; - propagatedBuildInputs = [ camlp4 ]; + buildFlags = [ + "all" + "all.opt" + ]; - strictDeps = true; - - buildFlags = [ - "all" - "all.opt" - ]; - - meta = { - homepage = "https://opam.ocaml.org/packages/ulex/"; - description = "Lexer generator for Unicode and OCaml"; - license = lib.licenses.mit; - inherit (ocaml.meta) platforms; - maintainers = [ lib.maintainers.roconnor ]; - }; - } + meta = { + homepage = "https://opam.ocaml.org/packages/ulex/"; + description = "Lexer generator for Unicode and OCaml"; + license = lib.licenses.mit; + inherit (ocaml.meta) platforms; + maintainers = [ lib.maintainers.roconnor ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; +} diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix index df54c7636c73..db31f8d0f037 100644 --- a/pkgs/development/ocaml-modules/uri/sexp.nix +++ b/pkgs/development/ocaml-modules/uri/sexp.nix @@ -8,21 +8,21 @@ sexplib0, }: -if lib.versionOlder ocaml.version "4.04" then - throw "uri-sexp is not available for OCaml ${ocaml.version}" -else +buildDunePackage { + pname = "uri-sexp"; + inherit (uri) version src; - buildDunePackage { - pname = "uri-sexp"; - inherit (uri) version src meta; + duneVersion = "3"; - duneVersion = "3"; + checkInputs = [ ounit ]; + propagatedBuildInputs = [ + ppx_sexp_conv + sexplib0 + uri + ]; + doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ ounit ]; - propagatedBuildInputs = [ - ppx_sexp_conv - sexplib0 - uri - ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; - } + meta = uri.meta // { + broken = uri.meta.broken or false || lib.versionOlder ocaml.version "4.04"; + }; +} diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 77ca17170585..6f203bdc5832 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -10,45 +10,42 @@ version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.10" else "0.9.8", }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "uuidm is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation { + inherit version; + pname = "uuidm"; + src = fetchurl { + url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; + hash = + { + "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc="; + "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; + } + ."${version}"; + }; - stdenv.mkDerivation - { - inherit version; - pname = "uuidm"; - src = fetchurl { - url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - hash = - { - "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc="; - "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM="; - } - ."${version}"; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + configurePlatforms = [ ]; + buildInputs = [ + topkg + cmdliner + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - configurePlatforms = [ ]; - buildInputs = [ - topkg - cmdliner - ]; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - description = "OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; - homepage = "https://erratique.ch/software/uuidm"; - license = licenses.bsd3; - maintainers = [ maintainers.maurer ]; - mainProgram = "uuidtrip"; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; + homepage = "https://erratique.ch/software/uuidm"; + license = licenses.bsd3; + maintainers = [ maintainers.maurer ]; + mainProgram = "uuidtrip"; + inherit (ocaml.meta) platforms; + broken = !(lib.versionAtLeast ocaml.version "4.08"); + }; +} diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 0fc5a247e8e9..522a001f4a4d 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -22,52 +22,48 @@ let } ."${version}"; in +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-${pname}-${version}"; + inherit version; -if lib.versionOlder ocaml.version "4.03" then - throw "${pname} is not available for OCaml ${ocaml.version}" -else + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + inherit hash; + }; - stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${version}"; - inherit version; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ + topkg + uutf + ] + ++ lib.optional cmdlinerSupport cmdliner; - src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - inherit hash; - }; + strictDeps = true; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ - topkg - uutf - ] - ++ lib.optional cmdlinerSupport cmdliner; + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384"; - strictDeps = true; + buildPhase = '' + runHook preBuild + ${topkg.run} build \ + --with-uutf true \ + --with-cmdliner ${lib.boolToString cmdlinerSupport} + runHook postBuild + ''; - prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384"; + inherit (topkg) installPhase; - buildPhase = '' - runHook preBuild - ${topkg.run} build \ - --with-uutf true \ - --with-cmdliner ${lib.boolToString cmdlinerSupport} - runHook postBuild - ''; - - inherit (topkg) installPhase; - - meta = with lib; { - description = "OCaml module for normalizing Unicode text"; - homepage = webpage; - license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; - mainProgram = "unftrip"; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "OCaml module for normalizing Unicode text"; + homepage = webpage; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + mainProgram = "unftrip"; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.03"; + }; +} diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 5b99a1b04cf1..b3d47c8b1d60 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -22,64 +22,60 @@ let version = "0.9.5"; webpage = "https://erratique.ch/software/${pname}"; in +stdenv.mkDerivation { -if versionOlder ocaml.version "4.14" then - throw "vg is not available for OCaml ${ocaml.version}" -else + name = "ocaml${ocaml.version}-${pname}-${version}"; - stdenv.mkDerivation { + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw="; + }; - name = "ocaml${ocaml.version}-${pname}-${version}"; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + ]; + buildInputs = [ topkg ]; - src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw="; - }; + propagatedBuildInputs = [ + uchar + result + gg + ] + ++ optionals pdfBackend [ + otfm + ] + ++ optionals htmlcBackend [ + brr + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; - buildInputs = [ topkg ]; + strictDeps = true; - propagatedBuildInputs = [ - uchar - result - gg - ] - ++ optionals pdfBackend [ - otfm - ] - ++ optionals htmlcBackend [ - brr - ]; + buildPhase = + topkg.buildPhase + + " --with-otfm ${lib.boolToString pdfBackend}" + + " --with-brr ${lib.boolToString htmlcBackend}" + + " --with-cairo2 false"; - strictDeps = true; + inherit (topkg) installPhase; - buildPhase = - topkg.buildPhase - + " --with-otfm ${lib.boolToString pdfBackend}" - + " --with-brr ${lib.boolToString htmlcBackend}" - + " --with-cairo2 false"; + meta = with lib; { + description = "Declarative 2D vector graphics for OCaml"; + longDescription = '' + Vg is an OCaml module for declarative 2D vector graphics. In Vg, images + are values that denote functions mapping points of the cartesian plane + to colors. The module provides combinators to define and compose these + values. - inherit (topkg) installPhase; - - meta = with lib; { - description = "Declarative 2D vector graphics for OCaml"; - longDescription = '' - Vg is an OCaml module for declarative 2D vector graphics. In Vg, images - are values that denote functions mapping points of the cartesian plane - to colors. The module provides combinators to define and compose these - values. - - Renderers for PDF, SVG and the HTML canvas are distributed with the - module. An API allows to implement new renderers. - ''; - homepage = webpage; - license = licenses.isc; - maintainers = [ maintainers.jirkamarsik ]; - mainProgram = "vecho"; - inherit (ocaml.meta) platforms; - }; - } + Renderers for PDF, SVG and the HTML canvas are distributed with the + module. An API allows to implement new renderers. + ''; + homepage = webpage; + license = licenses.isc; + maintainers = [ maintainers.jirkamarsik ]; + mainProgram = "vecho"; + inherit (ocaml.meta) platforms; + broken = versionOlder ocaml.version "4.14"; + }; +} diff --git a/pkgs/development/ocaml-modules/vlq/default.nix b/pkgs/development/ocaml-modules/vlq/default.nix index e6b8070963df..984c20586737 100644 --- a/pkgs/development/ocaml-modules/vlq/default.nix +++ b/pkgs/development/ocaml-modules/vlq/default.nix @@ -6,26 +6,23 @@ dune-configurator, }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "vlq is not available for OCaml ${ocaml.version}" +buildDunePackage rec { + pname = "vlq"; + version = "0.2.1"; - buildDunePackage - rec { - pname = "vlq"; - version = "0.2.1"; + src = fetchurl { + url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz"; + sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi"; + }; - src = fetchurl { - url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz"; - sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi"; - }; + buildInputs = [ dune-configurator ]; - buildInputs = [ dune-configurator ]; + meta = { + description = "Encoding variable-length quantities, in particular base64"; + license = lib.licenses.mit; + homepage = "https://github.com/flowtype/ocaml-vlq"; + maintainers = [ lib.maintainers.nomeata ]; + broken = lib.versionAtLeast ocaml.version "5.0"; + }; - meta = { - description = "Encoding variable-length quantities, in particular base64"; - license = lib.licenses.mit; - homepage = "https://github.com/flowtype/ocaml-vlq"; - maintainers = [ lib.maintainers.nomeata ]; - }; - - } +} diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 21d0b28a09b7..3ad17d8aa74f 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -11,38 +11,34 @@ let pname = "xmlm"; webpage = "https://erratique.ch/software/${pname}"; in +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "1.4.0"; -if lib.versionOlder ocaml.version "4.05" then - throw "xmlm is not available for OCaml ${ocaml.version}" -else + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo="; + }; - stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "1.4.0"; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + topkg + ]; + buildInputs = [ topkg ]; - src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo="; - }; + strictDeps = true; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - topkg - ]; - buildInputs = [ topkg ]; + inherit (topkg) buildPhase installPhase; - strictDeps = true; - - inherit (topkg) buildPhase installPhase; - - meta = with lib; { - description = "OCaml streaming codec to decode and encode the XML data format"; - homepage = webpage; - license = licenses.isc; - maintainers = [ maintainers.vbgl ]; - mainProgram = "xmltrip"; - inherit (ocaml.meta) platforms; - }; - } + meta = with lib; { + description = "OCaml streaming codec to decode and encode the XML data format"; + homepage = webpage; + license = licenses.isc; + maintainers = [ maintainers.vbgl ]; + mainProgram = "xmltrip"; + inherit (ocaml.meta) platforms; + broken = lib.versionOlder ocaml.version "4.05"; + }; +} diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix index ddc9e2931015..e0643d5e5e56 100644 --- a/pkgs/development/ocaml-modules/z3/default.nix +++ b/pkgs/development/ocaml-modules/z3/default.nix @@ -7,43 +7,40 @@ z3, }: -if lib.versionOlder ocaml.version "4.08" then - throw "z3 is not available for OCaml ${ocaml.version}" -else +let + z3-with-ocaml = ( + z3.override { + ocamlBindings = true; + inherit ocaml findlib zarith; + } + ); +in - let - z3-with-ocaml = ( - z3.override { - ocamlBindings = true; - inherit ocaml findlib zarith; - } - ); - in +stdenv.mkDerivation { - stdenv.mkDerivation { + pname = "ocaml${ocaml.version}-z3"; + inherit (z3-with-ocaml) version; - pname = "ocaml${ocaml.version}-z3"; - inherit (z3-with-ocaml) version; + dontUnpack = true; - dontUnpack = true; + installPhase = '' + runHook preInstall + mkdir -p $OCAMLFIND_DESTDIR + cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR + cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3 + runHook postInstall + ''; - installPhase = '' - runHook preInstall - mkdir -p $OCAMLFIND_DESTDIR - cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR - cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3 - runHook postInstall - ''; + nativeBuildInputs = [ findlib ]; + propagatedBuildInputs = [ + z3-with-ocaml.lib + zarith + ]; - nativeBuildInputs = [ findlib ]; - propagatedBuildInputs = [ - z3-with-ocaml.lib - zarith - ]; + strictDeps = true; - strictDeps = true; - - meta = z3.meta // { - description = "Z3 Theorem Prover (OCaml API)"; - }; - } + meta = z3.meta // { + description = "Z3 Theorem Prover (OCaml API)"; + broken = lib.versionOlder ocaml.version "4.08"; + }; +} diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 09ef6ced2600..6b0e4ad4074a 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -9,49 +9,46 @@ version ? if lib.versionAtLeast ocaml.version "4.08" then "1.14" else "1.13", }: -if lib.versionOlder ocaml.version "4.04" then - throw "zarith is not available for OCaml ${ocaml.version}" -else +stdenv.mkDerivation (finalAttrs: { + pname = "ocaml${ocaml.version}-zarith"; + inherit version; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "Zarith"; + rev = "release-${version}"; + hash = + { + "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; + "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE="; + } + ."${finalAttrs.version}"; + }; - stdenv.mkDerivation (finalAttrs: { - pname = "ocaml${ocaml.version}-zarith"; - inherit version; - src = fetchFromGitHub { - owner = "ocaml"; - repo = "Zarith"; - rev = "release-${version}"; - hash = - { - "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; - "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE="; - } - ."${finalAttrs.version}"; - }; + nativeBuildInputs = [ + pkg-config + ocaml + findlib + ]; + propagatedBuildInputs = [ gmp ]; + strictDeps = true; - nativeBuildInputs = [ - pkg-config - ocaml - findlib + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; + configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ]; + + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; + + meta = with lib; { + description = "Fast, arbitrary precision OCaml integers"; + homepage = "https://github.com/ocaml/Zarith"; + changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes"; + license = licenses.lgpl2; + inherit (ocaml.meta) platforms; + maintainers = with maintainers; [ + thoughtpolice + vbgl ]; - propagatedBuildInputs = [ gmp ]; - strictDeps = true; - - dontAddPrefix = true; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ]; - - preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; - - meta = with lib; { - description = "Fast, arbitrary precision OCaml integers"; - homepage = "https://github.com/ocaml/Zarith"; - changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes"; - license = licenses.lgpl2; - inherit (ocaml.meta) platforms; - maintainers = with maintainers; [ - thoughtpolice - vbgl - ]; - }; - }) + broken = lib.versionOlder ocaml.version "4.04"; + }; +}) diff --git a/pkgs/development/ocaml-modules/zipc/default.nix b/pkgs/development/ocaml-modules/zipc/default.nix index 74717ec79471..7f983a68a022 100644 --- a/pkgs/development/ocaml-modules/zipc/default.nix +++ b/pkgs/development/ocaml-modules/zipc/default.nix @@ -9,38 +9,35 @@ cmdliner, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.14") - "zipc is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-zipc"; + version = "0.2.0"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-zipc"; - version = "0.2.0"; + src = fetchurl { + url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz"; + hash = "sha256-YQqkCURwrJgFH0+zgfket25zJQ4w+Tcc1mTSrDuWRt0="; + }; - src = fetchurl { - url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz"; - hash = "sha256-YQqkCURwrJgFH0+zgfket25zJQ4w+Tcc1mTSrDuWRt0="; - }; + strictDeps = true; - strictDeps = true; + nativeBuildInputs = [ + ocaml + findlib + ocamlbuild + ]; - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; + buildInputs = [ + cmdliner + topkg + ]; - buildInputs = [ - cmdliner - topkg - ]; + inherit (topkg) buildPhase installPhase; - inherit (topkg) buildPhase installPhase; - - meta = { - description = "ZIP archive and deflate codec for OCaml"; - homepage = "https://erratique.ch/software/zipc"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; - } + meta = { + description = "ZIP archive and deflate codec for OCaml"; + homepage = "https://erratique.ch/software/zipc"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + broken = !(lib.versionAtLeast ocaml.version "4.14"); + }; +} diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 0e707e4fdaee..4897a9b597cd 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -6,58 +6,55 @@ writeText, }: -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03") - "camlidl is not available for OCaml ${ocaml.version}" +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-camlidl"; + version = "1.12"; - stdenv.mkDerivation - rec { - pname = "ocaml${ocaml.version}-camlidl"; - version = "1.12"; + src = fetchFromGitHub { + owner = "xavierleroy"; + repo = "camlidl"; + rev = "camlidl112"; + hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0="; + }; - src = fetchFromGitHub { - owner = "xavierleroy"; - repo = "camlidl"; - rev = "camlidl112"; - hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0="; - }; + nativeBuildInputs = [ ocaml ]; - nativeBuildInputs = [ ocaml ]; + # build fails otherwise + enableParallelBuilding = false; - # build fails otherwise - enableParallelBuilding = false; + preBuild = '' + mv config/Makefile.unix config/Makefile + substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out + substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl + substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp + substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config" + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs + ''; - preBuild = '' - mv config/Makefile.unix config/Makefile - substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out - substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl - substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp - substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config" - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs - ''; + postInstall = '' + cat >$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META < Date: Mon, 13 Oct 2025 19:14:28 +0200 Subject: [PATCH 0332/2279] release.nix: eval and build ocamlPackages eval of ocamlPackages was broken, let's enable it to be checked by ci --- pkgs/top-level/release.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c7d5252f4966..6e7cd8b248ac 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -397,9 +397,6 @@ let "aarch64-linux" ]; - # Fails CI in its current state - ocamlPackages = { }; - pkgsRocm = pkgs.rocmPackages.meta.release-packagePlatforms; }; mapTestOn-packages = if attrNamesOnly then packageJobs else mapTestOn packageJobs; From fa302a210d1291dbd48351c0a56cf4070dfb444f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Oct 2025 20:27:24 +0000 Subject: [PATCH 0333/2279] dotenv-linter: 3.3.0 -> 4.0.0 --- pkgs/by-name/do/dotenv-linter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotenv-linter/package.nix b/pkgs/by-name/do/dotenv-linter/package.nix index f45187e59121..49a261a6fcee 100644 --- a/pkgs/by-name/do/dotenv-linter/package.nix +++ b/pkgs/by-name/do/dotenv-linter/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; + sha256 = "sha256-H4a/JM2CFrELmP4w4vrFxbvmvdTQk8k7g3QjQKm++Uk="; }; - cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY="; + cargoHash = "sha256-11u3a4W3vrGJQXjSMcDAS5D9mqG+XJ0L5FYmqqH/McM="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; From 655e13b18fc303b89481b632217ebbc6e2e1f1c7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 18 Oct 2025 23:27:00 +0200 Subject: [PATCH 0334/2279] dash.tests: Add some reverse dependencies Smoke test any updates before they enter into staging. --- pkgs/by-name/da/dash/package.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix index 3fe956dd6f1d..c922ed45d97f 100644 --- a/pkgs/by-name/da/dash/package.nix +++ b/pkgs/by-name/da/dash/package.nix @@ -7,6 +7,10 @@ libedit, runCommand, dash, + + # Reverse dependency smoke tests + tests, + patchRcPathPosix, }: stdenv.mkDerivation (finalAttrs: { @@ -43,6 +47,19 @@ stdenv.mkDerivation (finalAttrs: { [ -s $out/success ] grep -q "Hello World" $out/success ''; + + /** + Reverse dependency smoke tests. Build success of `dash.tests` informs + whether an update makes it into staging. + */ + reverseDependencies = lib.recurseIntoAttrs { + writers = lib.recurseIntoAttrs { + simple = tests.writers.simple.dash; + bin = tests.writers.bin.dash; + }; + # Not sure if effective smoke test, but cheap + patch-rc-path-posix = patchRcPathPosix.tests.test-posix; + }; }; }; From fd6c3ab7b8260be85d8a6a38fc509d098d1341d4 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 18 Oct 2025 22:24:23 +0000 Subject: [PATCH 0335/2279] libxls: fix build against gettext >= 0.25 --- pkgs/by-name/li/libxls/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix index ab020551d986..ac0e763e341c 100644 --- a/pkgs/by-name/li/libxls/package.nix +++ b/pkgs/by-name/li/libxls/package.nix @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw="; }; + # workaround required to build against gettext >= 0.25 + # https://savannah.gnu.org/support/index.php?111272 + preAutoreconf = '' + autopoint --force + ''; + + # workaround required to build against gettext >= 0.25 + # https://savannah.gnu.org/support/index.php?111273 + autoreconfFlags = [ + "--include=m4" + "--install" + "--force" + "--verbose" + ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive From f12bc4f119999c91aed02fbccd861c24441d28aa Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 18 Oct 2025 22:24:23 +0000 Subject: [PATCH 0336/2279] libxls: enable checks --- pkgs/by-name/li/libxls/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix index ac0e763e341c..5a2eeda71610 100644 --- a/pkgs/by-name/li/libxls/package.nix +++ b/pkgs/by-name/li/libxls/package.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; + meta = with lib; { description = "Extract Cell Data From Excel xls files"; homepage = "https://github.com/libxls/libxls"; From ced6225c49d2abe66b550b5e83ebc970b7744d80 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 18 Oct 2025 22:24:23 +0000 Subject: [PATCH 0337/2279] libxls: modernize --- pkgs/by-name/li/libxls/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix index 5a2eeda71610..2b05808ea436 100644 --- a/pkgs/by-name/li/libxls/package.nix +++ b/pkgs/by-name/li/libxls/package.nix @@ -6,14 +6,14 @@ autoconf-archive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxls"; version = "1.6.3"; src = fetchFromGitHub { owner = "libxls"; repo = "libxls"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw="; }; @@ -41,12 +41,13 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { description = "Extract Cell Data From Excel xls files"; + changelog = "https://github.com/libxls/libxls/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/libxls/libxls"; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = [ ]; mainProgram = "xls2csv"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) From 9a7c5c5eaad09d4c1cdc505ff41ac7b07f18b4a5 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 11 Sep 2024 17:49:48 +0200 Subject: [PATCH 0338/2279] systemd: use stripExclude instead of manual workaround --- pkgs/os-specific/linux/systemd/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 964ebdf07d2b..013ae4ef9df8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -857,11 +857,7 @@ stdenv.mkDerivation (finalAttrs: { # Avoid *.EFI binary stripping. # At least on aarch64-linux strip removes too much from PE32+ files: # https://github.com/NixOS/nixpkgs/issues/169693 - # The hack is to move EFI file out of lib/ before doStrip run and return it - # after doStrip run. - preFixup = lib.optionalString withBootloader '' - mv $out/lib/systemd/boot/efi $out/dont-strip-me - ''; + stripExclude = [ "lib/systemd/boot/efi/*" ]; # Wrap in the correct path for LUKS2 tokens. postFixup = @@ -871,9 +867,6 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup done '' - + lib.optionalString withBootloader '' - mv $out/dont-strip-me $out/lib/systemd/boot/efi - '' + lib.optionalString withUkify '' # To cross compile a derivation that builds a UKI with ukify, we need to wrap # ukify with the correct binutils. When wrapping, no splicing happens so we From 863d1924d31f19a0a252700b64b8e3c371d81f10 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 11 Sep 2024 18:02:55 +0200 Subject: [PATCH 0339/2279] systemd: consistently use lib.getOutput --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 013ae4ef9df8..e1bfa4431f28 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -488,8 +488,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "sysvrcnd-path" "") # Login - (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin") - (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin") + (lib.mesonOption "sulogin-path" "${lib.getOutput "login" util-linux}/bin/sulogin") + (lib.mesonOption "nologin-path" "${lib.getOutput "login" util-linux}/bin/nologin") # Mount (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount") From 251a798347aba0d63861525b0eb2adc157e8f8bb Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 25 Sep 2024 15:56:54 +0200 Subject: [PATCH 0340/2279] systemd: remove outdated comment --- pkgs/os-specific/linux/systemd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e1bfa4431f28..400febccc098 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -204,8 +204,6 @@ stdenv.mkDerivation (finalAttrs: { inherit pname; version = "258"; - # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly - # This has proven to be less error-prone than the previous systemd fork. src = fetchFromGitHub { owner = "systemd"; repo = "systemd"; From 04d41ccd9a4a4105ecf0c2902906c7e45dc5c027 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 12 Oct 2025 23:16:08 +0200 Subject: [PATCH 0341/2279] systemd: add withVConsole option --- pkgs/os-specific/linux/systemd/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 400febccc098..a10f411fb0f4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -163,6 +163,7 @@ # on their live NixOS system, we disable it by default. withKernelInstall ? false, withLibarchive ? true, + withVConsole ? true, # tests assume too much system access for them to be feasible for us right now withTests ? false, # build only libudev and libsystemd @@ -466,10 +467,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig") (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig") - # Keyboard - (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys") - (lib.mesonOption "setfont-path" "${kbd}/bin/setfont") - # SBAT (lib.mesonOption "sbat-distro" "nixos") (lib.mesonOption "sbat-distro-summary" "NixOS") @@ -571,6 +568,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "man" true) (lib.mesonEnable "nspawn" withNspawn) + (lib.mesonBool "vconsole" withVConsole) (lib.mesonBool "analyze" withAnalyze) (lib.mesonBool "logind" withLogind) (lib.mesonBool "localed" withLocaled) @@ -597,7 +595,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "create-log-dirs" false) (lib.mesonBool "smack" true) (lib.mesonBool "b_pie" true) - + ] + ++ lib.optionals withVConsole [ + (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys") + (lib.mesonOption "setfont-path" "${kbd}/bin/setfont") ] ++ lib.optionals (withShellCompletions == false) [ (lib.mesonOption "bashcompletiondir" "no") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81bae1171116..5c1806a5c4ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10351,6 +10351,7 @@ with pkgs; withVmspawn = false; withQrencode = false; withLibarchive = false; + withVConsole = false; }; systemdLibs = systemdMinimal.override { pname = "systemd-minimal-libs"; From 7dfac72d6716d3900b92471338c8c6c22d61677d Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Oct 2025 00:35:30 +0200 Subject: [PATCH 0342/2279] systemd: stop pulling in kmod when kmod is disabled --- pkgs/os-specific/linux/systemd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a10f411fb0f4..66cfdc554fe2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -446,7 +446,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d") (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d") - (lib.mesonOption "kmod-path" "${kmod}/bin/kmod") # /bin/sh is also the upstream default. Explicitly set this so that we're # independent of upstream changes to the default. @@ -600,6 +599,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys") (lib.mesonOption "setfont-path" "${kbd}/bin/setfont") ] + ++ lib.optionals withKmod [ + (lib.mesonOption "kmod-path" "${kmod}/bin/kmod") + ] ++ lib.optionals (withShellCompletions == false) [ (lib.mesonOption "bashcompletiondir" "no") (lib.mesonOption "zshcompletiondir" "no") From 9b02e233422a6cf7869ba780f431a1aad1df3cd1 Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Oct 2025 00:34:49 +0200 Subject: [PATCH 0343/2279] systemdMinimal: disable more systemd features --- pkgs/top-level/all-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c1806a5c4ef..c6fbba778db1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10352,6 +10352,11 @@ with pkgs; withQrencode = false; withLibarchive = false; withVConsole = false; + # withKmod = false; # breaks udevCheckHook of bcache-tools + withFirstboot = false; + withKexectools = false; + withLibseccomp = false; + withNspawn = false; }; systemdLibs = systemdMinimal.override { pname = "systemd-minimal-libs"; From 7081b4f992aad30f653c24bf3d353599f3384d86 Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 13 Oct 2025 22:13:26 +0200 Subject: [PATCH 0344/2279] systemd: re-enable hardening flag The issue was fixed upstream in systemd according to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523#c9 --- pkgs/os-specific/linux/systemd/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 66cfdc554fe2..8a0724e0331e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -327,17 +327,13 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; __structuredAttrs = true; - hardeningDisable = [ - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523 - "trivialautovarinit" - ] - ++ (lib.optionals withLibBPF [ + hardeningDisable = lib.optionals withLibBPF [ # breaks clang -target bpf; should be fixed to not use # a wrapped clang? "zerocallusedregs" "shadowstack" "pacret" - ]); + ]; nativeBuildInputs = [ pkg-config From 1f3f8aed59dec7c8e9f414b2f0cd7d7775a86cdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Oct 2025 00:31:59 +0000 Subject: [PATCH 0345/2279] skrooge: 25.4.0 -> 25.10.0 --- pkgs/by-name/sk/skrooge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix index 6bd4487b1531..631cfa06e1af 100644 --- a/pkgs/by-name/sk/skrooge/package.nix +++ b/pkgs/by-name/sk/skrooge/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "skrooge"; - version = "25.4.0"; + version = "25.10.0"; src = fetchurl { url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; - hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8="; + hash = "sha256-kECWi5/q2reBOs9DrubOz5Vol3AkA7lXzOLtbgx2HlE="; }; nativeBuildInputs = with kdePackages; [ From 8a3224679d5286371a3e82a5d6f43aafbd44c642 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 19 Oct 2025 05:33:05 +0200 Subject: [PATCH 0346/2279] ksh: set mainProgram --- pkgs/by-name/ks/ksh/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ks/ksh/package.nix b/pkgs/by-name/ks/ksh/package.nix index 86f06ae20266..b0780eebc8c1 100644 --- a/pkgs/by-name/ks/ksh/package.nix +++ b/pkgs/by-name/ks/ksh/package.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/att/ast"; license = lib.licenses.cpl10; maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "ksh"; platforms = lib.platforms.all; }; From a72a2b0efdb537a3c766f7ec910e9d314f27bdc8 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 19 Oct 2025 11:35:17 +0800 Subject: [PATCH 0347/2279] uv: 0.9.3 -> 0.9.4 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9bd7da06a174..30abf2f91dbc 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-wnuAUoyq2CQt5F5LiIsfclv+RXESZFMzGF6UbQhmsBI="; + hash = "sha256-EbLmE+Pwe/LASWIPDRlxvu7k1HCQyYfq5eAwrVoXSXQ="; }; - cargoHash = "sha256-AeqOGZrc0MY+WSR3xrEnSfxf0mgdRvxkpNcQrLsmtiY="; + cargoHash = "sha256-/MD3D2s+JXIg3J5eErRnknszd7xj89APhjFSApqAE5Q="; buildInputs = [ rust-jemalloc-sys From 649910383b8e16f55c0af06c6cc1697d4a1ff84e Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 19 Oct 2025 13:51:05 +0200 Subject: [PATCH 0348/2279] audit: move tests to passthru --- pkgs/by-name/au/audit/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index 7395ada94e13..d16ea8e58677 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -117,8 +117,7 @@ stdenv.mkDerivation (finalAttrs: { pythonImportsCheck = [ "audit" ]; - enableParallelChecking = false; - doCheck = true; + doCheck = false; postInstall = '' installShellCompletion --bash init.d/audit.bash_completion @@ -156,6 +155,11 @@ stdenv.mkDerivation (finalAttrs: { static = pkgsStatic.audit or null; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; audit = nixosTests.audit; + # Broken on a hardened kernel + package = finalAttrs.finalPackage.overrideAttrs (previousAttrs: { + pname = previousAttrs.pname + "-test"; + doCheck = true; + }); }; }; From 893c94f7739ea5d310971c311b926d082531a1e0 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sun, 19 Oct 2025 13:46:22 +0200 Subject: [PATCH 0349/2279] python313Packages.sphinx: disable another racy test --- pkgs/development/python-modules/sphinx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 7402fa2b3103..36d8c62176e8 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -118,6 +118,7 @@ buildPythonPackage rec { "test_class_alias_having_doccomment" "test_class_alias_for_imported_object_having_doccomment" "test_decorators" + "test_xml_warnings" # racy with too many threads # https://github.com/NixOS/nixpkgs/issues/353176 "test_document_toc_only" From f6286c104585341625324194bd1c9724ccc64a8c Mon Sep 17 00:00:00 2001 From: Aurelia Date: Sun, 19 Oct 2025 15:21:52 +0200 Subject: [PATCH 0350/2279] handheld-daemon: 3.18.5 -> 3.19.22 power.py also seems to have switched to using subprocess with arguments inside a string, so the replace now only matches the opening quote. --- pkgs/by-name/ha/handheld-daemon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 4c06d473ee3e..e70fc72626bc 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -16,14 +16,14 @@ }: python3Packages.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.18.5"; + version = "3.19.22"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${version}"; - hash = "sha256-T/0qKHF/BmVtVO19pd4/iqIZP1/G7iayDzHdhjRIA7U="; + hash = "sha256-mvIB2lgFaHMCGEshKvagOFUrvcgEbyUS9VXJpXbvzTs="; }; # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/hhd/plugins/power/power.py \ --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' \ - --replace-fail '"systemctl"' '"${lib.getExe' systemd "systemctl"}"' \ + --replace-fail '"systemctl' '"${lib.getExe' systemd "systemctl"}' \ --replace-fail '"stat"' '"${lib.getExe' coreutils "stat"}"' \ --replace-fail '"swapon"' '"${lib.getExe' util-linux "swapon"}"' \ --replace-fail '"swapoff"' '"${lib.getExe' util-linux "swapoff"}"' \ From a6295b2ef04e79db51b338955784b76c36927860 Mon Sep 17 00:00:00 2001 From: Pui Yong Qing Date: Sun, 19 Oct 2025 17:25:23 +0800 Subject: [PATCH 0351/2279] python3Packages.psycopg2: 2.9.10 -> 2.9.11 release note: https://github.com/psycopg/psycopg2/releases/tag/2.9.11 --- pkgs/development/python-modules/psycopg2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index cbc3923dd126..d04c9c410792 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -2,7 +2,6 @@ stdenv, lib, buildPythonPackage, - pythonOlder, isPyPy, fetchPypi, libpq, @@ -12,16 +11,17 @@ sphinxHook, sphinx-better-theme, buildPackages, + setuptools, }: buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.10"; - format = "setuptools"; + version = "2.9.11"; + pyproject = true; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 - disabled = pythonOlder "3.6" || isPyPy; + disabled = isPyPy; outputs = [ "out" @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-EuwLQLAnP5UpYjPodQRBM5KY5qVy9wOdpbJg48i2DhE="; + hash = "sha256-lk0xyvco4hfGl/936mnCughl+kHsILsA8Jd+Yv3MUuM="; }; postPatch = '' @@ -44,6 +44,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinxHook sphinx-better-theme + setuptools ]; buildInputs = [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; From 7617aa5f11549d0b7c0c33b5d034d08760e90159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 17:46:34 -0700 Subject: [PATCH 0352/2279] python3Packages.aiohttp: only depend on async-timeout for Python < 3.11 --- pkgs/development/python-modules/aiohttp/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 7a7163164594..010a997cd972 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -94,15 +94,18 @@ buildPythonPackage rec { dependencies = [ aiohappyeyeballs aiosignal - async-timeout attrs frozenlist multidict propcache yarl ] + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout + ] ++ optional-dependencies.speedups; + optional-dependencies.speedups = [ aiodns (if isPyPy then brotlicffi else brotli) From 97124c2e99def1518b92b1384d8ba117f50507b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 17:54:29 -0700 Subject: [PATCH 0353/2279] python3Packages.backports-zstd: init at 1.0.0 --- .../python-modules/backports-zstd/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 8 +++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/backports-zstd/default.nix diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix new file mode 100644 index 000000000000..6050f2c4975b --- /dev/null +++ b/pkgs/development/python-modules/backports-zstd/default.nix @@ -0,0 +1,55 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, + zstd, +}: + +buildPythonPackage rec { + pname = "backports-zstd"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rogdham"; + repo = "backports.zstd"; + tag = "v${version}"; + fetchSubmodules = true; + hash = "sha256-MRtj40vjCPtV9/RDgun/APzva4lv+TnXeBKD9RNlkII="; + }; + + postPatch = '' + # need to preserve $PYTHONPATH when calling sys.executable + substituteInPlace tests/test/support/script_helper.py \ + --replace-fail "return __cached_interp_requires_environment" "return True" + ''; + + build-system = [ setuptools ]; + + pypaBuildFlags = [ "--config-setting=--build-option=--system-zstd" ]; + + buildInputs = [ zstd ]; + + pythonImportsCheck = [ "backports.zstd" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + enabledTestPaths = [ "tests" ]; + + disabledTestPaths = [ + # sandbox doesn't allow setting SUID bit + "tests/test/test_tarfile.py::TestExtractionFilters::test_modes" + ]; + + meta = { + changelog = "https://github.com/rogdham/backports.zstd/blob/${src.tag}/CHANGELOG.md"; + description = "Backport of compression.zstd"; + homepage = "https://github.com/rogdham/backports.zstd"; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a61be6e913c..04cc5c5c9206 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1687,6 +1687,14 @@ self: super: with self; { backports-tarfile = callPackage ../development/python-modules/backports-tarfile { }; + backports-zstd = + if pythonAtLeast "3.14" then + null + else + callPackage ../development/python-modules/backports-zstd { + inherit (pkgs) zstd; + }; + backrefs = callPackage ../development/python-modules/backrefs { }; backtesting = callPackage ../development/python-modules/backtesting { }; From 6faaad0df64a89bdbc81f3fd773b6a23ea5575ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 19 Oct 2025 17:46:51 -0700 Subject: [PATCH 0354/2279] python3Packages.aiohttp: 3.13.0 -> 3.13.1 Diff: https://github.com/aio-libs/aiohttp/compare/v3.13.0...v3.13.1 Changelog: https://docs.aiohttp.org/en/v3.13.1/changes.html --- pkgs/development/python-modules/aiohttp/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 010a997cd972..d9897a535929 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -21,11 +21,11 @@ aiosignal, async-timeout, attrs, + backports-zstd, frozenlist, multidict, propcache, yarl, - zstandard, # optional dependencies aiodns, @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.13.0"; + version = "3.13.1"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-X4igOjBeAGDfUGwZAsjUWOWt3EFt53QSuUcdJ/5vBVU="; + hash = "sha256-gjFNGHfbajktxApj1RfUdMB4FuD8cFc6ueHZsRbV/uU="; }; patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [ @@ -105,13 +105,10 @@ buildPythonPackage rec { ] ++ optional-dependencies.speedups; - optional-dependencies.speedups = [ aiodns + backports-zstd (if isPyPy then brotlicffi else brotli) - ] - ++ lib.optionals (pythonOlder "3.14") [ - zstandard ]; nativeCheckInputs = [ From 850aeeec4e9e96fb669e4f648e2e9b87eae37bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Oct 2025 02:25:32 +0000 Subject: [PATCH 0355/2279] libedit: 20250104-3.1 -> 20251016-3.1 --- pkgs/by-name/li/libedit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 14bb1f1c532c..6f3caa1f45da 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libedit"; - version = "20250104-3.1"; + version = "20251016-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz"; - hash = "sha256-I3knAWlFUKU3IGMM0c1hZxAbV3Ot3ctBBPc0W3OlaKw="; + hash = "sha256-ITYrAGU7v8HHH3GnV42ma1tSA1WdQxNNLddxnjE84EE="; }; outputs = [ From b8b9aa9e4d0bcfc467d74186cc5a57ed9f39701c Mon Sep 17 00:00:00 2001 From: Pui Yong Qing Date: Mon, 20 Oct 2025 10:44:51 +0800 Subject: [PATCH 0356/2279] python3Packages.psycopg2: move setuptools to build-system --- pkgs/development/python-modules/psycopg2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index d04c9c410792..026ddf281e48 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinxHook sphinx-better-theme + ]; + + build-system = [ setuptools ]; From 85cbe2fb6707aa4a4b4f92de86c9f44bc534d804 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 20 Oct 2025 11:06:59 +0800 Subject: [PATCH 0357/2279] openssl: allow darwin networking --- pkgs/development/libraries/openssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0d4e99a4394b..7d4887638ee1 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -257,6 +257,8 @@ let patchShebangs util ''; + __darwinAllowLocalNetworking = true; + postInstall = ( if static then From 82ab019058db6f8c4d60b6eac83fa4ce3b7cfd97 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 20 Oct 2025 06:26:14 +0100 Subject: [PATCH 0358/2279] xterm: 402 -> 403 Changes: https://invisible-island.net/xterm/xterm.log.html#xterm_403 --- pkgs/by-name/xt/xterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index 2c06f83173ee..a53997d95010 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "402"; + version = "403"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-UmDFeTzVZMaeU+9vUowArwZq5ntC0CE3+374+v5wu3o="; + hash = "sha256-EzGw31kZyyQ//jJtxv8QopHmg6Ji9wzflkpmS+czrYM="; }; patches = [ ./sixel-256.support.patch ]; From 976ff5e439fcd3b5d115d2c068e7ef6cd4fea4d7 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Wed, 8 Oct 2025 11:02:03 +0200 Subject: [PATCH 0359/2279] sshwifty: fix updateScript Signed-off-by: David Wronek --- pkgs/by-name/ss/sshwifty/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index 934fc1a2186e..86774d108b4d 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -55,7 +55,14 @@ buildGo125Module (finalAttrs: { passthru = { tests = { inherit (nixosTests) sshwifty; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version=unstable" + "--version-regex=^([0-9.]+(?!.+-prebuild).+$)" + "--subpackage" + "sshwifty-ui" + ]; + }; }; meta = { From 0d0f896efc6c56f98fabcfc18dd6e651789dfe4e Mon Sep 17 00:00:00 2001 From: David Wronek Date: Wed, 8 Oct 2025 11:50:45 +0200 Subject: [PATCH 0360/2279] sshwifty: 0.4.0-beta-release -> 0.4.1-beta-release Signed-off-by: David Wronek --- pkgs/by-name/ss/sshwifty/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix index 86774d108b4d..f7a9298884bf 100644 --- a/pkgs/by-name/ss/sshwifty/package.nix +++ b/pkgs/by-name/ss/sshwifty/package.nix @@ -10,20 +10,20 @@ }: buildGo125Module (finalAttrs: { pname = "sshwifty"; - version = "0.4.0-beta-release"; + version = "0.4.1-beta-release"; src = fetchFromGitHub { owner = "nirui"; repo = "sshwifty"; tag = finalAttrs.version; - hash = "sha256-7ZfS46+aflKIQ8S9T18JjCb7bY8mB6cJl/lgJi5Hukg="; + hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4="; }; sshwifty-ui = buildNpmPackage { pname = "sshwifty-ui"; inherit (finalAttrs) version src; - npmDepsHash = "sha256-I96VixL21cF2kp9AK6q0ipjphjdWuSETKakbsprGek0="; + npmDepsHash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA="; npmBuildScript = "generate"; @@ -39,7 +39,7 @@ buildGo125Module (finalAttrs: { cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* . ''; - vendorHash = "sha256-kLKydjvZtFEY7vjqxK1cCwZSTbdqYWPRmxYSN0LYqsg="; + vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY="; ldflags = [ "-s" From 8461a645e094ce4200d943da608d80f157245b81 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 19 Oct 2025 16:44:44 -0400 Subject: [PATCH 0361/2279] systemd: 258 -> 258.1 --- pkgs/os-specific/linux/systemd/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 964ebdf07d2b..563599062b17 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -202,7 +202,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "258"; + version = "258.1"; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -210,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd"; rev = "v${finalAttrs.version}"; - hash = "sha256-xtGZaVNsBNxkidgfVBu8xtvj0SxpY6OyJCUE+gq59qE="; + hash = "sha256-LA+6/d9W3CxK0G2sXsPHM4BVLf8IzsWW6IxJFby6/JU="; }; # On major changes, or when otherwise required, you *must* : @@ -224,14 +224,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # https://github.com/systemd/systemd/pull/39094 (fetchpatch { - url = "https://github.com/systemd/systemd/commit/0f44a6c64aebc64a0611a605831206afee9cb730.patch"; - hash = "sha256-DO6q17mE2U8iLezMYt4PX5Ror20N1gCrUbXeQmrW1is="; + url = "https://github.com/systemd/systemd/commit/8b4ee3d68d2e70d9a396b74d155eab3b11763311.patch"; + hash = "sha256-JJDaSHQjd1QZ18CQHq40viB0AF/0MiescmZUcc/6LDg="; }) - - # https://github.com/systemd/systemd/pull/39069 (fetchpatch { - url = "https://github.com/systemd/systemd/commit/b5fdfedf729712b9824a5cb457a07d5699d2946c.patch"; - hash = "sha256-0SvAn9Dl4z80PRIvDbIVIjKp5DsT/IUoHa5IiH1HHFY="; + url = "https://github.com/systemd/systemd/commit/13b0e7fc6d2623800ba04b104f3b628388c9f5e6.patch"; + hash = "sha256-X+tY3NjfRJpF6wvd++xEps0DIFTbX/6Zw9oO4Y9FmNI="; }) ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch From c602300fc733e069d981438db00f3a4fb8d46f34 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 19 Oct 2025 19:52:36 -0400 Subject: [PATCH 0362/2279] Revert "nixos/test/login: Fix uaccess test." This reverts commit 67e1598f9133bfa73e6641dd37607d14b7cfc993. --- nixos/tests/login.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index ab80b8aaabf0..bd0d3b7bc005 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -48,13 +48,12 @@ machine.wait_for_file("/home/alice/done") with subtest("Systemd gives and removes device ownership as needed"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl /dev/dri/card0 | grep -q alice") + machine.succeed("getfacl /dev/snd/timer | grep -q alice") machine.send_key("alt-f1") machine.wait_until_succeeds("[ $(fgconsole) = 1 ]") - machine.fail("getfacl /dev/dri/card0 | grep -q alice") + machine.fail("getfacl /dev/snd/timer | grep -q alice") machine.succeed("chvt 2") - machine.wait_until_succeeds("getfacl /dev/dri/card0 | grep -q alice") + machine.wait_until_succeeds("getfacl /dev/snd/timer | grep -q alice") with subtest("Virtual console logout"): machine.send_chars("exit\n") From 0074a31d5e80d17241f5c1ae37beffa56ac3866c Mon Sep 17 00:00:00 2001 From: Pui Yong Qing Date: Mon, 20 Oct 2025 17:03:16 +0800 Subject: [PATCH 0363/2279] rocmPackages.amdsmi: fix libdrm runtime loading and set mainProgram --- pkgs/development/rocm-modules/6/amdsmi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/6/amdsmi/default.nix index 6f26889ab01b..a145e4d61ded 100644 --- a/pkgs/development/rocm-modules/6/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/6/amdsmi/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' + makeWrapperArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdrm ]}) wrapPythonProgramsIn $out rm $out/bin/amd-smi ln -sf $out/libexec/amdsmi_cli/amdsmi_cli.py $out/bin/amd-smi @@ -88,5 +89,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ lovesegfault ]; teams = [ teams.rocm ]; platforms = [ "x86_64-linux" ]; + mainProgram = "amd-smi"; }; }) From 9871080d5f79cdb991e8849ad3e385fcd23959d5 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 19 Oct 2025 19:00:41 +0800 Subject: [PATCH 0364/2279] bmake: remove dependency on ksh --- pkgs/by-name/bm/bmake/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index ad3ed152731b..a762ea5eadda 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -3,7 +3,6 @@ bc, fetchurl, getopt, - ksh, pkgsMusl ? { }, stdenv, tzdata, @@ -39,9 +38,6 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ bc tzdata - ] - ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ - ksh ]; # The generated makefile is a small wrapper for calling ./boot-strap with a From 6503036133b469ba5a84b96ff2c3a63a48bb5f1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Oct 2025 19:49:49 +0000 Subject: [PATCH 0365/2279] libfabric: 2.3.0 -> 2.3.1 --- pkgs/by-name/li/libfabric/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix index 11b83ef7a87c..47ce9db99b9b 100644 --- a/pkgs/by-name/li/libfabric/package.nix +++ b/pkgs/by-name/li/libfabric/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "2.3.0"; + version = "2.3.1"; enableParallelBuilding = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = "libfabric"; rev = "v${version}"; - sha256 = "sha256-pxSv6mg51It4+P1nAgXdWizTGpI31rn5+n3f4vD6ooY="; + sha256 = "sha256-Zaf7iGr2/HWiMcH7zERz5Y9YzJ0QpHCCs+bU+qmoQTI="; }; outputs = [ From 47694b03b815e6fba841be2153f37ad1abd0a363 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 17:04:56 -0300 Subject: [PATCH 0366/2279] skyemu: 3-unstable-2025-02-23 -> 4 --- pkgs/by-name/sk/skyemu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix index 697daa6cb5c7..02c63ae1399d 100644 --- a/pkgs/by-name/sk/skyemu/package.nix +++ b/pkgs/by-name/sk/skyemu/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "skyemu"; - version = "3-unstable-2025-02-23"; + version = "4"; src = fetchFromGitHub { owner = "skylersaleh"; repo = "SkyEmu"; - rev = "f8573db83d15791b0cd94c29ceb46bf683963ff0"; - hash = "sha256-LI4zBKjB48zYYYVZePzefRFrw/zvg17jzh5ZOPHAWok="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rfXHOff+PG5iA19iwEij4c5aFD9XrSF1GQhIBhWzKgg="; }; nativeBuildInputs = [ From 9097f841b440c509c35fb3d9a862b9a72a4230fd Mon Sep 17 00:00:00 2001 From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> Date: Tue, 21 Oct 2025 02:27:02 +0400 Subject: [PATCH 0367/2279] q4wine: 1.3.13 -> 1.4.2; fix build with cmake 4 --- pkgs/applications/misc/q4wine/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix index b3cbb9572923..708e965c0978 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/applications/misc/q4wine/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - mkDerivation, + stdenv, cmake, sqlite, qtbase, @@ -15,15 +15,15 @@ which, # runtime deps. }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "q4wine"; - version = "1.3.13"; + version = "1.4.2"; src = fetchFromGitHub { owner = "brezerk"; repo = "q4wine"; rev = "v${version}"; - sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h"; + sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486b519307ce..320665a58872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11354,7 +11354,7 @@ with pkgs; graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; }; graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat; - q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; + q4wine = kdePackages.callPackage ../applications/misc/q4wine { }; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; From 69376c9e2e6c328f721f3438010fb3bba4feb448 Mon Sep 17 00:00:00 2001 From: Krishnan Shankar Date: Mon, 20 Oct 2025 18:50:36 -0500 Subject: [PATCH 0368/2279] maintainers: add krishnans2006 --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c699a0e7b3b..0014addf962a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13933,6 +13933,14 @@ githubId = 4032; name = "Kristoffer Thømt Ravneberg"; }; + krishnans2006 = { + email = "krishnans2006@gmail.com"; + matrix = "@krishnans2006:matrix.org"; + github = "krishnans2006"; + githubId = 62958782; + name = "Krishnan Shankar"; + keys = [ { fingerprint = "A30C 1843 F470 4843 5D54 3D68 29CB 06A8 40D0 E14A"; } ]; + }; kristian-brucaj = { email = "kbrucaj@gmail.com"; github = "Flameslice"; From 690fd490fc94672fa1215470c4fa2175387b51ef Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Tue, 21 Oct 2025 09:54:34 +0900 Subject: [PATCH 0369/2279] leela-zero: 0.17 -> 0.17-unstable-2023-02-07, mv to pkgs/by-name --- .../le/leela-zero/package.nix} | 20 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 10 deletions(-) rename pkgs/{games/leela-zero/default.nix => by-name/le/leela-zero/package.nix} (69%) diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/by-name/le/leela-zero/package.nix similarity index 69% rename from pkgs/games/leela-zero/default.nix rename to pkgs/by-name/le/leela-zero/package.nix index da7c815fa056..7b5440562920 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/by-name/le/leela-zero/package.nix @@ -2,23 +2,23 @@ lib, stdenv, fetchFromGitHub, - cmake, boost, - opencl-headers, + cmake, + libsForQt5, ocl-icd, - qtbase, + opencl-headers, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "leela-zero"; - version = "0.17"; + version = "0.17-unstable-2023-02-07"; src = fetchFromGitHub { owner = "gcp"; repo = "leela-zero"; - rev = "v${version}"; - hash = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw="; + rev = "3ee6d20d0b36ae26120331c610926359cc5837de"; + hash = "sha256-JF25y471miw/0b7XXBURzK+4WBwZI5ZUP+36/cZUORo="; fetchSubmodules = true; }; @@ -26,12 +26,16 @@ stdenv.mkDerivation rec { boost opencl-headers ocl-icd - qtbase + libsForQt5.qtbase zlib ]; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" + ]; + dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77425fcf52c9..9194cee58855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13380,8 +13380,6 @@ with pkgs; pythonSupport = true; }; - leela-zero = libsForQt5.callPackage ../games/leela-zero { }; - legendary-gl = python3Packages.callPackage ../games/legendary-gl { }; liquidwar = callPackage ../games/liquidwar { From 012fbf5a34aa7ac1014a3c00d624a3b49ac8408a Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Tue, 21 Oct 2025 10:59:33 +0900 Subject: [PATCH 0370/2279] libcork: fix build issue with cmake 4 --- pkgs/by-name/li/libcork/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix index ffcf1683533b..d8261ba99721 100644 --- a/pkgs/by-name/li/libcork/package.nix +++ b/pkgs/by-name/li/libcork/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR} + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ From 65a7c106e5467c587d15080dc8caff515b421036 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 13:08:43 +0000 Subject: [PATCH 0371/2279] restinio: 0.7.7 -> 0.7.8 --- pkgs/by-name/re/restinio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix index cff1d36155c4..4bf8302a89cf 100644 --- a/pkgs/by-name/re/restinio/package.nix +++ b/pkgs/by-name/re/restinio/package.nix @@ -21,13 +21,13 @@ assert !with_boost_asio -> asio != null; stdenv.mkDerivation (finalAttrs: { pname = "restinio"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "Stiffstream"; repo = "restinio"; tag = "v${finalAttrs.version}"; - hash = "sha256-bbiBz/WkQc3HiS7+x/qsRdHoravPX8LBKb+a2WeC81s="; + hash = "sha256-PXm9s586V1aZ7D5GwYzBc/Fljif/Iq3VChDe2NHWKSU="; }; # https://www.github.com/Stiffstream/restinio/issues/230 From fa8e6dbcf18f6e3f570f747500b8dec96443b2cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Oct 2025 15:00:15 +0000 Subject: [PATCH 0372/2279] lacy: 0.5.1 -> 0.6.0 --- pkgs/by-name/la/lacy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lacy/package.nix b/pkgs/by-name/la/lacy/package.nix index 1ddc3fb64f23..95cecaec55b5 100644 --- a/pkgs/by-name/la/lacy/package.nix +++ b/pkgs/by-name/la/lacy/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lacy"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "timothebot"; repo = "lacy"; tag = "v${finalAttrs.version}"; - hash = "sha256-blQPIw8Ct+TGRuy+ybYr9rdlfOZdvAbhsB8sfwugS/w="; + hash = "sha256-NjLCN9RDWusfw1BwSzRQLCx4UhHyMpQZ5+igRG1rX9Q="; }; passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-rNTRcQJptVi/ruCd56oHHN9n+Z3NhUNyrvXf27Sovtw="; + cargoHash = "sha256-eE/kyb09AwcYTsyXQ9Yn43QF2veCRAgGkNgykJHCsFE="; meta = { description = "Fast magical cd alternative for lacy terminal navigators"; From 47f6f194cc7f29d3a5aad3d9aa976b8798d5ed15 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 21 Oct 2025 19:05:12 +0000 Subject: [PATCH 0373/2279] uv: 0.9.4 -> 0.9.5 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 30abf2f91dbc..51b50cafc036 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-EbLmE+Pwe/LASWIPDRlxvu7k1HCQyYfq5eAwrVoXSXQ="; + hash = "sha256-Js62zaO44/gXCCwji4LmlyO62zI96CFhnfnYqgI2p+U="; }; - cargoHash = "sha256-/MD3D2s+JXIg3J5eErRnknszd7xj89APhjFSApqAE5Q="; + cargoHash = "sha256-TadS0YrZV5psCcGiu21w55nQhlzU+gXZPmFCAONLbXE="; buildInputs = [ rust-jemalloc-sys From 345a318c5a533eac2d6cddddb40623429c2f286d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 16:39:49 -0300 Subject: [PATCH 0374/2279] libnghttp2_asio: fix build with cmake4 --- pkgs/by-name/li/libnghttp2_asio/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 4fe8889e16b2..490566fde01f 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation { openssl ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "High level HTTP/2 C++ library"; longDescription = '' From 6e4bfd4502147cfa88bebe20eb25e3ca0e55e3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 21 Oct 2025 12:51:43 -0700 Subject: [PATCH 0375/2279] python3Packages.calver: 2025.04.17 -> 2025.10.20 Diff: https://github.com/di/calver/compare/2025.04.17...2025.10.20 Changelog: https://github.com/di/calver/releases/tag/2025.10.20 --- pkgs/development/python-modules/calver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix index df45ea99e481..46a47d3c4cbd 100644 --- a/pkgs/development/python-modules/calver/default.nix +++ b/pkgs/development/python-modules/calver/default.nix @@ -10,14 +10,14 @@ let self = buildPythonPackage rec { pname = "calver"; - version = "2025.04.17"; + version = "2025.10.20"; pyproject = true; src = fetchFromGitHub { owner = "di"; repo = "calver"; tag = version; - hash = "sha256-C0l/SThDhA1DnOeMJfuh3d8R606nzyQag+cg7QqvYWY="; + hash = "sha256-8CfPQ4uMgKDqMMgutLdsjn/MaAVBJQAp1KqUfxzNMQw="; }; postPatch = '' From 4c247a0e037def5518837d0987eddf6c385abf05 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Oct 2025 21:09:03 +0100 Subject: [PATCH 0376/2279] libinput: 1.29.1 -> 1.29.2 Changes: https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.29.2 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1a00fab8d27b..bee42110731e 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.29.1"; + version = "1.29.2"; outputs = [ "bin" @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-wNiI6QPwuK0gUJRadSJx+FOx84kpVC4bXhuQ3ybewoY="; + hash = "sha256-oxDGUbZebxAmBd2j51qV9Jn8SXBjUX2NPRgkxbDz7Dk="; }; patches = [ From 4c86df0733883f84e9cd22aea9dfe29a67a9cf73 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 16:34:44 -0300 Subject: [PATCH 0377/2279] liblaxjson: fix build with cmake4 --- pkgs/by-name/li/liblaxjson/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix index 905cc1cb9a16..86fb56ebb3ce 100644 --- a/pkgs/by-name/li/liblaxjson/package.nix +++ b/pkgs/by-name/li/liblaxjson/package.nix @@ -18,11 +18,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Library for parsing JSON config files"; homepage = "https://github.com/andrewrk/liblaxjson"; license = licenses.mit; platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ maintainers.andrewrk ]; }; } From 047bd6a5b7cf197817d87f2b99f3fb2015f9b15f Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Wed, 22 Oct 2025 00:12:38 +0200 Subject: [PATCH 0378/2279] pounce: migrate to finalAttrs --- pkgs/by-name/po/pounce/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix index 84fac59714c6..e7ca38499fd2 100644 --- a/pkgs/by-name/po/pounce/package.nix +++ b/pkgs/by-name/po/pounce/package.nix @@ -7,12 +7,12 @@ libxcrypt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pounce"; version = "3.1"; src = fetchzip { - url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; + url = "https://git.causal.agency/pounce/snapshot/pounce-${finalAttrs.version}.tar.gz"; sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ edef ]; }; -} +}) From ffbd32696827d7a1ef3ff371424c4b181a1e4cec Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Wed, 22 Oct 2025 00:14:36 +0200 Subject: [PATCH 0379/2279] pounce: avoid with lib --- pkgs/by-name/po/pounce/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix index e7ca38499fd2..426c77dfb57f 100644 --- a/pkgs/by-name/po/pounce/package.nix +++ b/pkgs/by-name/po/pounce/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://code.causal.agency/june/pounce"; description = "Simple multi-client TLS-only IRC bouncer"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ edef ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ edef ]; }; }) From 9270c9cffcc545ee881942ca9e3c824457965b9a Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Wed, 22 Oct 2025 00:15:40 +0200 Subject: [PATCH 0380/2279] pounce: replace libressl with libretls pounce cannot find the system ca store using latest libressl: pounce: tls_connect: failed to open CA file 'etc/ssl/cert.pem': No such file or directory The solution here is the same one taken by the catgirl package, see bcff49197e12abcc40b562a99d8627a5749a6bbe. --- pkgs/by-name/po/pounce/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix index 426c77dfb57f..c8fd34f67d25 100644 --- a/pkgs/by-name/po/pounce/package.nix +++ b/pkgs/by-name/po/pounce/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - libressl, + libretls, + openssl, fetchzip, pkg-config, libxcrypt, @@ -17,7 +18,8 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - libressl + libretls + openssl libxcrypt ]; From 001f5c9c5953bba44bc5d222d9da760eaff5f43d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 19:43:16 -0300 Subject: [PATCH 0381/2279] libwebcam: fix build with cmake4 --- pkgs/by-name/li/libwebcam/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libwebcam/package.nix b/pkgs/by-name/li/libwebcam/package.nix index aebf4eb6411b..70d08400a1b9 100644 --- a/pkgs/by-name/li/libwebcam/package.nix +++ b/pkgs/by-name/li/libwebcam/package.nix @@ -30,14 +30,20 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace ./uvcdynctrl/CMakeLists.txt \ - --replace "/lib/udev" "$out/lib/udev" + --replace-fail "/lib/udev" "$out/lib/udev" \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" substituteInPlace ./uvcdynctrl/udev/scripts/uvcdynctrl \ - --replace 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \ - --replace 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl" + --replace-fail 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \ + --replace-fail 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl" substituteInPlace ./uvcdynctrl/udev/rules/80-uvcdynctrl.rules \ - --replace "/lib/udev" "$out/lib/udev" + --replace-fail "/lib/udev" "$out/lib/udev" + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace libwebcam/CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; preConfigure = '' From f81c0895cd77bbd22191cccab9a97fd2ad185442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Sep 2025 15:42:42 +0200 Subject: [PATCH 0382/2279] python313Packages.filelock: 3.18.0 -> 3.19.1 Changelog: https://github.com/tox-dev/filelock/releases/tag/3.19.0 Changelog: https://github.com/tox-dev/filelock/releases/tag/3.19.1 --- pkgs/development/python-modules/filelock/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 2b7c7bdfa8ac..d5cdc8fb7855 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -6,20 +6,18 @@ hatchling, pytest-asyncio, pytest-mock, + pytest-timeout, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "filelock"; - version = "3.18.0"; + version = "3.19.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-rbyI6ruZ0v7IycGyKbFx8Yr6ZVQAFz3cZT1dAVAfufI="; + hash = "sha256-Zu2hiIsBccmYs1vivMD211w4inziDD8/N6qOlsLd31g="; }; build-system = [ @@ -30,6 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-mock + pytest-timeout pytestCheckHook ]; From 9277bc0b05b40a901a0355ca4656fe671aa5b67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 Oct 2025 02:39:22 +0200 Subject: [PATCH 0383/2279] python313Packages.filelock: 3.19.1 -> 3.20.0 Changelog: https://github.com/tox-dev/py-filelock/releases/tag/3.20.0 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index d5cdc8fb7855..bd33052a9c63 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.19.1"; + version = "3.20.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Zu2hiIsBccmYs1vivMD211w4inziDD8/N6qOlsLd31g="; + hash = "sha256-cR6UO07GvkLh1OZpC0jcF1yCKWdGa7McDCk/NDNME/Q="; }; build-system = [ From 5bbfb97a8a615d3e1dbea00c1433efa59cbb96a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 01:07:28 +0000 Subject: [PATCH 0384/2279] rust-cbindgen: 0.29.0 -> 0.29.1 --- pkgs/by-name/ru/rust-cbindgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix index 57b3004ecc25..1989f9bf0bbc 100644 --- a/pkgs/by-name/ru/rust-cbindgen/package.nix +++ b/pkgs/by-name/ru/rust-cbindgen/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-wCl2GpHqF7wKIE8UFyZRY0M1hxonZek2FN6+5x/jGWI="; + hash = "sha256-w1vLgdyxyZNnPQUJL6yYPHhB99svsryVkwelblEAisQ="; }; - cargoHash = "sha256-BErgOnmatxpfF5Ip44WOqnEWOzOJaVP6vfhXPsF9wuc="; + cargoHash = "sha256-POpdgDlBzHs4/fgV1SWSWcxVrn0UTTfvqYBRGqwD98s="; nativeCheckInputs = [ cmake From 2a28b99d797aa135c54a295984130e61f61269e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 05:57:09 +0000 Subject: [PATCH 0385/2279] p11-kit: 0.25.9 -> 0.25.10 --- pkgs/by-name/p1/p11-kit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix index d770115b423d..bbdf20b66a93 100644 --- a/pkgs/by-name/p1/p11-kit/package.nix +++ b/pkgs/by-name/p1/p11-kit/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.25.9"; + version = "0.25.10"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; tag = version; - hash = "sha256-lvm//lsG5xSz1dBuvp4bJvNS+zCYTuAqXC22Po95JJg="; + hash = "sha256-srZyY14PqPoPMcEj/3WWEPrBuCcAGibvziKgZV1vxO8="; fetchSubmodules = true; }; From d9e733ae43966b9578f9537c749cc2601436c63b Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 22 Oct 2025 02:16:03 -0400 Subject: [PATCH 0386/2279] Revert "nixos/tests: More temporary uaccess fixes" This reverts commit df2e6853205ca30bb6a7726e751bb9ba1d9333e6. --- nixos/tests/budgie.nix | 3 +-- nixos/tests/cinnamon-wayland.nix | 3 +-- nixos/tests/cinnamon.nix | 3 +-- nixos/tests/enlightenment.nix | 3 +-- nixos/tests/gnome-extensions.nix | 3 +-- nixos/tests/gnome-flashback.nix | 3 +-- nixos/tests/gnome-xorg.nix | 3 +-- nixos/tests/gnome.nix | 3 +-- nixos/tests/lxqt.nix | 3 +-- nixos/tests/mate.nix | 3 +-- nixos/tests/pantheon.nix | 3 +-- nixos/tests/xfce-wayland.nix | 3 +-- nixos/tests/xfce.nix | 3 +-- 13 files changed, 13 insertions(+), 26 deletions(-) diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index b003e1c65240..a6c40f6a9ab4 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -54,8 +54,7 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if Budgie session components actually start"): for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]: diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index e4118d82f4dd..d19ac920b388 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -42,8 +42,7 @@ machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Wait for the Cinnamon shell"): # Correct output should be (true, '2') diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index 1f8fb683efc7..9ff43a8dbbb7 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -53,8 +53,7 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Wait for the Cinnamon shell"): # Correct output should be (true, '2') diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index 41dfc754e7fe..77e731feddbf 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -42,8 +42,7 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("First time wizard"): machine.wait_for_text("Default") # Language diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 66003daa09d9..bde20a8c95aa 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -105,8 +105,7 @@ # wait for alice to be logged in machine.wait_for_unit("default.target", "${user.name}") # check that logging in has given the user ownership of devices - # Change back to /dev/snd/timer after systemd-258.1 - assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") + assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") with subtest("Wait for GNOME Shell"): # correct output should be (true, 'false') diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 46cb6402bbb1..6df6e621995e 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -46,8 +46,7 @@ machine.wait_for_file("${xauthority}") machine.succeed("xauth merge ${xauthority}") # Check that logging in has given the user ownership of devices - # Change back to /dev/snd/timer after systemd-258.1 - assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") + assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") with subtest("Wait for Metacity"): machine.wait_until_succeeds("pgrep metacity") diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 9e9fdc9bdb9f..82d3bf3e08ce 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -83,8 +83,7 @@ machine.wait_for_file("${xauthority}") machine.succeed("xauth merge ${xauthority}") # Check that logging in has given the user ownership of devices - # Change back to /dev/snd/timer after systemd-258.1 - assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") + assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") with subtest("Wait for GNOME Shell"): # correct output should be (true, 'false') diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 0bb2e7061133..4d1b4c71ecd2 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -76,8 +76,7 @@ # wait for alice to be logged in machine.wait_for_unit("default.target", "${user.name}") # check that logging in has given the user ownership of devices - # Change back to /dev/snd/timer after systemd-258.1 - assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") + assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") with subtest("Wait for GNOME Shell"): # correct output should be (true, 'false') diff --git a/nixos/tests/lxqt.nix b/nixos/tests/lxqt.nix index a7b8120016aa..595b6dc3f9ba 100644 --- a/nixos/tests/lxqt.nix +++ b/nixos/tests/lxqt.nix @@ -42,8 +42,7 @@ machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if LXQt components actually start"): for i in ["openbox", "lxqt-session", "pcmanfm-qt", "lxqt-panel", "lxqt-runner"]: diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix index 81948d5a1ae1..45fd877c1ca4 100644 --- a/nixos/tests/mate.nix +++ b/nixos/tests/mate.nix @@ -41,8 +41,7 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if MATE session components actually start"): machine.wait_until_succeeds("pgrep marco") diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 3e24bff88527..336f84a061b4 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -72,8 +72,7 @@ machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if Pantheon components actually start"): pgrep_list = [ diff --git a/nixos/tests/xfce-wayland.nix b/nixos/tests/xfce-wayland.nix index 061efa002327..17defe1b4d26 100644 --- a/nixos/tests/xfce-wayland.nix +++ b/nixos/tests/xfce-wayland.nix @@ -39,8 +39,7 @@ machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if Xfce components actually start"): for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]: diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index cdd1f3ffc676..0b88fb18870f 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -38,8 +38,7 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - # Change back to /dev/snd/timer after systemd-258.1 - machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") with subtest("Check if Xfce components actually start"): machine.wait_for_window("xfce4-panel") From ab8f45a27939f00179a02ea18e98be5f848c7bc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 12:32:17 +0000 Subject: [PATCH 0387/2279] unbound-full: 1.24.0 -> 1.24.1 --- pkgs/by-name/un/unbound/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix index 99fcaf1497c4..62657e2f4c36 100644 --- a/pkgs/by-name/un/unbound/package.nix +++ b/pkgs/by-name/un/unbound/package.nix @@ -56,13 +56,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "unbound"; tag = "release-${finalAttrs.version}"; - hash = "sha256-M5gn18HTgcpqsOZGtxPoQbQd5tPW3T4r0YeMK5Mwgls="; + hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ="; }; outputs = [ From efecb81e39dcca3a9fe6f253a2a9b461e770d593 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 12:36:44 -0300 Subject: [PATCH 0388/2279] megahit: fix build with cmake4 --- pkgs/by-name/me/megahit/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/me/megahit/package.nix b/pkgs/by-name/me/megahit/package.nix index 84b8953a0556..ea0266471781 100644 --- a/pkgs/by-name/me/megahit/package.nix +++ b/pkgs/by-name/me/megahit/package.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DSTATIC_BUILD=ON" ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; From 8810bf80eff2d67044e55c2380f55ae1675316bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 Oct 2025 17:53:46 +0000 Subject: [PATCH 0389/2279] buildah-unwrapped: 1.41.5 -> 1.42.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 836faaa40936..73dd15593abc 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "buildah"; - version = "1.41.5"; + version = "1.42.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-NQ5nCU1uiw3SzPMo2rH4+GnAIbIzM9O0bJaXJg/rfZM="; + hash = "sha256-40SYqPo4BUer0Mvw8ts8uPNAlfec8ma/TYRkvyFQczw="; }; outputs = [ From b2d7f65d5dd98e7464f6311a9081ee9435e0df9a Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:36:33 +0000 Subject: [PATCH 0390/2279] python3Packages.google-api-core: 2.25.1 -> 2.26.0 https://github.com/googleapis/python-api-core/releases/tag/v2.26.0 https://github.com/googleapis/python-api-core/compare/v2.25.1...v2.26.0 --- pkgs/development/python-modules/google-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 1f30f82d7f07..7cb99ac62011 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.25.1"; + version = "2.26.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-api-core"; tag = "v${version}"; - hash = "sha256-lh4t03upQQxY2KGwucXfEeNvqVVXlZ6hjR/e47imetk="; + hash = "sha256-BA2OWzr0sH77YUkFqMsGJQppqbG3R4sQ2kepicdzejE="; }; build-system = [ setuptools ]; From 8fe861fc3eac02d86ae7c01cafb4cec0971492f6 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:37:42 +0000 Subject: [PATCH 0391/2279] python3Packages.google-api-python-client: 2.177.0 -> 2.185.0 https://github.com/googleapis/google-api-python-client/releases/tag/v2.185.0 https://github.com/googleapis/google-api-python-client/compare/v2.177.0...v2.185.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 304595531a24..4023e32564de 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.177.0"; + version = "2.185.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-api-python-client"; tag = "v${version}"; - hash = "sha256-CEjbUIXtG5z1/28DsNCm/npMSd/+DyY5PMJHm9XDe2M="; + hash = "sha256-y6MfDwA1CKsKmXH9NIqFtKIz8vk5XC6d91scrTI4xdY="; }; build-system = [ setuptools ]; From e9f4cabab6762b9db48913ebb0480b7f93f9ce55 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:37:44 +0000 Subject: [PATCH 0392/2279] python3Packages.google-auth: 2.40.3 -> 2.41.1 https://github.com/googleapis/google-auth-library-python/releases/tag/v2.41.1 https://github.com/googleapis/google-auth-library-python/compare/v2.40.3...v2.41.1 --- pkgs/development/python-modules/google-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index e0389c8f8f41..d9e435c32486 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.40.3"; + version = "2.41.1"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-auth-library-python"; tag = "v${version}"; - hash = "sha256-X1HTh24oos2GUxB9DDLtNH7BsBRLD0S/ngjsDAQYvhI="; + hash = "sha256-EPiI3cJy+NkT1oyKZJKcvQwAb64UQZDSNfWorZjIew8="; }; build-system = [ setuptools ]; From 5995cafe44d94bd0c13816f97206f7aa85716318 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:38:01 +0000 Subject: [PATCH 0393/2279] python3Packages.google-cloud-storage: 3.3.0 -> 3.4.1 https://github.com/googleapis/python-storage/releases/tag/v3.4.1 https://github.com/googleapis/python-storage/compare/v3.3.0...v3.4.1 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 04b83a3d15e6..521c9769bc7d 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-storage"; tag = "v${version}"; - hash = "sha256-I0wC/BV8fJr3JW1nyq2TPJZlZaT4+h2lJBdGTttSzRo="; + hash = "sha256-fLS1rrblNKm8dTG/Srg6IfcEjeZCS2QGNwW6ZXIo7UQ="; }; pythonRelaxDeps = [ "google-auth" ]; From 75af20ac307aaed48e7164118e4213b79b6feea9 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:38:17 +0000 Subject: [PATCH 0394/2279] python3Packages.google-cloud-iam: 2.19.0 -> 2.20.0 https://github.com/googleapis/google-cloud-python/releases/tag/google-cloud-iam-v2.20.0 https://github.com/googleapis/google-cloud-python/compare/google-cloud-iam-v2.19.0...google-cloud-iam-v2.20.0 --- pkgs/development/python-modules/google-cloud-iam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index a519eee42309..48b80a05fefd 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-iam-v${version}"; - hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4="; + hash = "sha256-ICSBKEqNaXZZopGDwB0pkt06xN0gnsTBUA/HCQVxQTU="; }; sourceRoot = "${src.name}/packages/google-cloud-iam"; From 3a2333717bb383502170fdf44f096c487aa51b3b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:39:33 +0000 Subject: [PATCH 0395/2279] python3Packages.google-cloud-kms: 3.4.1 -> 3.7.0 https://github.com/googleapis/google-cloud-python/releases/tag/google-cloud-kms-v3.7.0 https://github.com/googleapis/google-cloud-python/compare/google-cloud-kms-v3.4.1...google-cloud-kms-v3.7.0 --- pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 508a28a22356..f0aa00153a76 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "3.4.1"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; tag = "google-cloud-kms-v${version}"; - hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw="; + hash = "sha256-/ZBpSn6bZpzFgIg3LmfV7xMowh9Gpslw0fcN021jAow="; }; sourceRoot = "${src.name}/packages/google-cloud-kms"; From 1245cf8be729481d62f87524e5f0ce17c482e40e Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:56:44 +0200 Subject: [PATCH 0396/2279] grpc: 1.75.1 -> 1.76.0 --- pkgs/by-name/gr/grpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 0e71063ec0b0..2763b6a619f6 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -25,7 +25,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.75.1"; # N.B: if you change this, please update: + version = "1.76.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; tag = "v${version}"; - hash = "sha256-SnKK52VLO4MM/ftfmzRV/LeLfOucdIyHMyWk6EKRfvM="; + hash = "sha256-f25ccZC0pJw00ETgxBtXU6+0OnlJsV7zXjK/ayiCIJY="; fetchSubmodules = true; }; From 85637c75d56db5fae18afd3af2c0eb5bff57a7d2 Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:56:49 +0200 Subject: [PATCH 0397/2279] python3Packages.grpcio: 1.75.1 -> 1.76.0 --- pkgs/development/python-modules/grpcio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index f8d67db96e64..e88a79dd7f12 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -19,14 +19,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.75.1"; + version = "1.76.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PoHYns6ZuaziOmkWiAusphPAOnmZJa+yhXiH76ixs9I="; + hash = "sha256-e+eDiNbaGiXA1exQZSPbWLGL4i2cN9jToywIvkmHvXM="; }; outputs = [ From ed3bcc15f6b91eb9829401fd72a3dc2cf07aab15 Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:56:52 +0200 Subject: [PATCH 0398/2279] python3Packages.grpcio-channelz: 1.75.1 -> 1.76.0 --- pkgs/development/python-modules/grpcio-channelz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 012af3877b96..04c7b91a6dc3 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.75.1"; + version = "1.76.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-4MqgbU3j62LT/cVOXJ3JADqj7iHpxQ9dNTiuqFTSdvI="; + hash = "sha256-KrFe97IlKpujHfUAu+KVzlMQqLAepvbWehcXLZFKQag="; }; build-system = [ setuptools ]; From d0b424c8e6ab1b49c13a1d48fd4bd9463c914a17 Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:56:54 +0200 Subject: [PATCH 0399/2279] python3Packages.grpcio-health-checking: 1.75.1 -> 1.76.0 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index fe84d0817569..461484ac9645 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.75.1"; + version = "1.76.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-iI6huGrWXALIVHSG6VJjVi4UU2Pj1UAPUkT38sUyPmM="; + hash = "sha256-t6mddAlrOrOlmYf8AjdAaOHBgKNS6NH3nxDlojcnCY0="; }; propagatedBuildInputs = [ From 4170cee767f381f59421f6f39f72035a39b04733 Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:56:57 +0200 Subject: [PATCH 0400/2279] python3Packages.grpcio-reflection: 1.75.1 -> 1.76.0 --- pkgs/development/python-modules/grpcio-reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 4b6290afd791..5374f5da493d 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.75.1"; + version = "1.76.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-K+PyC3uT5uaRoLx2H9fpmWqUC0yWxo9spPf7xHw/S2Q="; + hash = "sha256-4OfkmSHC7pUeXd/wvbrL0awacIiL62HVZ/PQG3md7LE="; }; build-system = [ setuptools ]; From 67b690c8850dac5101b8e352fd8264165e234a5a Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:57:00 +0200 Subject: [PATCH 0401/2279] python3Packages.grpcio-status: 1.75.1 -> 1.76.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 51294793b639..f7d888c7e22d 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.75.1"; + version = "1.76.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-gWKvohgzoghckQicw5WtiA+sE3ih1gIz2XZkntcky/g="; + hash = "sha256-Jfy/7HTBXRoctdo/q47pZyhS3Balqe61uvfXqZUpQ80="; }; postPatch = '' From 7031e935ea1dc41f55b6c8cdc81b1ecf8766117d Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:57:02 +0200 Subject: [PATCH 0402/2279] python3Packages.grpcio-testing: 1.75.1 -> 1.76.0 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 6edd72430bfa..7a5d7e0ef693 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.75.1"; + version = "1.76.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-RUF4XosbetXbFVEyGsFE3WOM/z0fsC+St9ZRHFhLmKg="; + hash = "sha256-loQmPvqyo9xRFBeDOx5qB1hZfic6Ibbb8XwXAizvfCQ="; }; postPatch = '' From 27daa6f89a153851c9e7d2d0b31b1d8388457350 Mon Sep 17 00:00:00 2001 From: scraptux Date: Wed, 22 Oct 2025 21:57:06 +0200 Subject: [PATCH 0403/2279] python3Packages.grpcio-tools: 1.75.1 -> 1.76.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 254f2f94b5ed..95baa1a69e6e 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.75.1"; + version = "1.76.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-u3iWDPPViUHh/scMvazPJVkYvu0Tw0ESppFabY+s69E="; + hash = "sha256-zoAWm15q3z6DAvPrtssMOp8ICJEzq8pLdq1n91H1rYg="; }; outputs = [ From eb9864bdd0ff8bced2f8d5b9da9d0af479c5b8d6 Mon Sep 17 00:00:00 2001 From: gileri Date: Wed, 15 Oct 2025 20:02:10 +0200 Subject: [PATCH 0404/2279] opensoldat: unstable-2022-07-02 -> unstable-2025-10-21 --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/by-name/op/opensoldat/package.nix | 41 +++++++++++++++----------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1d469c87dc7d..433e427645f0 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -217,6 +217,8 @@ - The main binary of `tomlq` has been renamed from `tomlq` to `tq`. +- `opensoldat` binaries and user configuration directory names have been prefixed by 'open', becoming opensoldat and opensoldatserver. Configuration will be moved automatically before launch when possible. + - `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped. This introduces some backwards‐incompatible changes; see the NEWS for details. NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix index 76f713be4c9e..c31f93e4354f 100644 --- a/pkgs/by-name/op/opensoldat/package.nix +++ b/pkgs/by-name/op/opensoldat/package.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, fpc, - zip, makeWrapper, SDL2, freetype, @@ -13,30 +13,31 @@ xorg, autoPatchelfHook, cmake, + python3, }: let base = stdenv.mkDerivation rec { pname = "opensoldat-base"; - version = "unstable-2021-09-05"; + version = "unstable-2025-10-16"; src = fetchFromGitHub { name = "base"; owner = "opensoldat"; repo = "base"; - rev = "6c74d768d511663e026e015dde788006c74406b5"; - sha256 = "175gmkdccy8rnkd95h2zqldqfydyji1hfby8b1qbnl8wz4dh08mz"; + rev = "5b6e5bef23f5c0d58fb1d4d887b9b94ebcf799b4"; + sha256 = "sha256-k3P4xSO7DgXn6EzDqlo+RHHTuMDPNvG5y+2iXqguh/M="; }; - nativeBuildInputs = [ zip ]; + nativeBuildInputs = [ python3 ]; buildPhase = '' - sh create_smod.sh + python create_smod.py ''; installPhase = '' - install -Dm644 soldat.smod -t $out/share/soldat - install -Dm644 client/play-regular.ttf -t $out/share/soldat + install -Dm644 soldat.smod -t $out/share/opensoldat + install -Dm644 play-regular.ttf -t $out/share/opensoldat ''; meta = with lib; { @@ -51,14 +52,14 @@ in stdenv.mkDerivation rec { pname = "opensoldat"; - version = "unstable-2022-07-02"; + version = "unstable-2025-10-21"; src = fetchFromGitHub { name = "opensoldat"; owner = "opensoldat"; repo = "opensoldat"; - rev = "9574f5791b7993067f03d2df03d625908bc3762f"; - sha256 = "0kyxzikd4ngx3nshjw0411x61zqq1b7l01lxw41rlcy4nad3r0vi"; + rev = "220468f558f6932ba1dc180a9ef84913d07ab324"; + sha256 = "sha256-BnTLuc/wucFNKh0jnVggpHNvLj/1kqL7i7fF7ORiIZA="; }; nativeBuildInputs = [ @@ -84,20 +85,24 @@ stdenv.mkDerivation rec { # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook runtimeDependencies = [ xorg.libX11 ]; - # make sure soldat{,server} find their game archive, + # make sure opensoldat{,server} find their game archive, # let them write their state and configuration files # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless # the user specifies otherwise. - # TODO(@sternenseemann): rename config dir to opensoldat + # Add 'open' prefix to configuration directories postInstall = '' - for p in $out/bin/soldatserver $out/bin/soldat; do - configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")" + for p in soldatserver soldat; do + configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/opensoldat/open$p" + oldConfigDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$p" - wrapProgram "$p" \ - --run "mkdir -p \"$configDir\"" \ + wrapProgram $out/bin/open$p \ + --run "mkdir -p \"''${XDG_CONFIG_HOME:-\$HOME/.config}/opensoldat\"" \ + --run "[ -d \"$oldConfigDir\" ] && [ -d \"$configDir\" ] && echo Please migrate \"$oldConfigDir\" to \"$configDir\" manually. && exit 1" \ + --run "[ -d \"$oldConfigDir\" ] && [ ! -d \"$configDir\" ] && mv \"$oldConfigDir\" \"$configDir\"" \ + --run "mkdir -p \"$configDir\"; rmdir \"$oldConfigDir\" 2>/dev/null || true" \ --add-flags "-fs_portable 0" \ --add-flags "-fs_userpath \"$configDir\"" \ - --add-flags "-fs_basepath \"${base}/share/soldat\"" + --add-flags "-fs_basepath \"${base}/share/opensoldat\"" done ''; From 0dabfc547c5616a09426ef48b6b610e9585777ad Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 22 Oct 2025 18:26:35 -0300 Subject: [PATCH 0405/2279] mkclean: fix build with cmake4 --- pkgs/by-name/mk/mkclean/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/mk/mkclean/package.nix b/pkgs/by-name/mk/mkclean/package.nix index 13e6da9a0945..cfda95fc3c90 100644 --- a/pkgs/by-name/mk/mkclean/package.nix +++ b/pkgs/by-name/mk/mkclean/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.2)" "cmake_minimum_required(VERSION 3.10)" + ''; + postInstall = '' install -Dm0755 mkclean/mkclean $out/bin/mkclean ''; From 061b844928aaf29682025ee6653e6a2f1e82a89c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 10 Oct 2025 21:46:51 -0400 Subject: [PATCH 0406/2279] openssh: split out dev and man outputs Splitting `dev` allows to reduce the closure size for static build from 150MB to 75MB. --- pkgs/tools/networking/openssh/common.nix | 8 +++++++- pkgs/tools/networking/openssh/copyid.nix | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 253f1aaaccc5..e06d2201a680 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -51,6 +51,12 @@ assert withFIDO -> withSecurityKey; stdenv.mkDerivation (finalAttrs: { inherit pname version src; + outputs = [ + "out" + "dev" + "man" + ]; + patches = [ # Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes, # so the session 'bash' will receive the proper locale archive, and thus process @@ -221,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: { # Install ssh-copy-id, it's very useful. cp contrib/ssh-copy-id $out/bin/ chmod +x $out/bin/ssh-copy-id - cp contrib/ssh-copy-id.1 $out/share/man/man1/ + cp contrib/ssh-copy-id.1 $man/share/man/man1/ ''; installTargets = [ "install-nokeys" ]; diff --git a/pkgs/tools/networking/openssh/copyid.nix b/pkgs/tools/networking/openssh/copyid.nix index 55da4a5c701c..e8d6f4b3f388 100644 --- a/pkgs/tools/networking/openssh/copyid.nix +++ b/pkgs/tools/networking/openssh/copyid.nix @@ -6,6 +6,10 @@ runCommand "ssh-copy-id-${openssh.version}" { + outputs = [ + "out" + "man" + ]; meta = openssh.meta // { description = "Tool to copy SSH public keys to a remote machine"; priority = (openssh.meta.priority or lib.meta.defaultPriority) - 1; @@ -13,5 +17,5 @@ runCommand "ssh-copy-id-${openssh.version}" } '' install -Dm 755 {${openssh},$out}/bin/ssh-copy-id - install -Dm 644 {${openssh},$out}/share/man/man1/ssh-copy-id.1.gz + install -Dm 644 {${openssh.man},$man}/share/man/man1/ssh-copy-id.1.gz '' From 4a6c158fd6ca4a6bd57d0c91ddf6470a85c8059f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 10 Oct 2025 21:53:13 -0400 Subject: [PATCH 0407/2279] openssh: --replace -> --replace-fail --- pkgs/tools/networking/openssh/common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index e06d2201a680..052dbc7ba215 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { # On Hydra this makes installation fail (sometimes?), # and nix store doesn't allow such fancy permission bits anyway. '' - substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' + substituteInPlace Makefile.in --replace-fail '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; strictDeps = true; @@ -186,13 +186,13 @@ stdenv.mkDerivation (finalAttrs: { # explicitly enable the PermitUserEnvironment feature substituteInPlace regress/test-exec.sh \ - --replace \ + --replace-fail \ 'cat << EOF > $OBJ/sshd_config' \ $'cat << EOF > $OBJ/sshd_config\n\tPermitUserEnvironment yes' # some tests want to use files under /bin as example files for f in regress/sftp-cmds.sh regress/forwarding.sh; do - substituteInPlace $f --replace '/bin' "$(dirname $(type -p ls))" + substituteInPlace $f --replace-fail '/bin' "$(dirname $(type -p ls))" done # set up NIX_REDIRECTS for direct invocations @@ -205,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: { '' # The extra tests check PKCS#11 interactions, which softhsm emulates with software only substituteInPlace regress/test-exec.sh \ - --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so + --replace-fail /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so '' ); # integration tests hard to get working on darwin with its shaky From 76e196bc7bdbe5af1c66d4b82903cd4f0a0b74e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 00:35:26 +0000 Subject: [PATCH 0408/2279] libdecor: 0.2.3 -> 0.2.4 --- pkgs/by-name/li/libdecor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix index 1c1d8931ea8d..4e1c2e3e8819 100644 --- a/pkgs/by-name/li/libdecor/package.nix +++ b/pkgs/by-name/li/libdecor/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libdecor"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libdecor"; repo = "libdecor"; rev = version; - hash = "sha256-7h/Xfw8chzRmmWKcOyIB7KSL+ZzNGDpElfE22ReoJqY="; + hash = "sha256-l0MmNpC+449BaluynbzG5d0/v57F5rltOIBzBagkYbc="; }; outputs = [ From 93ab3cc39eef81825ec9d060126b2d06048bf71b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Oct 2025 00:36:52 +0000 Subject: [PATCH 0409/2279] doxygen: 1.14.0 -> 1.15.0 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 801e6592d030..5c2a0d47848d 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doxygen"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-d90fIP8rDQ30fY1vF3wAPlIa8xrSEOdHTpPjYnduZdI="; + hash = "sha256-HbUAIfkfP0Tvb2NLSerTSL8A+8Ox2thgGL2/zGLkZdc="; }; # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 From bdf830ff5de86bae0556d2c9050673c8ff497136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:12:57 -0700 Subject: [PATCH 0410/2279] python3Packages.coverage: 7.10.7 -> 7.11.0 Diff: https://github.com/nedbat/coveragepy/compare/7.10.7...7.11.0 Changelog: https://github.com/nedbat/coveragepy/blob/7.11.0/CHANGES.rst --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 7dd1e7d6fa5f..53374790cedd 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.10.7"; + version = "7.11.0"; pyproject = true; src = fetchFromGitHub { owner = "nedbat"; repo = "coveragepy"; tag = version; - hash = "sha256-u62kfYE1yk/cIfyklWJz8vehPe9PL9uN+03bZZraw/U="; + hash = "sha256-l4JeGgy+WAN6NHz0ZkPYqiNw0k5VxaX32Vcp11sylgU="; }; build-system = [ setuptools ]; From 60db182b41c3085a1326f70fd517edf79be38576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:21:29 -0700 Subject: [PATCH 0411/2279] python3Packages.changelog-chug: don't test coverage --- pkgs/development/python-modules/changelog-chug/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/changelog-chug/default.nix b/pkgs/development/python-modules/changelog-chug/default.nix index a13435f0a247..c4ffe1eb7625 100644 --- a/pkgs/development/python-modules/changelog-chug/default.nix +++ b/pkgs/development/python-modules/changelog-chug/default.nix @@ -5,7 +5,6 @@ docutils, semver, setuptools, - coverage, testscenarios, testtools, unittestCheckHook, @@ -39,7 +38,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - coverage testscenarios testtools unittestCheckHook From 18d2433f218e6208046994752541aa717e36c821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:29:45 -0700 Subject: [PATCH 0412/2279] python3Packages.bokeh: don't test coverage --- pkgs/development/python-modules/bokeh/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 62f0badbdc7b..73474c854bb0 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -21,7 +21,6 @@ channels, click, colorcet, - coverage, firefox, geckodriver, isort, @@ -81,7 +80,6 @@ buildPythonPackage rec { channels click colorcet - coverage firefox geckodriver isort From aec115f36cb3fd46251004442a0706b1703b1e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:32:19 -0700 Subject: [PATCH 0413/2279] python3Packages.versioningit: don't test coverage --- pkgs/development/python-modules/versioningit/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 42cf3a141c0d..802614d21df8 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -5,7 +5,6 @@ fetchPypi, packaging, tomli, - coverage, pytestCheckHook, build, hatchling, @@ -27,6 +26,11 @@ buildPythonPackage rec { hash = "sha256-uRrX1z5z0hIg5pVA8gIT8rcpofmzXATp4Tfq8o0iFNo="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace-fail "ignore:.*No source for code:coverage.exceptions.CoverageWarning" "" + ''; + build-system = [ hatchling ]; dependencies = [ @@ -35,7 +39,6 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ - coverage pytestCheckHook build hatchling From ff0a73a3f6b611d57bb0e7e426dbfa5b65bab9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:36:46 -0700 Subject: [PATCH 0414/2279] python3Packages.pyhcl: don't test coverage --- .../python-modules/pyhcl/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index d947eb84944d..101e639cbde7 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -1,25 +1,23 @@ { buildPythonPackage, fetchFromGitHub, - isPy3k, lib, # pythonPackages - coverage, - pytest, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pyhcl"; version = "0.4.5"; - format = "setuptools"; - disabled = !isPy3k; + pyproject = true; src = fetchFromGitHub { owner = "virtuald"; repo = "pyhcl"; - rev = version; - sha256 = "sha256-vF40xEahs98G0lIC6XIl3eJHIuai2xTAeshUjiKN/BY="; + tag = version; + hash = "sha256-vF40xEahs98G0lIC6XIl3eJHIuai2xTAeshUjiKN/BY="; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 @@ -27,15 +25,11 @@ buildPythonPackage rec { echo '__version__ = "${version}"' > ./src/hcl/version.py ''; - nativeCheckInputs = [ - coverage - pytest - ]; + build-system = [ setuptools ]; - # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/tests/run_tests.sh#L4 - checkPhase = '' - coverage run --source hcl -m pytest tests - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "HCL is a configuration language. pyhcl is a python parser for it"; From 1b1fcda61c21d1c429f9136435fe9de37f84b3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:39:26 -0700 Subject: [PATCH 0415/2279] python3Packages.home-assistant-chip-wheels: don't depend on coverage --- .../python-modules/home-assistant-chip-wheels/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index a856179eee7a..7b45a2000ec5 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -9,7 +9,6 @@ click, colorama, coloredlogs, - coverage, cryptography, debugpy, diskcache, @@ -217,7 +216,6 @@ stdenv.mkDerivation rec { build colorama coloredlogs - coverage click cryptography debugpy From a416b7175354a57d4f1f2801ef3efa1cfeb0e213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:45:11 -0700 Subject: [PATCH 0416/2279] python3Packages.genson: remove ununsed argument --- pkgs/development/python-modules/genson/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/genson/default.nix b/pkgs/development/python-modules/genson/default.nix index 40643f85e07b..c4febd74c4f3 100644 --- a/pkgs/development/python-modules/genson/default.nix +++ b/pkgs/development/python-modules/genson/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - coverage, fetchPypi, jsonschema, lib, From 378fdb740ebec8cca9bd7ebb630bc746eb4c4803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 20:46:46 -0700 Subject: [PATCH 0417/2279] python3Packages.wandb: don't test coverage --- pkgs/development/python-modules/wandb/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index d673a96face7..9e81d3601b94 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -44,7 +44,6 @@ bokeh, boto3, cloudpickle, - coverage, flask, google-cloud-artifact-registry, google-cloud-compute, @@ -228,7 +227,6 @@ buildPythonPackage rec { bokeh boto3 cloudpickle - coverage flask google-cloud-artifact-registry google-cloud-compute From a9e0b7444e124fe795e1faa4a90d916301465ebe Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 20 Oct 2025 12:48:21 -0300 Subject: [PATCH 0418/2279] traverso: 0.49.6 -> 0-unstable-2024-09-28 --- pkgs/by-name/tr/traverso/package.nix | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/tr/traverso/package.nix b/pkgs/by-name/tr/traverso/package.nix index c554ac5683c9..d17f129eed4f 100644 --- a/pkgs/by-name/tr/traverso/package.nix +++ b/pkgs/by-name/tr/traverso/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + fetchgit, cmake, pkg-config, alsa-lib, @@ -15,24 +15,26 @@ libsndfile, libvorbis, portaudio, + qt6, wavpack, - libsForQt5, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "traverso"; - version = "0.49.6"; + version = "0-unstable-2024-09-28"; - src = fetchurl { - url = "https://traverso-daw.org/traverso-${finalAttrs.version}.tar.gz"; - sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; + src = fetchgit { + url = "https://git.savannah.nongnu.org/git/traverso.git"; + rev = "f34717623a8d19dd7c04d9604ef4468734140abc"; + hash = "sha256-eobQFJohndwQjXRXBAehkTWS9jR/1bQOjrOF1XJN5L4="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; - buildInputs = [ alsa-lib fftw @@ -45,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libsndfile.dev libvorbis portaudio - libsForQt5.qtbase + qt6.qtbase wavpack ]; @@ -56,17 +58,16 @@ stdenv.mkDerivation (finalAttrs: { "-DWANT_LV2=0" ]; - hardeningDisable = [ "format" ]; - meta = { description = "Cross-platform multitrack audio recording and audio editing suite"; mainProgram = "traverso"; - homepage = "https://traverso-daw.org/"; + homepage = "https://savannah.nongnu.org/projects/traverso"; license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; maintainers = with lib.maintainers; [ coconnor ]; }; -}) +} From b9359c7eee4793ca769ce6f6236b446453893d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Oct 2025 21:27:49 -0700 Subject: [PATCH 0419/2279] python3Packages.typer: don't depend on coverage --- pkgs/development/python-modules/typer/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index c8ee4e01a9ef..e8f4a22ca4fd 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -16,7 +16,6 @@ shellingham, # tests - coverage, pytest-xdist, pytestCheckHook, writableTmpDirAsHomeHook, @@ -38,6 +37,13 @@ buildPythonPackage rec { hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44="; }; + postPatch = '' + for f in $(find tests -type f -print); do + # replace `sys.executable -m coverage run` with `sys.executable` + sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f" + done + ''; + env.TIANGOLO_BUILD_PACKAGE = package; build-system = [ pdm-backend ]; @@ -60,7 +66,6 @@ buildPythonPackage rec { doCheck = package == "typer"; # tests expect standard dependencies nativeCheckInputs = [ - coverage # execs coverage in tests pytest-xdist pytestCheckHook writableTmpDirAsHomeHook From 5c98215bcdf90938fe93990247a3bfb23efd49b9 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 22 Oct 2025 21:59:41 -0700 Subject: [PATCH 0420/2279] openssh: fix PKCS#11 tests instead of disabling softhsm This is PRed upstream. While we usually do not apply patches to OpenSSH itself prior to them being merged, this patch simply affects the tests and lets us re-enable softhsm support. See: https://github.com/NixOS/nixpkgs/issues/453782 See: https://github.com/openssh/openssh-portable/pull/602 --- pkgs/tools/networking/openssh/common.nix | 21 ++++---- .../networking/openssh/fix_pkcs11_tests.patch | 51 +++++++++++++++++++ 2 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/networking/openssh/fix_pkcs11_tests.patch diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 052dbc7ba215..1a4cd2f9e9fe 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -65,6 +65,10 @@ stdenv.mkDerivation (finalAttrs: { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch + + # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and + # https://github.com/openssh/openssh-portable/pull/602 + ./fix_pkcs11_tests.patch ] ++ extraPatches; @@ -148,8 +152,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname - # TODO: softhsm is currently breaking the tests; see #453782 - ++ lib.optional (false && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm; + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm; preCheck = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( '' @@ -198,15 +201,11 @@ stdenv.mkDerivation (finalAttrs: { # set up NIX_REDIRECTS for direct invocations set -a; source ~/.ssh/environment.base; set +a '' - # See softhsm in nativeCheckInputs above. - + - lib.optionalString - (!finalAttrs.doCheck && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) - '' - # The extra tests check PKCS#11 interactions, which softhsm emulates with software only - substituteInPlace regress/test-exec.sh \ - --replace-fail /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so - '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) '' + # The extra tests check PKCS#11 interactions, which softhsm emulates with software only + substituteInPlace regress/test-exec.sh \ + --replace-fail /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so + '' ); # integration tests hard to get working on darwin with its shaky # sandbox diff --git a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch new file mode 100644 index 000000000000..c4459c8ee0e1 --- /dev/null +++ b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch @@ -0,0 +1,51 @@ +From 642218d8dd1ec79fa0c8db491fd46faa3ab026f7 Mon Sep 17 00:00:00 2001 +From: Morgan Jones +Date: Tue, 21 Oct 2025 01:15:55 -0700 +Subject: [PATCH 1/2] test-exec: use -P for allowed PKCS#11 library when + starting agent + +If we just loaded a PKCS#11 library, we should allow it so the +regression test can run. + +Fixes: https://github.com/NixOS/nixpkgs/issues/453782 +--- + regress/test-exec.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/regress/test-exec.sh b/regress/test-exec.sh +index 5b0c91f3faa..30b3da8709d 100644 +--- a/regress/test-exec.sh ++++ b/regress/test-exec.sh +@@ -1023,6 +1023,9 @@ p11_ssh_add() { + + start_ssh_agent() { + EXTRA_AGENT_ARGS="$1" ++ if [ "$PKCS11_OK" = "yes" ]; then ++ EXTRA_AGENT_ARGS="${EXTRA_AGENT_ARGS} -P${TEST_SSH_PKCS11}" ++ fi + SSH_AUTH_SOCK="$OBJ/agent.sock" + export SSH_AUTH_SOCK + rm -f $SSH_AUTH_SOCK $OBJ/agent.log + +From 5ae735db7d81b38ee059d63a4011291cb4456aef Mon Sep 17 00:00:00 2001 +From: Morgan Jones +Date: Tue, 21 Oct 2025 01:50:23 -0700 +Subject: [PATCH 2/2] test-exec: give more time for ssh-agent to start + +--- + regress/test-exec.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/regress/test-exec.sh b/regress/test-exec.sh +index 30b3da8709d..56a7653b386 100644 +--- a/regress/test-exec.sh ++++ b/regress/test-exec.sh +@@ -1034,7 +1034,7 @@ start_ssh_agent() { + > $OBJ/agent.log 2>&1 & + AGENT_PID=$! + trap "kill $AGENT_PID" EXIT +- for x in 0 1 2 3 4 ; do ++ for x in $(seq 15); do + # Give it a chance to start + ${SSHADD} -l > /dev/null 2>&1 + r=$? From d2975943120a5ac1fe8bd4d52119463e0c46e110 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 21:22:50 +0900 Subject: [PATCH 0421/2279] vital: cleanup, add desktop item --- pkgs/by-name/vi/vital/package.nix | 38 ++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index e52b265c8bb7..1cf7b72c8a62 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -2,9 +2,9 @@ lib, stdenv, fetchzip, + fetchurl, autoPatchelfHook, makeBinaryWrapper, - alsa-lib, libjack2, curl, @@ -12,8 +12,15 @@ libGL, freetype, zenity, + makeDesktopItem, + copyDesktopItems, }: - +let + icon = fetchurl { + url = "https://vital.audio/images/apple_touch_icon.png"; + hash = "sha256-NZ/AQ2gjBXUPUj3ITbowD7HuxRmEDuATOWidLqLNrww="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "vital"; version = "1.5.5"; @@ -24,10 +31,25 @@ stdenv.mkDerivation (finalAttrs: { }/VitalInstaller.zip"; hash = "sha256-hCwXSUiBB0YpQ1oN6adLprwAoel6f72tBG5fEb61OCI="; }; + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "vital"; + desktopName = "Vital"; + comment = "Spectral warping wavetable synth"; + icon = "Vital"; + exec = "Vital"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; nativeBuildInputs = [ autoPatchelfHook makeBinaryWrapper + copyDesktopItems ]; buildInputs = [ @@ -46,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall + install -Dm444 ${icon} $out/share/pixmaps/Vital.png + # copy each output to its destination (individually) mkdir -p $out/{bin,lib/{clap,vst,vst3}} for f in bin/Vital lib/{clap/Vital.clap,vst/Vital.so,vst3/Vital.vst3}; do @@ -68,15 +92,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { description = "Spectral warping wavetable synth"; homepage = "https://vital.audio/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = with licenses; [ - unfree # https://vital.audio/eula/ - ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.unfree; # https://vital.audio/eula/ platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ PowerUser64 ]; + maintainers = with lib.maintainers; [ PowerUser64 ]; mainProgram = "Vital"; }; }) From 46b2761c272fc223cd8ccc1c05a17165fd355240 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 21:23:40 +0900 Subject: [PATCH 0422/2279] vital: add maintainer l1npengtul --- pkgs/by-name/vi/vital/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index 1cf7b72c8a62..1b271c81ad39 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -98,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.unfree; # https://vital.audio/eula/ platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ PowerUser64 ]; + maintainers = with lib.maintainers; [ + PowerUser64 + l1npengtul + ]; mainProgram = "Vital"; }; }) From ac504840a5a53bf3ce2f76512d2e5f750db67572 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 22:15:56 +0900 Subject: [PATCH 0423/2279] jackass: cleanup, add nix-update-script --- pkgs/by-name/ja/jackass/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index de9a4bcaecb7..3b40480a491d 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -5,6 +5,7 @@ pkg-config, vst2-sdk, wine64, + nix-update-script, enableJackAssWine64 ? false, }: @@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - enableParallelBuilding = true; + passthru.updateScript = nix-update-script { }; meta = { description = "VST plugin that provides JACK-MIDI support for VST hosts"; @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { applications. Set enableJackAssWine64 to true to enable this output. ''; homepage = "https://github.com/falkTX/JackAss"; - maintainers = with lib.maintainers; [ PowerUser64 ]; + maintainers = with lib.maintainers; [PowerUser64 ]; license = [ lib.licenses.mit ]; platforms = lib.platforms.linux; }; From 8c7f54b821fe28f138105d565d25d94243069730 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Thu, 23 Oct 2025 22:16:24 +0900 Subject: [PATCH 0424/2279] jackass: add maintainer l1npengtul --- pkgs/by-name/ja/jackass/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 3b40480a491d..99bba6cbcca1 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -52,7 +52,10 @@ stdenv.mkDerivation (finalAttrs: { applications. Set enableJackAssWine64 to true to enable this output. ''; homepage = "https://github.com/falkTX/JackAss"; - maintainers = with lib.maintainers; [PowerUser64 ]; + maintainers = with lib.maintainers; [ + PowerUser64 + l1npengtul + ]; license = [ lib.licenses.mit ]; platforms = lib.platforms.linux; }; From 59728f1432e4290e092defc1f58aff72315d0342 Mon Sep 17 00:00:00 2001 From: jasonxue Date: Thu, 23 Oct 2025 21:28:55 +0800 Subject: [PATCH 0425/2279] mupdf: 1.26.8 -> 1.26.10 --- pkgs/by-name/mu/mupdf/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 1d3b8cea5f99..b370ef2acef1 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -38,17 +38,13 @@ xcbuild, gitUpdater, enableBarcode ? false, - # for passthru.tests cups-filters, zathura, mupdf, }: - assert enablePython -> enableCxx; - let - freeglut-mupdf = freeglut.overrideAttrs (old: rec { pname = "freeglut-mupdf"; version = "3.0.0-r${src.rev}"; @@ -67,16 +63,14 @@ let --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" ''; }); - in - stdenv.mkDerivation rec { - version = "1.26.8"; + version = "1.26.10"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - hash = "sha256-6NJIpmbSOG9KIBTWgLbojeXOn9jIR7DidMvswSTzPMc="; + hash = "sha256-FlPzW9j72XDwVSPv3H+G5B6XKOJWSjKVKW4Dz1mlFDc="; }; patches = [ From e03cf867c32c0fa8ef1a394f415e993d3ce92a28 Mon Sep 17 00:00:00 2001 From: jasonxue Date: Thu, 23 Oct 2025 21:49:03 +0800 Subject: [PATCH 0426/2279] python3Packages.fonttools: 4.59.0 -> 4.60.1 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index f776b814e31b..65f72e01e919 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.59.0"; + version = "4.60.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = "fonttools"; tag = version; - hash = "sha256-f3iedVwwh98XkFzPJ/+XZ2n4pcDXDoPlQki+neGVuXE="; + hash = "sha256-h/JRItD5IHlhNSamxRxk/dvyAKUFayzxHvlW7v4N1s8="; }; build-system = [ From acb533b1391effdd99c156f57365a1b436e43861 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 23 Oct 2025 14:56:46 +0200 Subject: [PATCH 0427/2279] rabbitmq-server: 4.0.9 -> 4.1.4 --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/by-name/ra/rabbitmq-server/package.nix | 24 +++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 093080f04992..77719e4226ab 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -228,6 +228,8 @@ - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream. +- `rabbitmq-server` has been updated from 4.0.9 to 4.1.4. The 4.1.0 release includes breaking changes. For more information read the [changelog of 4.1.0](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v4.1.0) + - `lxde` scope has been removed, and its packages have been moved the top-level. - `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0). diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index 660d517bfe62..4c242a6ed253 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -6,6 +6,7 @@ python3, libxml2, libxslt, + git, xmlto, docbook_xml_dtd_45, docbook_xsl, @@ -21,6 +22,7 @@ glibcLocales, nixosTests, which, + p7zip, }: let @@ -39,14 +41,14 @@ let ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rabbitmq-server"; - version = "4.0.9"; + version = "4.1.4"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { - url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-imBxBn8RQS0jBGfT5KLLLt+fKvyybzLzPZu9DpFOos8="; + url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + hash = "sha256-dqNdrbXSysYUMN+6gMMb9GXKER/mOGXgW6j3iOLHNks="; }; nativeBuildInputs = [ @@ -58,6 +60,7 @@ stdenv.mkDerivation rec { rsync python3 which + p7zip ]; buildInputs = [ @@ -68,6 +71,15 @@ stdenv.mkDerivation rec { glibcLocales ]; + prePatch = '' + # erlang.mk assumes that the elixir lib directory is at the same level as the bin of the elixir binary, + # this is not for the Nixpkgs packaging, so patch this + substituteInPlace erlang.mk \ + --replace-fail \ + "ELIXIR_LIBS ?= $(abspath $(dir $(ELIXIR_BIN))/../lib)" \ + "ELIXIR_LIBS ?= ${beamPackages.elixir}/lib/elixir/lib" + ''; + outputs = [ "out" "man" @@ -129,9 +141,9 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "Implementation of the AMQP messaging protocol"; - changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}"; + changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ samueltardieu ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3525f46c6f9..b95793f20782 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9768,7 +9768,7 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix { - beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_17; }); + beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; }); }; rethinkdb = callPackage ../servers/nosql/rethinkdb { From 38f3ca749f9179d60c812ce57931f72c6e399aed Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 22 Oct 2025 13:50:35 -0500 Subject: [PATCH 0428/2279] various: migrate python3Packages to by-name --- .../aw/aws-mfa/package.nix} | 10 ++++----- .../fu/fusesoc/package.nix} | 15 ++++--------- .../git-annex-remote-googledrive/package.nix} | 15 ++++--------- .../gi/gita/package.nix} | 8 +++---- .../mp/mpy-utils/package.nix} | 8 +++---- .../ne/networkd-notify/package.nix} | 8 +++---- .../pa/pass-git-helper/package.nix} | 15 +++++-------- .../si/silver-platter/package.nix} | 15 ++++--------- pkgs/top-level/all-packages.nix | 22 ------------------- 9 files changed, 30 insertions(+), 86 deletions(-) rename pkgs/{tools/admin/aws-mfa/default.nix => by-name/aw/aws-mfa/package.nix} (86%) rename pkgs/{tools/package-management/fusesoc/default.nix => by-name/fu/fusesoc/package.nix} (78%) rename pkgs/{applications/version-management/git-annex-remote-googledrive/default.nix => by-name/gi/git-annex-remote-googledrive/package.nix} (80%) rename pkgs/{applications/version-management/gita/default.nix => by-name/gi/gita/package.nix} (88%) rename pkgs/{tools/misc/mpy-utils/default.nix => by-name/mp/mpy-utils/package.nix} (82%) rename pkgs/{tools/networking/networkd-notify/default.nix => by-name/ne/networkd-notify/package.nix} (92%) rename pkgs/{applications/version-management/pass-git-helper/default.nix => by-name/pa/pass-git-helper/package.nix} (77%) rename pkgs/{applications/version-management/silver-platter/default.nix => by-name/si/silver-platter/package.nix} (86%) diff --git a/pkgs/tools/admin/aws-mfa/default.nix b/pkgs/by-name/aw/aws-mfa/package.nix similarity index 86% rename from pkgs/tools/admin/aws-mfa/default.nix rename to pkgs/by-name/aw/aws-mfa/package.nix index 69b2a5a56622..722dd410729a 100644 --- a/pkgs/tools/admin/aws-mfa/default.nix +++ b/pkgs/by-name/aw/aws-mfa/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, fetchpatch, - setuptools, - boto3, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "aws-mfa"; version = "0.0.12"; pyproject = true; @@ -28,11 +26,11 @@ buildPythonApplication rec { }) ]; - build-system = [ + build-system = with python3Packages; [ setuptools ]; - dependencies = [ + dependencies = with python3Packages; [ boto3 ]; diff --git a/pkgs/tools/package-management/fusesoc/default.nix b/pkgs/by-name/fu/fusesoc/package.nix similarity index 78% rename from pkgs/tools/package-management/fusesoc/default.nix rename to pkgs/by-name/fu/fusesoc/package.nix index d0bc6297d8fc..edbffdc3f641 100644 --- a/pkgs/tools/package-management/fusesoc/default.nix +++ b/pkgs/by-name/fu/fusesoc/package.nix @@ -1,19 +1,12 @@ { - buildPythonPackage, + python3Packages, fetchPypi, lib, iverilog, verilator, gnumake, - edalize, - fastjsonschema, - pyparsing, - pyyaml, - simplesat, - ipyxact, - setuptools-scm, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "fusesoc"; version = "2.2.1"; format = "setuptools"; @@ -23,9 +16,9 @@ buildPythonPackage rec { hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ edalize fastjsonschema pyparsing diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/by-name/gi/git-annex-remote-googledrive/package.nix similarity index 80% rename from pkgs/applications/version-management/git-annex-remote-googledrive/default.nix rename to pkgs/by-name/gi/git-annex-remote-googledrive/package.nix index 0802769513e3..0911145b906b 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/by-name/gi/git-annex-remote-googledrive/package.nix @@ -1,17 +1,10 @@ { lib, - annexremote, - buildPythonApplication, - drivelib, + python3Packages, fetchPypi, - gitpython, - humanfriendly, - tenacity, - setuptools, - distutils, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; pyproject = true; @@ -21,9 +14,9 @@ buildPythonApplication rec { sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ annexremote drivelib gitpython diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/by-name/gi/gita/package.nix similarity index 88% rename from pkgs/applications/version-management/gita/default.nix rename to pkgs/by-name/gi/gita/package.nix index 9eff4a03486b..58e01af67a53 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/by-name/gi/gita/package.nix @@ -1,13 +1,11 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyyaml, - setuptools, installShellFiles, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "0.16.6.1"; format = "setuptools"; pname = "gita"; @@ -19,7 +17,7 @@ buildPythonApplication rec { owner = "nosarthur"; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ pyyaml setuptools ]; diff --git a/pkgs/tools/misc/mpy-utils/default.nix b/pkgs/by-name/mp/mpy-utils/package.nix similarity index 82% rename from pkgs/tools/misc/mpy-utils/default.nix rename to pkgs/by-name/mp/mpy-utils/package.nix index 03002933433a..a79791bdfdc0 100644 --- a/pkgs/tools/misc/mpy-utils/default.nix +++ b/pkgs/by-name/mp/mpy-utils/package.nix @@ -1,13 +1,11 @@ { stdenv, lib, - buildPythonApplication, + python3Packages, fetchPypi, - fusepy, - pyserial, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mpy-utils"; version = "0.1.13"; format = "setuptools"; @@ -17,7 +15,7 @@ buildPythonApplication rec { hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ fusepy pyserial ]; diff --git a/pkgs/tools/networking/networkd-notify/default.nix b/pkgs/by-name/ne/networkd-notify/package.nix similarity index 92% rename from pkgs/tools/networking/networkd-notify/default.nix rename to pkgs/by-name/ne/networkd-notify/package.nix index 316ef60a5672..cc3a0d7b35b0 100644 --- a/pkgs/tools/networking/networkd-notify/default.nix +++ b/pkgs/by-name/ne/networkd-notify/package.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitLab, - buildPythonApplication, - dbus-python, - pygobject3, + python3Packages, systemd, wirelesstools, wrapGAppsNoGuiHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "networkd-notify"; version = "unstable-2022-11-29"; # There is no setup.py, just a single Python script. @@ -26,7 +24,7 @@ buildPythonApplication rec { wrapGAppsNoGuiHook ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ dbus-python pygobject3 ]; diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/by-name/pa/pass-git-helper/package.nix similarity index 77% rename from pkgs/applications/version-management/pass-git-helper/default.nix rename to pkgs/by-name/pa/pass-git-helper/package.nix index 1267fc3d2516..5552ad500974 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/by-name/pa/pass-git-helper/package.nix @@ -1,15 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyxdg, - pytestCheckHook, - pytest-cov-stub, - pytest-mock, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pass-git-helper"; version = "4.0.0"; pyproject = true; @@ -21,15 +16,15 @@ buildPythonApplication rec { sha256 = "sha256-SAMndgcxBa7wymXbOwRGcoogFfzpFFIZ0tF4NSCXpjw="; }; - build-system = [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = [ pyxdg ]; + dependencies = with python3Packages; [ pyxdg ]; env.HOME = "$TMPDIR"; pythonImportsCheck = [ "passgithelper" ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-cov-stub pytest-mock diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/by-name/si/silver-platter/package.nix similarity index 86% rename from pkgs/applications/version-management/silver-platter/default.nix rename to pkgs/by-name/si/silver-platter/package.nix index e99884ebe5a8..4834f13ab601 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/by-name/si/silver-platter/package.nix @@ -1,24 +1,17 @@ { - buildPythonApplication, + python3Packages, lib, stdenv, fetchFromGitHub, pkg-config, - setuptools, - setuptools-rust, rustPlatform, cargo, rustc, - breezy, - dulwich, - jinja2, libiconv, openssl, - pyyaml, - ruamel-yaml, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "silver-platter"; version = "0.5.20"; pyproject = true; @@ -35,7 +28,7 @@ buildPythonApplication rec { hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM="; }; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ setuptools breezy dulwich @@ -44,7 +37,7 @@ buildPythonApplication rec { ruamel-yaml ]; nativeBuildInputs = [ - setuptools-rust + python3Packages.setuptools-rust rustPlatform.cargoSetupHook cargo rustc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7d72bf5914..21cdad1be483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1083,12 +1083,6 @@ with pkgs; mkosi-full = mkosi.override { withQemu = true; }; - mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; - - networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify { - systemd = pkgs.systemd; - }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -1217,8 +1211,6 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gita = python3Packages.callPackage ../applications/version-management/gita { }; - github-cli = gh; git-annex-metadata-gui = @@ -1236,10 +1228,6 @@ with pkgs; ; }; - git-annex-remote-googledrive = - python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive - { }; - git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; gitRepo = git-repo; @@ -1255,14 +1243,8 @@ with pkgs; ; }; - pass-git-helper = - python3Packages.callPackage ../applications/version-management/pass-git-helper - { }; - qgit = qt6Packages.callPackage ../applications/version-management/qgit { }; - silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { }; - svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { }; @@ -1324,8 +1306,6 @@ with pkgs; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { }; - gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; @@ -1547,8 +1527,6 @@ with pkgs; autoflake = with python3.pkgs; toPythonApplication autoflake; - aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; - azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; # Derivation's result is not used by nixpkgs. Useful for validation for From b68d2ff377d690d2b39ca09b948a74edbf14424c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 23 Oct 2025 14:16:56 -0700 Subject: [PATCH 0429/2279] python3Packages.coq-tools: init at 0.0.36 --- .../python-modules/coq-tools/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/coq-tools/default.nix diff --git a/pkgs/development/python-modules/coq-tools/default.nix b/pkgs/development/python-modules/coq-tools/default.nix new file mode 100644 index 000000000000..b4e1edbfedb0 --- /dev/null +++ b/pkgs/development/python-modules/coq-tools/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "coq-tools"; + version = "0.0.36"; + pyproject = true; + + src = fetchPypi { + pname = "coq_tools"; + inherit version; + hash = "sha256-lZ469FZ19Cy+LdC4ymU4wVWe7ZtPSbYlgmym/ouQSwk="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "coq_tools" ]; + + meta = { + description = "Tools for working with Coq proof assistant"; + homepage = "https://pypi.org/project/coq-tools/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4481f6a38c4e..63b51c3f6fbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3033,6 +3033,8 @@ self: super: with self; { copykitten = callPackage ../development/python-modules/copykitten { }; + coq-tools = callPackage ../development/python-modules/coq-tools { }; + coqpit = callPackage ../development/python-modules/coqpit { }; corallium = callPackage ../development/python-modules/corallium { }; From 48f5334593a84e81f79315cf2dd474333de888d0 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 23 Oct 2025 17:59:13 -0400 Subject: [PATCH 0430/2279] wasilibc: disable libcxxhardeningfast and libcxxhardeningextensive Otherwise libcxx build fails because predefined-macros.txt contains unexpected `_LIBCPP_HARDENING_MODE`. Fixes #454709 --- pkgs/by-name/wa/wasilibc/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix index c5c5204454f7..219d639aadd7 100644 --- a/pkgs/by-name/wa/wasilibc/package.nix +++ b/pkgs/by-name/wa/wasilibc/package.nix @@ -19,6 +19,12 @@ stdenvNoLibc.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + # These flags break pkgsCross.wasi32.llvmPackages.libcxx + hardeningDisable = [ + "libcxxhardeningfast" + "libcxxhardeningextensive" + ]; + outputs = [ "out" "dev" From af65ee8e9cdf62cc62a3ff9c76bb55591fcb01b1 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 23 Oct 2025 20:29:15 -0300 Subject: [PATCH 0431/2279] playbar2: fix build with cmake4 --- pkgs/applications/audio/playbar2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index f698a39440a6..1eff8ab97ee6 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "2.5"; src = fetchFromGitHub { - owner = "audoban"; + owner = "jsmitar"; repo = "PlayBar2"; rev = "v${version}"; sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch"; @@ -31,9 +31,14 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Mpris2 Client for Plasma5"; - homepage = "https://github.com/audoban/PlayBar2"; + homepage = "https://github.com/jsmitar/PlayBar2"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pjones ]; From 1e0016690fa8fdb5af1bb80434df0824323fbc42 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Oct 2025 13:51:47 +1000 Subject: [PATCH 0432/2279] kexec-tools: 2.0.31 -> 2.0.32 https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/diff/?id=v2.0.32&id2=v2.0.31 --- pkgs/by-name/ke/kexec-tools/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 10c401086564..c11eff6bc3fa 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -12,22 +12,17 @@ stdenv.mkDerivation rec { pname = "kexec-tools"; - version = "2.0.31"; + version = "2.0.32"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz" ]; - sha256 = "sha256-io81Ddxm4ckFo6tSWn6bqWyB4E5w72k5ewFVtnuSLDE="; + sha256 = "sha256-j4FCKl/SNiz2ywAbUR5TVWXtDzLC9EUfteto/tZxCl0="; }; patches = [ - # Fix for static builds, will likely be removable on the next release - (fetchpatch { - url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=daa29443819d3045338792b5ba950ed90e79d7a5"; - hash = "sha256-Nq5HIcLY6KSvvrs2sbfE/vovMbleJYElHW9AVRU5rSA="; - }) ] ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isAbiElfv2) [ # Use ELFv2 ABI on ppc64be From 037491370c1df6206b289914ff543ce193993cb1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 24 Oct 2025 10:28:54 +0300 Subject: [PATCH 0433/2279] python3.pkgs.pyglossary: remove unused patch --- .../pyglossary/fix-install-issues.patch | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 pkgs/development/python-modules/pyglossary/fix-install-issues.patch diff --git a/pkgs/development/python-modules/pyglossary/fix-install-issues.patch b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch deleted file mode 100644 index d9e5db1a8111..000000000000 --- a/pkgs/development/python-modules/pyglossary/fix-install-issues.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git c/pyproject.toml w/pyproject.toml -index abfb59ac..8f9c2121 100644 ---- c/pyproject.toml -+++ w/pyproject.toml -@@ -416,11 +416,10 @@ version = "5.1.1" - description = "A tool for converting dictionary files aka glossaries." - readme = "README.md" - authors = [{ name = "Saeed Rasooli", email = "saeed.gnu@gmail.com" }] --license = { text = "GPLv3+" } -+license = "GPL-3.0-or-later" - keywords = ["dictionary", "glossary"] - classifiers = [ - "Development Status :: 5 - Production/Stable", -- "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Operating System :: OS Independent", - "Typing :: Typed", - "Programming Language :: Python :: 3.11", -@@ -430,6 +429,9 @@ classifiers = [ - requires-python = ">= 3.11" - dependencies = [] - -+[project.scripts] -+pyglossary = "pyglossary.ui.main:main" -+ - [project.optional-dependencies] - all = ["PyICU", "lxml", "beautifulsoup4"] - -diff --git c/setup.py w/setup.py -index fd38a060..19df9ee3 100755 ---- c/setup.py -+++ w/setup.py -@@ -8,8 +8,7 @@ import sys - from glob import glob - from os.path import dirname, exists, isdir, join - --from setuptools import setup --from setuptools.command.install import install -+from setuptools import setup, find_packages - - VERSION = "5.1.1" - log = logging.getLogger("root") -@@ -46,29 +45,6 @@ def getPipSafeVersion() -> str: - return VERSION - - --class my_install(install): -- def run(self) -> None: -- install.run(self) -- if os.sep == "/": -- binPath = join(self.install_scripts, "pyglossary") -- log.info(f"creating script file {binPath!r}") -- if not exists(self.install_scripts): -- os.makedirs(self.install_scripts) -- # let it fail on wrong permissions. -- elif not isdir(self.install_scripts): -- raise OSError( -- "installation path already exists " -- f"but is not a directory: {self.install_scripts}", -- ) -- open(binPath, "w", encoding="ascii").write("""#!/usr/bin/env -S python3 -O --import sys --from os.path import dirname --sys.path.insert(0, dirname(__file__)) --from pyglossary.ui.main import main --main()""") -- os.chmod(binPath, 0o755) -- -- - root_data_file_names = [ - "about", - "LICENSE", -@@ -146,19 +122,14 @@ setup( - name="pyglossary", - version=getPipSafeVersion(), - python_requires=">=3.10.0", -- cmdclass={ -- "install": my_install, -- }, - description="A tool for converting dictionary files aka glossaries.", - long_description_content_type="text/markdown", - long_description=long_description, - author="Saeed Rasooli", - author_email="saeed.gnu@gmail.com", -- license="GPLv3+", -+ license="GPL-3.0-or-later", - url="https://github.com/ilius/pyglossary", -- packages=[ -- "pyglossary", -- ], -+ packages=find_packages(), - entry_points={ - "console_scripts": [ - "pyglossary = pyglossary.ui.main:main", From 423c5bab5fab960d9ed3e1a8a44407f86a00d828 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 24 Oct 2025 10:38:24 +0300 Subject: [PATCH 0434/2279] pyglossary: enable cmd UI features --- pkgs/by-name/py/pyglossary/package.nix | 6 +++++- pkgs/development/python-modules/pyglossary/default.nix | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/py/pyglossary/package.nix b/pkgs/by-name/py/pyglossary/package.nix index 8c96c385d8a2..3f763dc617c0 100644 --- a/pkgs/by-name/py/pyglossary/package.nix +++ b/pkgs/by-name/py/pyglossary/package.nix @@ -2,4 +2,8 @@ python3, }: -python3.pkgs.toPythonApplication python3.pkgs.pyglossary +python3.pkgs.toPythonApplication ( + python3.pkgs.pyglossary.override { + enableCmd = true; + } +) diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix index 9f9012c06d4a..6617af80e51d 100644 --- a/pkgs/development/python-modules/pyglossary/default.nix +++ b/pkgs/development/python-modules/pyglossary/default.nix @@ -21,6 +21,9 @@ # for GUI only pygobject3, gtk3, + enableCmd ? false, + prompt-toolkit, + tqdm, }: buildPythonPackage rec { @@ -58,6 +61,10 @@ buildPythonPackage rec { ] ++ lib.optionals enableGui [ pygobject3 + ] + ++ lib.optionals enableCmd [ + prompt-toolkit + tqdm ]; buildInputs = lib.optionals enableGui [ From baf3ae626d9060b896ae1c39163da35eea7a0351 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 24 Oct 2025 10:42:14 +0300 Subject: [PATCH 0435/2279] pyglossary-gui: add cmd interface as well --- pkgs/by-name/py/pyglossary-gui/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/py/pyglossary-gui/package.nix b/pkgs/by-name/py/pyglossary-gui/package.nix index b9f68d286190..71b74f9cb113 100644 --- a/pkgs/by-name/py/pyglossary-gui/package.nix +++ b/pkgs/by-name/py/pyglossary-gui/package.nix @@ -5,5 +5,6 @@ python3.pkgs.toPythonApplication ( python3.pkgs.pyglossary.override { enableGui = true; + enableCmd = true; } ) From 1af1e23427d118c5fee547da78be32af4a6b6248 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 07:56:15 +0000 Subject: [PATCH 0436/2279] python3Packages.google-cloud-speech: 2.33.0 -> 2.34.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index c2f1ce1628b6..2965b2a5b304 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.33.0"; + version = "2.34.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_speech"; inherit version; - hash = "sha256-/QhRG1Ek/ap2jXGkBU6EpdjrAlMctvhPMRwDh+oTFO0="; + hash = "sha256-Knv/2E8TS5twyfEcu1CIxTT5K+FJ1x2Qc9C53TpDGs8="; }; build-system = [ setuptools ]; From 30a4fcbaad6b2e6cca9bfc1499bfed7fa03a6aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 24 Oct 2025 12:11:17 +0200 Subject: [PATCH 0437/2279] python3Packages.rdflib: patch a test instead of skipping Upstream has resolved this, better patch it. Otherwise we risk of keeping to skip the test forever. --- pkgs/development/python-modules/rdflib/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 07c57be63ef0..7c0884f08dd5 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, # builds @@ -38,6 +39,12 @@ buildPythonPackage rec { tag = version; hash = "sha256-FisMiBTiL6emJS0d7UmlwGUzayA+CME5GGWgw/owfhc="; }; + patches = [ + (fetchpatch { + url = "https://github.com/RDFLib/rdflib/commit/0ab817f86b5733c9a3b4ede7ef065b8d79e53fc5.diff"; + hash = "sha256-+yWzQ3MyH0wihgiQRMMXV/FpG8WlXaIBhpsDF4e3rbY="; + }) + ]; build-system = [ poetry-core ]; @@ -66,8 +73,6 @@ buildPythonPackage rec { # requires network access "rdflib/__init__.py::rdflib" "test/jsonld/test_onedotone.py::test_suite" - # https://github.com/RDFLib/rdflib/issues/3274 - "test/test_sparql/test_translate_algebra.py::test_roundtrip" ]; disabledTests = [ From 57d1e5e1c9554873af6d02fd3478c9cef4442008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 24 Oct 2025 04:47:16 -0700 Subject: [PATCH 0438/2279] python3Packages.backports-zstd: fix hash The old hash was invalid because of a problem with line ending normalization in the zstd module: $ file /nix/store/3v178rjmmyxlb5s9bn0nvq5xzcixlali-source/src/c/zstd/build/VS2008/fullbench/fullbench.vcproj /nix/store/qagxczby82d2pvwsv9nancayx2ywfr51-source/src/c/zstd/build/VS2008/fullbench/fullbench.vcproj /nix/store/3v178rjmmyxlb5s9bn0nvq5xzcixlali-source/src/c/zstd/build/VS2008/fullbench/fullbench.vcproj: XML 1.0 document, ASCII text /nix/store/qagxczby82d2pvwsv9nancayx2ywfr51-source/src/c/zstd/build/VS2008/fullbench/fullbench.vcproj: XML 1.0 document, ASCII text, with CRLF line terminators We don't need that module so let's remove it from `src`. --- .../development/python-modules/backports-zstd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix index 6050f2c4975b..412b35bcb992 100644 --- a/pkgs/development/python-modules/backports-zstd/default.nix +++ b/pkgs/development/python-modules/backports-zstd/default.nix @@ -17,10 +17,16 @@ buildPythonPackage rec { repo = "backports.zstd"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-MRtj40vjCPtV9/RDgun/APzva4lv+TnXeBKD9RNlkII="; + postFetch = '' + rm -r "$out/src/c/zstd" + ''; + hash = "sha256-5t5ET8b65v4ArV9zrmu+kDXLG3QQRpMMZPSG+RRaCLk="; }; postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'ROOT_PATH / "src" / "c" / "zstd"' 'Path("${zstd.src}")' + # need to preserve $PYTHONPATH when calling sys.executable substituteInPlace tests/test/support/script_helper.py \ --replace-fail "return __cached_interp_requires_environment" "return True" From 0d247de30b2687f63aa489ba7078cf5d9399c723 Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Fri, 24 Oct 2025 09:57:02 -0400 Subject: [PATCH 0439/2279] libsForQt5.kproperty: fix build with cmake 4 --- .../kproperty/cmake-minimum-required.patch | 24 +++++++++++++++++++ .../libraries/kproperty/default.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/kproperty/cmake-minimum-required.patch diff --git a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch new file mode 100644 index 000000000000..9d7143b66a15 --- /dev/null +++ b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d589d5..0e1390f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + set(KPROPERTY_GENERATE_PRI TRUE) +-cmake_minimum_required(VERSION 3.0 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10 FATAL_ERROR) + find_package(ECM 1.8.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + include(SetKPropertyCMakePolicies NO_POLICY_SCOPE) +diff --git a/cmake/modules/SetKPropertyCMakePolicies.cmake b/cmake/modules/SetKPropertyCMakePolicies.cmake +index bc28d8a..85370c2 100644 +--- a/cmake/modules/SetKPropertyCMakePolicies.cmake ++++ b/cmake/modules/SetKPropertyCMakePolicies.cmake +@@ -9,7 +9,7 @@ cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's + # "Simplify variable reference and escape sequence evaluation" + + if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property. +- cmake_policy(SET CMP0059 OLD) ++ cmake_policy(SET CMP0059 NEW) + endif() + if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3) + cmake_policy(SET CMP0063 NEW) diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index b1a9aaa2c6e4..8bba65ad63d1 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -20,6 +20,10 @@ mkDerivation rec { sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7"; }; + patches = [ + ./cmake-minimum-required.patch + ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ From 6f83d3e436ff0472215d881915831163678a2184 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Fri, 24 Oct 2025 10:50:37 -0400 Subject: [PATCH 0440/2279] asciinema_3: 3.0.0 -> 3.0.1 --- pkgs/by-name/as/asciinema_3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 140d97fbda02..69aa09329266 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -10,17 +10,17 @@ let self = rustPlatform.buildRustPackage { pname = "asciinema"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { name = "asciinema-source-${self.version}"; owner = "asciinema"; repo = "asciinema"; rev = "v${self.version}"; - hash = "sha256-P92EZyg8f/mm66SmXAyPX9f4eMgOP6lyn3Uqhqh+D0I="; + hash = "sha256-jWRq/LeDdCETiOMkWr9EIWztb14IYGCSo05QPw5HZZk="; }; - cargoHash = "sha256-2DQqtCcvSO43+RcMN2/BGqvf+cp/WvzUY4dxVpNcbGU="; + cargoHash = "sha256-bGhShwH4BxE3O4/B8KSK1o7IXNDBmGuVt4kx5s8W/go="; env.ASCIINEMA_GEN_DIR = "gendir"; From fe2d1f226c91bf6064e913eb65db193aa23f36f3 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Fri, 24 Oct 2025 11:57:20 -0400 Subject: [PATCH 0441/2279] asciinema_3: use finalAttrs --- pkgs/by-name/as/asciinema_3/package.nix | 101 ++++++++++++------------ 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 69aa09329266..d3a841bdbf30 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -7,64 +7,61 @@ testers, }: -let - self = rustPlatform.buildRustPackage { - pname = "asciinema"; - version = "3.0.1"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "asciinema"; + version = "3.0.1"; - src = fetchFromGitHub { - name = "asciinema-source-${self.version}"; - owner = "asciinema"; - repo = "asciinema"; - rev = "v${self.version}"; - hash = "sha256-jWRq/LeDdCETiOMkWr9EIWztb14IYGCSo05QPw5HZZk="; - }; + src = fetchFromGitHub { + name = "asciinema-source-${finalAttrs.version}"; + owner = "asciinema"; + repo = "asciinema"; + rev = "v${finalAttrs.version}"; + hash = "sha256-jWRq/LeDdCETiOMkWr9EIWztb14IYGCSo05QPw5HZZk="; + }; - cargoHash = "sha256-bGhShwH4BxE3O4/B8KSK1o7IXNDBmGuVt4kx5s8W/go="; + cargoHash = "sha256-bGhShwH4BxE3O4/B8KSK1o7IXNDBmGuVt4kx5s8W/go="; - env.ASCIINEMA_GEN_DIR = "gendir"; + env.ASCIINEMA_GEN_DIR = "gendir"; - nativeCheckInputs = [ python3 ]; - nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ python3 ]; + nativeBuildInputs = [ installShellFiles ]; - postInstall = '' - installManPage gendir/man/* - installShellCompletion --cmd asciinema \ - --bash gendir/completion/asciinema.bash \ - --fish gendir/completion/asciinema.fish \ - --zsh gendir/completion/_asciinema - ''; + postInstall = '' + installManPage gendir/man/* + installShellCompletion --cmd asciinema \ + --bash gendir/completion/asciinema.bash \ + --fish gendir/completion/asciinema.fish \ + --zsh gendir/completion/_asciinema + ''; - strictDeps = true; + strictDeps = true; - passthru = { - tests.version = testers.testVersion { - package = self; - command = "asciinema --version"; - }; - }; - - meta = { - homepage = "https://asciinema.org/"; - description = "Terminal session recorder and the best companion of asciinema.org"; - longDescription = '' - asciinema is a suite of tools for recording, replaying, and sharing - terminal sessions. It is free and open-source software (FOSS), created - by Marcin Kulik. - - Its typical use cases include creating tutorials, demonstrating - command-line tools, and sharing reproducible bug reports. It focuses on - simplicity and interoperability, which makes it a popular choice among - computer users working with the command-line, such as developers or - system administrators. - ''; - license = with lib.licenses; [ gpl3Plus ]; - mainProgram = "asciinema"; - maintainers = with lib.maintainers; [ - jiriks74 - llakala - ]; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "asciinema --version"; }; }; -in -self + + meta = { + homepage = "https://asciinema.org/"; + description = "Terminal session recorder and the best companion of asciinema.org"; + longDescription = '' + asciinema is a suite of tools for recording, replaying, and sharing + terminal sessions. It is free and open-source software (FOSS), created + by Marcin Kulik. + + Its typical use cases include creating tutorials, demonstrating + command-line tools, and sharing reproducible bug reports. It focuses on + simplicity and interoperability, which makes it a popular choice among + computer users working with the command-line, such as developers or + system administrators. + ''; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "asciinema"; + maintainers = with lib.maintainers; [ + jiriks74 + llakala + ]; + }; +}) From bdcf5f77404cfbe6eb284e8a23c41c97a3cb26d5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 24 Oct 2025 09:52:41 -0700 Subject: [PATCH 0442/2279] tailscale: 1.88.4 -> 1.90.2 Changelog: https://tailscale.com/changelog#2025-10-24 --- pkgs/by-name/ta/tailscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index d74d12f85971..ec9b9f06f8fc 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.88.4"; + version = "1.90.2"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-fzJwRTB2U2GuLmv1XUSMLnhyLlp+4kGorLGAvRVjDqw="; + hash = "sha256-GToL03vH0/H6p3IN/UgFijlbonZ+48asr/XqzGQ0px4="; }; - vendorHash = "sha256-8aE6dWMkTLdWRD9WnLVSzpOQQh61voEnjZAJHtbGCSs="; + vendorHash = "sha256-rV3C2Vi48FCifGt58OdEO4+Av0HRIs8sUJVvp/gEBLw="; nativeBuildInputs = [ makeWrapper From 8c2d3efebd80179a69286302b034430157b01853 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Oct 2025 19:33:54 +0000 Subject: [PATCH 0443/2279] python3Packages.python-pkcs11: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/python-pkcs11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix index b67fab579aa6..1cf70ac288c1 100644 --- a/pkgs/development/python-modules/python-pkcs11/default.nix +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-pkcs11"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "danni"; repo = "python-pkcs11"; tag = "v${version}"; - sha256 = "sha256-8KLc/jNpYAsuRaiRVD9m5rQWW6u1EG1yf9fwwXRk4Qc="; + sha256 = "sha256-3OfX7PlVyH8X8oJs0DpmZp0xbWzdahVXOvgnKwCDrPo="; }; build-system = [ From 379ee381b01cdcb90768744d8a5e48b3cb5c6689 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 19:48:03 -0300 Subject: [PATCH 0444/2279] scipopt-scip: 9.2.3 -> 9.2.4 --- ...1-check-fix-invalid-ctest-invocation.patch | 40 ------------------- pkgs/by-name/sc/scipopt-scip/package.nix | 9 +---- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch diff --git a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch b/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch deleted file mode 100644 index d6b1f5cd2e18..000000000000 --- a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7772c64ee2face1c1099c23ecbfd20ff663cffc3 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Tue, 7 Oct 2025 16:19:31 +0300 -Subject: [PATCH] check: fix invalid ctest invocation - -ctest doesn't like `-R "-default"`. CMake 4.0 fails with the following -error message: - -> CMake Error: Invalid value used with -R - -`-R` normally specifies the regex that needs to match. If none is -specified, all are selected: - -https://cmake.org/cmake/help/latest/manual/ctest.1.html#cmdoption-ctest-R - -This maybe never worked, but got silently ignored until -https://cmake.org/cmake/help/latest/policy/CMP0175.html - -Removing that regex should only cause *more* tests to get selected, not -less - and the build now succeeds with it. ---- - check/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt -index 0d667d5..c26b978 100644 ---- a/check/CMakeLists.txt -+++ b/check/CMakeLists.txt -@@ -4,7 +4,7 @@ include(CTest) - # add a custom SCIP check target 'scip_check' - # - add_custom_target(scip_check -- COMMAND ${CMAKE_CTEST_COMMAND} -R "-default" -E "applications" --output-on-failure -+ COMMAND ${CMAKE_CTEST_COMMAND} -E "applications" --output-on-failure - DEPENDS scip - ) - --- -2.51.0 - diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 901fcbb9a073..6b07a7fe84b3 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -19,20 +19,15 @@ stdenv.mkDerivation rec { pname = "scipopt-scip"; - version = "9.2.3"; + version = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; tag = "v${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-Zc1AXNpHQXXFO8jkMaJj6xYkmkQxAM8G+SiPiH9xCAw="; + hash = "sha256-nwFRtP63/HPfk9JhcyLKApicgqE9IF+7s5MGGrVJrpM="; }; - patches = [ - # https://github.com/scipopt/scip/pull/169 - ./0001-check-fix-invalid-ctest-invocation.patch - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ From 3d10e1b9ee4425fffacb6ce8853ad1edecafdfb7 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0445/2279] darwin.adv_cmds: 231 -> 235 https://github.com/apple-oss-distributions/adv_cmds/compare/adv_cmds-231...adv_cmds-235 --- .../darwin/apple-source-releases/adv_cmds/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix index f994ab88d029..ba19dccc1284 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix @@ -38,7 +38,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-2p/JyMPw6acHphvzkaJXPXGwxCUEoxryCejww5kPHvQ="; + xcodeHash = "sha256-QhkylTnnCy4qG8fpUMlKqDGKz58jysL0YF4lFGJzPzE="; postPatch = '' # Meson generators require using @BASENAME@ in the output. diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 4081232cd0fb..030b12da8311 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -20,8 +20,8 @@ "version": "1740.60.27" }, "adv_cmds": { - "hash": "sha256-alJOcKeHmIh67ZmN7/YdIouCP/qzakkhimsuZaOkr+c=", - "version": "231" + "hash": "sha256-O+SB8sj3yqPv7GEBQQgvq+Y7kQRZI/i/UVa17J/OhZM=", + "version": "235" }, "basic_cmds": { "hash": "sha256-RQve2GqS9ke9hd8kupRMgoOKalTS229asi5tBGrBmS8=", From d7a496039aefc03e359b5b141946333da2735278 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0446/2279] darwin.AvailabilityVersions: 143.6 -> 151 https://github.com/apple-oss-distributions/AvailabilityVersions/compare/AvailabilityVersions-143.6...AvailabilityVersions-151 --- .../apple-source-releases/AvailabilityVersions/package.nix | 3 +++ .../0001-Support-setting-an-upper-bound-on-versions.patch | 5 ++--- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix index dadafd43edcb..8cd1ee632f2b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix @@ -4,6 +4,7 @@ buildPackages, mkAppleDerivation, unifdef, + bashNonInteractive, }: let @@ -19,6 +20,7 @@ mkAppleDerivation (finalAttrs: { ./patches/0001-Support-setting-an-upper-bound-on-versions.patch ]; + buildInputs = [ bashNonInteractive ]; nativeBuildInputs = [ unifdef ]; buildPhase = '' @@ -63,6 +65,7 @@ mkAppleDerivation (finalAttrs: { Availability.h AvailabilityInternal.h AvailabilityInternalLegacy.h + AvailabilityInternalPrivate.h AvailabilityMacros.h AvailabilityVersions.h os/availability.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch index 6dcf8eef3619..d1d4673e2d72 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch +++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch @@ -189,10 +189,10 @@ index 8ebd250..5bb9edb 100755 if platform.bleached: output.write(f"#ifndef __APPLE_BLEACH_SDK__\n") writeDefines(platformString, platformString, platform.versioned) -@@ -326,9 +351,9 @@ static const std::array sVersionMap = {{{{ - output.write(f" #endif /* __has_attribute(availability) */\n") +@@ -327,9 +352,9 @@ static const std::array sVersionMap = {{{{ output.write(f"#endif /* defined(__has_feature) && defined(__has_attribute) */\n") def AVAILABILITY_MACRO_IMPL(self, output, prefix, dispatcher, **optionals): + av_version_hash = zlib.adler32(avVersion.encode()) # This does not need to cryptographically secure as it is meant to detect accidental failures - count = len(versions.platforms()) - for platformString in versions.platforms(): - platform = versions.platforms()[platformString] @@ -241,4 +241,3 @@ index 8ebd250..5bb9edb 100755 if getattr(args, platform, None): -- 2.45.2 - diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 030b12da8311..07b64a975120 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -1,7 +1,7 @@ { "AvailabilityVersions": { - "hash": "sha256-PT54BPSRkQiIHrpxZCdjo6XvNuWxESabLndCBYjulfs=", - "version": "143.6" + "hash": "sha256-eQ46qHk4AuHA+hRZq1IG2UtvZr/X2vtlOvi6hnG+FyA=", + "version": "151" }, "Csu": { "hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=", From e867b97505e9448d97ce2fd24c589fbc694302e8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0447/2279] darwin.bootstrap_cmds: 136 -> 138 https://github.com/apple-oss-distributions/bootstrap_cmds/compare/bootstrap_cmds-136...bootstrap_cmds-138 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 07b64a975120..f1243f7d972c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -29,7 +29,7 @@ }, "bootstrap_cmds": { "hash": "sha256-6JG0sysgqLlgcpIOXfN+F0/gxpIIHZZ5et3gmDBoBGQ=", - "version": "136" + "version": "138" }, "copyfile": { "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", From 50b64af39bba599ce4673053fc9c7978fecc84f4 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0448/2279] darwin.copyfile: 213.40.2 -> 224 https://github.com/apple-oss-distributions/copyfile/compare/copyfile-213.40.2...copyfile-224 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index f1243f7d972c..29af7baa6a83 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -32,8 +32,8 @@ "version": "138" }, "copyfile": { - "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=", - "version": "213.40.2" + "hash": "sha256-hIHlY0prIFY0j8z0Hvlv2psrwLj41jYfKBM0KutLxew=", + "version": "224" }, "developer_cmds": { "hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=", From 4b743d815caffcc2dd71e220855f95ff8a6e0607 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0449/2279] darwin.diskdev_cmds: 737.60.1 -> 737.140.4 https://github.com/apple-oss-distributions/diskdev_cmds/compare/diskdev_cmds-737.60.1...diskdev_cmds-737.140.4 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 29af7baa6a83..2ce180c55632 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -40,8 +40,8 @@ "version": "83" }, "diskdev_cmds": { - "hash": "sha256-v3TFHLUlumt/sHxkOTyxDA4iG8ci5ZmMn7HCb4+9Uo0=", - "version": "737.60.1" + "hash": "sha256-TD/sJkzIquTgq1zP/B7eBArxeTcp1Lqa8e8cJ1jnkHU=", + "version": "737.140.4" }, "doc_cmds": { "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=", From 7d71e8cc0b0aecf6a0d603b97474d57a6350bdaf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0450/2279] darwin.doc_cmds: 66 -> 69 https://github.com/apple-oss-distributions/doc_cmds/compare/doc_cmds-66...doc_cmds-69 --- .../doc_cmds/package.nix | 21 ++++++++++++++++++- .../apple-source-releases/versions.json | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix index ec022deebdf2..493fabf82baf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix @@ -1,11 +1,28 @@ { lib, + apple-sdk, mkAppleDerivation, pkg-config, shell_cmds, + stdenvNoCC, zlib, }: +let + xnu = apple-sdk.sourceRelease "xnu"; + + privateHeaders = stdenvNoCC.mkDerivation { + name = "doc_cmds-deps-private-headers"; + + buildCommand = '' + install -D -m644 -t "$out/include/System/sys" \ + '${xnu}/bsd/sys/codesign.h' + + install -D -m644 -t "$out/include/kern" \ + '${xnu}/osfmk/kern/cs_blobs.h' + ''; + }; +in mkAppleDerivation { releaseName = "doc_cmds"; @@ -14,11 +31,13 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-7/ADsfXTKqQhgratg2Twj7JgfFV0/U9rEvtsnX+NFPw="; + xcodeHash = "sha256-Nt6yHx3K8OkrdSWuX9s+JJIkeA5S6HDBAtTtrEjbk4w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; + env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; + postInstall = '' HOST_PATH='${lib.getBin shell_cmds}/bin' patchShebangs --host "$out/libexec" ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 2ce180c55632..62ac76e16da2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -44,8 +44,8 @@ "version": "737.140.4" }, "doc_cmds": { - "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=", - "version": "66" + "hash": "sha256-nnwKXKKjgJXcLCArD38Dme2L1WyR1U0rwn7zI+NCftw=", + "version": "69" }, "dyld": { "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=", From f01a6b3deee6ad43366889e0764170e2a1d4149f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0451/2279] darwin.dyld: 1241.17 -> 1286.10 https://github.com/apple-oss-distributions/dyld/compare/dyld-1241.17...dyld-1286.10 --- .../apple-source-releases/dyld/meson.build.in | 111 +++++++++++++----- .../apple-source-releases/dyld/package.nix | 13 +- ...002-Provide-startsWith-for-dyld_info.patch | 20 ---- .../0004-Fix-llvm-op-info-callback-args.patch | 4 +- .../0007-Fix-missing-writeChainEntry.patch | 13 ++ .../apple-source-releases/versions.json | 4 +- 6 files changed, 110 insertions(+), 55 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch create mode 100644 pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in index 71b4ec7dc606..b3c095cc5499 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in @@ -40,6 +40,7 @@ common_inc = [ 'dyld', 'include', 'mach_o', + 'include/mach-o', ] @@ -86,6 +87,79 @@ lsl_dep = declare_dependency( link_with : lsl, ) +libmach_o = static_library( + 'mach_o', + dependencies : [ lsl_dep ], + include_directories : [ + common_inc, + 'mach_o', + ], + sources : [ + 'mach_o/Architecture.cpp', + 'mach_o/Archive.cpp', + 'mach_o/BindOpcodes.cpp', + 'mach_o/ChainedFixups.cpp', + 'mach_o/CompactUnwind.cpp', + 'mach_o/DataInCode.cpp', + 'mach_o/DwarfDebug.cpp', + 'mach_o/Error.cpp', + 'mach_o/ExportsTrie.cpp', + 'mach_o/Fixups.cpp', + 'mach_o/FunctionStarts.cpp', + 'mach_o/FunctionVariants.cpp', + 'mach_o/GradedArchitectures.cpp', + 'mach_o/Header.cpp', + 'mach_o/Image.cpp', + 'mach_o/Instructions.cpp', + # 'mach_o/LinkerOptimizationHints.cpp', + 'mach_o/LoggingStub.cpp', + 'mach_o/Misc.cpp', + 'mach_o/NListSymbolTable.cpp', + 'mach_o/ObjC.cpp', + 'mach_o/Platform.cpp', + 'mach_o/Policy.cpp', + 'mach_o/RebaseOpcodes.cpp', + 'mach_o/SplitSeg.cpp', + 'mach_o/Symbol.cpp', + 'mach_o/Universal.cpp', + 'mach_o/Version32.cpp', + 'mach_o/Version64.cpp', + ], +) +libmach_o_dep = declare_dependency( + include_directories : [ 'mach_o' ], + link_with : libmach_o, +) + +libmach_o_writer = static_library( + 'mach_o_writer', + dependencies : [ lsl_dep ], + include_directories : [ + common_inc, + 'mach_o_writer', + ], + sources : [ + 'mach_o_writer/ArchiveWriter.cpp', + 'mach_o_writer/BindOpcodesWriter.cpp', + 'mach_o_writer/ChainedFixupsWriter.cpp', + 'mach_o_writer/ChunkBumpAllocator.cpp', + 'mach_o_writer/CompactUnwindWriter.cpp', + 'mach_o_writer/DataInCodeWriter.cpp', + 'mach_o_writer/ExportsTrieWriter.cpp', + 'mach_o_writer/FunctionStartsWriter.cpp', + 'mach_o_writer/FunctionVariantsWriter.cpp', + 'mach_o_writer/HeaderWriter.cpp', + 'mach_o_writer/LinkerOptimizationHintsWriter.cpp', + 'mach_o_writer/NListSymbolTableWriter.cpp', + 'mach_o_writer/RebaseOpcodesWriter.cpp', + 'mach_o_writer/SplitSegWriter.cpp', + 'mach_o_writer/UniversalWriter.cpp', + ], +) +libmach_o_writer_dep = declare_dependency( + include_directories : [ 'mach_o_writer' ], + link_with : libmach_o_writer, +) # These files need to be built with `BUILDING_LIBDYLD` not `BUILDING_DYLDINFO`. # `dyld_info` can’t just link against `libdyld` because the symbols it needs are not publicly exported. @@ -110,15 +184,17 @@ libminidyld = static_library( 'common/MachOLayout.cpp', 'common/MachOLoaded.cpp', 'libdyld/CrashReporterAnnotations.c', - 'mach_o/ChainedFixups.cpp', - 'mach_o/GradedArchitectures.cpp', ], ) libdsc_extractor = shared_library( 'dsc_extractor', cpp_args : [ '-DBUILDING_SHARED_CACHE_EXTRACTOR=1' ], - dependencies : [ corecrypto_dep, lsl_dep ], + dependencies : [ + corecrypto_dep, + libmach_o_dep, + lsl_dep + ], include_directories : [ common_inc, 'cache-builder', @@ -132,6 +208,7 @@ libdsc_extractor = shared_library( sources : [ 'common/DyldSharedCache.cpp', 'common/MachOFile.cpp', + 'common/TargetPolicy.cpp', 'other-tools/dsc_extractor.cpp', 'other-tools/dsc_iterator.cpp', 'common/MachOLayout.cpp', @@ -156,6 +233,7 @@ executable( ], dependencies : [ corecrypto_dep, + libmach_o_dep, llvm_dep, lsl_dep, ], @@ -175,31 +253,10 @@ executable( 'common/MachOFile.cpp', 'common/MetadataVisitor.cpp', 'common/SwiftVisitor.cpp', - 'mach_o/Architecture.cpp', - 'mach_o/Archive.cpp', - 'mach_o/BindOpcodes.cpp', - 'mach_o/ChainedFixups.cpp', - 'mach_o/CompactUnwind.cpp', - 'mach_o/Error.cpp', - 'mach_o/ExportsTrie.cpp', - 'mach_o/Fixups.cpp', - 'mach_o/FunctionStarts.cpp', - 'mach_o/Header.cpp', - 'mach_o/Image.cpp', - 'mach_o/Instructions.cpp', - 'mach_o/LoggingStub.cpp', - 'mach_o/Misc.cpp', - 'mach_o/NListSymbolTable.cpp', - 'mach_o/ObjC.cpp', - 'mach_o/Platform.cpp', - 'mach_o/Policy.cpp', - 'mach_o/RebaseOpcodes.cpp', - 'mach_o/SplitSeg.cpp', - 'mach_o/Symbol.cpp', - 'mach_o/Universal.cpp', - 'mach_o/Version32.cpp', - 'mach_o/Version64.cpp', + 'common/TargetPolicy.cpp', 'other-tools/dyld_info.cpp', + 'other-tools/MiscFileUtils.cpp', + 'other-tools/SymbolicatedImage.cpp', ], ) install_man('doc/man/man1/dyld_info.1') diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix index c2e50c4f8a2d..8cc3eaa2071a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix @@ -44,7 +44,8 @@ let install -D -m644 -t "$out/include/System" \ '${Libc}/stdlib/FreeBSD/atexit.h' - mkdir -p "$out/include/System/sys" + install -D -m644 -t "$out/include/System/sys" \ + '${xnu}/bsd/sys/csr.h' substitute '${xnu}/bsd/sys/fsgetpath.h' "$out/include/System/sys/fsgetpath.h" \ --replace-fail '#ifdef __APPLE_API_PRIVATE' '#if 1' @@ -92,13 +93,11 @@ mkAppleDerivation { propagatedBuildOutputs = [ ]; - xcodeHash = "sha256-NfaENSF699xjc+eKtOm1RyXUCMD6xTaJ5+9arLllqyw="; + xcodeHash = "sha256-4yOJouk9AjEt7W3+0cQRMUDDqBhU+J9c16ZQSzUF5go="; patches = [ # Disable use of private kdebug API ./patches/0001-Disable-kdebug-trace.patch - # dyld_info requires `startsWith`, but it’s not normally built for `dyld_info`. - ./patches/0002-Provide-startsWith-for-dyld_info.patch # dyld_info tries to weakly link against libLTO using this macro. ./patches/0003-Add-weaklinking_h.patch # The LLVMOpInfoCallback args comment out one of the args. Fix that for compatibility with nixpkgs LLVM. @@ -109,6 +108,9 @@ mkAppleDerivation { # `dsc_extractor` builds a dylib, but it includes a program that can perform cache extraction. # This extracts just the driver into a file to make building the actual program easier. ./patches/0006-Add-dsc_extractor_bin_cpp.patch + # Fix missing symbol for `mach_o::ChainedFixups::PointerFormat::writeChainEntry`, + # which isn’t actually needed by `dyld_info` or `dsc_extractor`. + ./patches/0007-Fix-missing-writeChainEntry.patch ]; postPatch = '' @@ -144,6 +146,9 @@ mkAppleDerivation { substituteInPlace dyld/Loader.h \ --replace-fail 'dyld_priv.h' 'mach-o/dyld_priv.h' + substituteInPlace common/DyldSharedCache.h \ + --replace-fail 'dyld_cache_format.h' 'mach-o/dyld_cache_format.h' + # Remove unused header include (since the compat shims don’t provide it). substituteInPlace other-tools/dsc_extractor.cpp \ --replace-fail '#include ' "" diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch deleted file mode 100644 index 746f21cc23ae..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/common/MachOFile.cpp b/common/MachOFile.cpp -index 3e7b95bcfe..265ae7c475 100644 ---- a/common/MachOFile.cpp -+++ b/common/MachOFile.cpp -@@ -2493,7 +2493,14 @@ - } - #endif // BUILDING_APP_CACHE_UTIL || BUILDING_DYLDINFO - --#if BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS -+#if BUILDING_DYLDINFO || BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS -+ -+#if BUILDING_DYLDINFO -+static bool startsWith(const char* buffer, const char* valueToFind) { -+ return strncmp(buffer, valueToFind, strlen(valueToFind)) == 0; -+} -+#endif -+ - static bool platformExcludesPrebuiltClosure_macOS(const char* path) { - // We no longer support ROSP, so skip all paths which start with the special prefix - if ( startsWith(path, "/System/Library/Templates/Data/") ) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch index cc3e0c8729ff..ea18669b09f1 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch @@ -1,7 +1,7 @@ diff --git a/other-tools/dyld_info.cpp b/other-tools/dyld_info.cpp index 2de4978ba5..2ce27257d9 100644 ---- a/other-tools/dyld_info.cpp -+++ b/other-tools/dyld_info.cpp +--- a/other-tools/SymbolicatedImage.cpp ++++ b/other-tools/SymbolicatedImage.cpp @@ -991,7 +991,7 @@ return ((SymbolicatedImage*)di)->lookupSymbol(referencePC, referenceValue, *referenceType, *referenceName); } diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch new file mode 100644 index 000000000000..5590f8f5861a --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch @@ -0,0 +1,13 @@ +diff --git a/mach_o/ChainedFixups.h b/mach_o/ChainedFixups.h +index 10ff8847e0..336f80dd81 100644 +--- a/mach_o/ChainedFixups.h ++++ b/mach_o/ChainedFixups.h +@@ -78,7 +78,7 @@ + std::span segOffsetTable, uint32_t pageIndex, uint32_t pageSize, + void (^callback)(const Fixup& f, bool& stop)) const; + virtual Fixup parseChainEntry(const void* loc, const MappedSegment* seg, uint64_t preferedLoadAddress=0, std::span segOffsetTable={}) const = 0; +- virtual void writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span) const; ++ virtual void writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span) const = 0; + + protected: + constexpr PointerFormat() { } diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 62ac76e16da2..bbbad262b2c5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -48,8 +48,8 @@ "version": "69" }, "dyld": { - "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=", - "version": "1241.17" + "hash": "sha256-pbpSD5OeSMOcMJFAd7kyLINPROjqsafsCSphVGyIPyg=", + "version": "1286.10" }, "file_cmds": { "hash": "sha256-/79jS//IBZiQBumGA60lKDmddQCzl/r8QnviD6lGXNg=", From f32d3b59ac2f55167a0ed12f0718b8c3a002b4fb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0452/2279] darwin.file_cmds: 448.0.3 -> 457.140.3 https://github.com/apple-oss-distributions/file_cmds/compare/file_cmds-448.0.3...file_cmds-457.140.3 --- .../darwin/apple-source-releases/file_cmds/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix index 7961a0125ae5..160a394b4ba7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix @@ -91,7 +91,7 @@ mkAppleDerivation { "xattr" ]; - xcodeHash = "sha256-u23AoLa7J0eFtf4dXKkVO59eYL2I3kRsHcWPfT03MCU="; + xcodeHash = "sha256-KEZYuaDxLdprF+wGiszUdTXPQBfLNj0xP9Y0uarNjSs="; patches = [ # Fixes build of ls diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index bbbad262b2c5..6a8f6c12613f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -52,8 +52,8 @@ "version": "1286.10" }, "file_cmds": { - "hash": "sha256-/79jS//IBZiQBumGA60lKDmddQCzl/r8QnviD6lGXNg=", - "version": "448.0.3" + "hash": "sha256-Rf/XA6uEaj7Wps2s8Oc/OhQVBjz8XiqJlj+cxjiQfQU=", + "version": "457.140.3" }, "libffi": { "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=", From f23c4bd83dd3c4b254d1c36afd7806cc0e67db79 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0453/2279] darwin.ICU: 74222.203 -> 76104.4 https://github.com/apple-oss-distributions/ICU/compare/ICU-74222.203...ICU-76104.4 --- .../apple-source-releases/ICU/package.nix | 67 +++++++++++++------ .../apple-source-releases/versions.json | 4 +- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index 9a7ec4561355..27d7af4b0b95 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -3,8 +3,10 @@ bootstrapStdenv, buildPackages, fetchpatch2, + icu76, # The ICU version should correspond to the same one used by Apple’s ICU package mkAppleDerivation, python3, + stdenvNoCC, testers, }: @@ -12,6 +14,19 @@ # - ../../../development/libraries/icu/make-icu.nix # - https://github.com/apple-oss-distributions/ICU/blob/main/makefile let + privateHeaders = stdenvNoCC.mkDerivation { + name = "ICU-deps-private-headers"; + + buildCommand = '' + mkdir -p "$out/include/os" + cat < "$out/include/os/feature_private.h" + #pragma once + extern "C" bool _os_feature_enabled_impl(const char*, const char*); + #define os_feature_enabled(a, b) _os_feature_enabled_impl(#a, #b) + EOF + ''; + }; + stdenv = bootstrapStdenv; withStatic = stdenv.hostPlatform.isStatic; @@ -26,13 +41,6 @@ let patches = [ # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. ./patches/suppress-icu-check-crash.patch - - # Python 3.13 compatibility - (fetchpatch2 { - url = "https://github.com/unicode-org/icu/commit/60d6bd71efc0cde8f861b109ff87dbbf9fc96586.patch?full_index=1"; - hash = "sha256-aJBSVvKidPUjD956jLjyRk8fewUZ9f+Ip4ka6rjevzU="; - stripLen = 2; - }) ]; preConfigure = '' @@ -67,6 +75,7 @@ let env.NIX_CFLAGS_COMPILE = toString [ "-DU_SHOW_CPLUSPLUS_API=1" "-DU_SHOW_INTERNAL_API=1" + "-I${privateHeaders}/include" ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -93,24 +102,38 @@ let ++ lib.optional withStatic "static"; outputBin = "dev"; - postPatch = lib.optionalString self.finalPackage.doCheck '' - # Skip test for missing encodingSamples data. - substituteInPlace test/cintltst/ucsdetst.c \ - --replace-fail "&TestMailFilterCSS" "NULL" + postPatch = + lib.optionalString self.finalPackage.doCheck ( + '' + # Skip test for missing encodingSamples data. + substituteInPlace test/cintltst/ucsdetst.c \ + --replace-fail "&TestMailFilterCSS" "NULL" - # Disable failing tests - substituteInPlace test/cintltst/cloctst.c \ - --replace-fail 'TESTCASE(TestCanonicalForm);' "" + # Disable failing tests + substituteInPlace test/cintltst/cloctst.c \ + --replace-fail 'TESTCASE(TestCanonicalForm);' "" - substituteInPlace test/intltest/rbbitst.cpp \ - --replace-fail 'TESTCASE_AUTO(TestExternalBreakEngineWithFakeYue);' "" + substituteInPlace test/intltest/rbbitst.cpp \ + --replace-fail 'TESTCASE_AUTO(TestExternalBreakEngineWithFakeYue);' "" - # Otherwise `make install` is broken. - substituteInPlace Makefile.in \ - --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE" - substituteInPlace config/dist-data.sh \ - --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE" - ''; + # Add missing test data. It’s not included in the source release. + chmod u+w "$NIX_BUILD_TOP/source/icu" + tar -C "$NIX_BUILD_TOP/source" -axf ${lib.escapeShellArg icu76.src} icu/testdata + '' + + lib.optionalString stdenv.hostPlatform.isx86_64 '' + # These tests fail under Rosetta 2 with a floating-point exception. + substituteInPlace test/intltest/caltest.cpp \ + --replace-fail 'TESTCASE_AUTO(Test22633RollTwiceGetTimeOverflow);' "" \ + --replace-fail 'TESTCASE_AUTO(Test22750Roll);' "" + '' + ) + + '' + # Otherwise `make install` is broken. + substituteInPlace Makefile.in \ + --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE" + substituteInPlace config/dist-data.sh \ + --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE" + ''; # remove dependency on bootstrap-tools in early stdenv build postInstall = diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 6a8f6c12613f..5e9ff091b017 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -8,8 +8,8 @@ "version": "88" }, "ICU": { - "hash": "sha256-7ImBX4SlrFaLnHdQ4bm4F8q9IpHhQMaeVOO6pnnhyzQ=", - "version": "74222.203" + "hash": "sha256-dIgrTjHcQm8dy2Ku5wNIHuPjHfoV+48TM0PNDDn6ZPk=", + "version": "76104.4" }, "IOKitTools": { "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=", From 3d14f0c84ba9f9c25b063d4fa414a7c57f1b004e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0454/2279] darwin.libffi: 39 -> 40 https://github.com/apple-oss-distributions/libffi/compare/libffi-39...libffi-40 --- .../apple-source-releases/libffi/package.nix | 2 -- .../patches/llvm-18-compatibility.patch | 34 ------------------- .../apple-source-releases/versions.json | 4 +-- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix index 942f0a26da43..7aefb636900e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix @@ -23,8 +23,6 @@ mkAppleDerivation (finalAttrs: { ]; patches = [ - # Clang 18 requires that no non-private symbols by defined after cfi_startproc. Apply the upstream libffi fix. - ./patches/llvm-18-compatibility.patch # Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301. ./patches/fix-tramponline-memory-leak.patch # Fix automake-18.18 compatibility, https://github.com/libffi/libffi/issues/853#issuecomment-2909994482 diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch deleted file mode 100644 index a264d7b76d1b..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S -index eeaf3f8..329889c 100644 ---- a/src/aarch64/sysv.S -+++ b/src/aarch64/sysv.S -@@ -76,8 +76,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - x5 closure - */ - -- cfi_startproc - CNAME(ffi_call_SYSV): -+ cfi_startproc - /* Sign the lr with x1 since that is where it will be stored */ - SIGN_LR_WITH_REG(x1) - -@@ -268,8 +268,8 @@ CNAME(ffi_closure_SYSV_V): - #endif - - .align 4 -- cfi_startproc - CNAME(ffi_closure_SYSV): -+ cfi_startproc - SIGN_LR - stp x29, x30, [sp, #-ffi_closure_SYSV_FS]! - cfi_adjust_cfa_offset (ffi_closure_SYSV_FS) -@@ -500,8 +500,8 @@ CNAME(ffi_go_closure_SYSV_V): - #endif - - .align 4 -- cfi_startproc - CNAME(ffi_go_closure_SYSV): -+ cfi_startproc - stp x29, x30, [sp, #-ffi_closure_SYSV_FS]! - cfi_adjust_cfa_offset (ffi_closure_SYSV_FS) - cfi_rel_offset (x29, 0) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 5e9ff091b017..1d1040bad87b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -56,8 +56,8 @@ "version": "457.140.3" }, "libffi": { - "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=", - "version": "39" + "hash": "sha256-xHefZVsZg9kUXV0t/HLdjPkkD/hn/4bvdRVJ4PsQLeM=", + "version": "40" }, "libiconv": { "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=", From 570bcd84c4d144f4e60fa1dc3f4d2e0f3d174eb4 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0455/2279] darwin.libiconv: 109 -> 109.100.2 https://github.com/apple-oss-distributions/libiconv/compare/libiconv-109...libiconv-109.100.2 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 1d1040bad87b..3ea51269e42d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -60,8 +60,8 @@ "version": "40" }, "libiconv": { - "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=", - "version": "109" + "hash": "sha256-50DC6LePtvdAh9FLa/esiwCUmYDxKofN6hCiv9+dmgQ=", + "version": "109.100.2" }, "libpcap": { "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=", From 29fe5dc5ca0edf11edfdab42011de95cd7b7a101 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0456/2279] darwin.libpcap: 137 -> 140 https://github.com/apple-oss-distributions/libpcap/compare/libpcap-137...libpcap-140 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 3ea51269e42d..886f26d16f92 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -64,8 +64,8 @@ "version": "109.100.2" }, "libpcap": { - "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=", - "version": "137" + "hash": "sha256-DqINoombdui5N6lNHcZ07c7LrVum4f8fFK89ymdCd0c=", + "version": "140" }, "libresolv": { "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=", From a9d62c1d6a3070d54d978a1f238a332eac773181 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0457/2279] darwin.libresolv: 83 -> 91 https://github.com/apple-oss-distributions/libresolv/compare/libresolv-83...libresolv-91 --- .../darwin/apple-source-releases/libresolv/meson.build.in | 6 ++++-- .../darwin/apple-source-releases/libresolv/package.nix | 8 +++++--- .../darwin/apple-source-releases/versions.json | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in index 2d96b556bbc8..0c1adce503a5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in @@ -26,8 +26,8 @@ libresolv = library( 'dns_async.c', 'dns_util.c', 'dst_api.c', - 'dst_hmac_link.c', - 'dst_support.c', + 'hmac_link.c', + 'mtctxres.c', 'ns_date.c', 'ns_name.c', 'ns_netint.c', @@ -47,7 +47,9 @@ libresolv = library( 'res_query.c', 'res_send.c', 'res_sendsigned.c', + 'res_state.c', 'res_update.c', + 'support.c', ], soversion : '9' ) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix index 9e63efb55228..56c38bcece53 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix @@ -38,12 +38,14 @@ mkAppleDerivation { ]; postPatch = '' - mkdir arpa cp ${Libc}/include/arpa/nameser_compat.h arpa/nameser_compat.h - cp nameser.h arpa + + # Use CommonCrypto’s implementation of MD5. The upstream build appears to use corecrypto, which we can’t use. + substituteInPlace hmac_link.c \ + --replace-fail '' '' ''; - xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY="; + xcodeHash = "sha256-Q5jHee9rxge6HJtf9/sFK15FsS02GQmx7L0BBDiyGIs="; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 886f26d16f92..d5f2afc10029 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -68,8 +68,8 @@ "version": "140" }, "libresolv": { - "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=", - "version": "83" + "hash": "sha256-GtPVlL1mD58um5hOFd3HQKQ7pqutBe9jZKgQw8pOkPE=", + "version": "91" }, "libutil": { "hash": "sha256-tUsl22Z0HUVSkSoohFXkhicNFCW+RARvpTS0q6yaQFk=", From b3bfba01914b3924e96d927b5e442532f47ca501 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0458/2279] darwin.misc_cmds: 44 -> 45 https://github.com/apple-oss-distributions/misc_cmds/compare/misc_cmds-44...misc_cmds-45 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index d5f2afc10029..81122ff4d2f9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -80,8 +80,8 @@ "version": "38.0.1" }, "misc_cmds": { - "hash": "sha256-qPqcV9d4mKeu9ZD3rt3p5m1p/NyLy6np19ULC6FmnMI=", - "version": "44" + "hash": "sha256-04uBS16nNrg73Fqh4Obev7nQDjTTlY4f5+pEv3i0FIU=", + "version": "45" }, "network_cmds": { "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=", From b207ba727d05aa5ed49e2d8cec4fe210ebf6bd27 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0459/2279] darwin.network_cmds: 698.60.4 -> 705.100.5 https://github.com/apple-oss-distributions/network_cmds/compare/network_cmds-698.60.4...network_cmds-705.100.5 --- .../darwin/apple-source-releases/network_cmds/package.nix | 8 ++++++-- .../darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix index a89dd162d3cc..ec9d4c32ca1f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix @@ -123,6 +123,7 @@ let #pragma once #include_next $(sed -n \ + -e '/^#define RTM_/p' \ -e '/^struct rt_msghdr_ext\s*{/,/^};/p' \ -e '/^struct rt_reach_info\s*{/,/^};/p' \ -e '/^struct rtstat_64\s*{/,/^};/p' \ @@ -294,9 +295,11 @@ let -e '/^#define SIOCGIFAGENTDATA\s/p' \ -e '/^#define SIOCGIFAGENTIDS\s/p' \ -e '/^#define SIOCGIFCLAT46ADDR\s/p' \ + -e '/^#define SIOCGIFCONSTRAINED\s/p' \ -e '/^#define SIOCGIFDELEGATE\s/p' \ -e '/^#define SIOCGIFDESC\s/p' \ -e '/^#define SIOCGIFEFLAGS\s/p' \ + -e '/^#define SIOCGIFGENERATIONID\s/p' \ -e '/^#define SIOCGIFGETRTREFCNT\s/p' \ -e '/^#define SIOCGIFINTERFACESTATE\s/p' \ -e '/^#define SIOCGIFLINKPARAMS\s/p' \ @@ -321,6 +324,7 @@ let -e '/^#define SIOCSIF2KCL\s/p' \ -e '/^#define SIOCSIFCONSTRAINED\s/p' \ -e '/^#define SIOCSIFDESC\s/p' \ + -e '/^#define SIOCSIFDISABLEINPUT\s/p' \ -e '/^#define SIOCSIFDISABLEOUTPUT\s/p' \ -e '/^#define SIOCSIFEXPENSIVE\s/p' \ -e '/^#define SIOCSIFINTERFACESTATE\s/p' \ @@ -331,7 +335,6 @@ let -e '/^#define SIOCSIFMPKLOG\s/p' \ -e '/^#define SIOCSIFNOACKPRIO\s/p' \ -e '/^#define SIOCSIFNOTRAFFICSHAPING\s/p' \ - -e '/^#define SIOCSIFDISABLEINPUT\s/p' \ -e '/^#define SIOCSIFPROBECONNECTIVITY\s/p' \ -e '/^#define SIOCSIFSUBFAMILY\s/p' \ -e '/^#define SIOCSIFTHROTTLE\s/p' \ @@ -343,6 +346,7 @@ let #undef ifreq #include_next EOF + ln -s "$out/include/sys/sockio.h" "$out/include/sys/sockio_private.h" cat < "$out/include/sys/sys_domain.h" #pragma once @@ -385,7 +389,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-HkcIvKB4ektuk+3J/Sque8Pr5dMeNFZRlENuiu3KdsA="; + xcodeHash = "sha256-1RJ/s9vnfCGY2Vc2XH8dg8rB+0lwK2IBC7zIx4PuXWQ="; patches = [ # Some private headers depend on corecrypto, which we can’t use. diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 81122ff4d2f9..c6c220d31471 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -84,8 +84,8 @@ "version": "45" }, "network_cmds": { - "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=", - "version": "698.60.4" + "hash": "sha256-sfZX6aA8mspfRKARIYFXX+bmlLHDoi485HQOvbRNP1Y=", + "version": "705.100.5" }, "patch_cmds": { "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=", From 83c757338c2e1e2c6f590699a5b9497b44bb388a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0460/2279] darwin.patch_cmds: 66 -> 72 https://github.com/apple-oss-distributions/patch_cmds/compare/patch_cmds-66...patch_cmds-72 --- .../darwin/apple-source-releases/patch_cmds/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix index 86eaba2136e5..30f1eef87c27 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix @@ -14,7 +14,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-FLCJY40l74ExO0WTaA8hb9guhOBXeui2GqWL/7QeJJk="; + xcodeHash = "sha256-Ox8Ii2sUuledUttZ64DaHC0iFlUybs3lNZ23IDeziPM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index c6c220d31471..a38a8d372ba4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -88,8 +88,8 @@ "version": "705.100.5" }, "patch_cmds": { - "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=", - "version": "66" + "hash": "sha256-fDY2NOT3DnU5pm06cHSs+JJcA/EFP8Lxjg7sErUerJ0=", + "version": "72" }, "remote_cmds": { "hash": "sha256-a5ELSGJSTlyCb3bPdJqYSX320UzIkS2FiHxSpELIgls=", From 60fa2e224f29d4caa12e66e185e38ca58aa4b3ae Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0461/2279] darwin.PowerManagement: 1740.60.27 -> 1754.140.4 https://github.com/apple-oss-distributions/PowerManagement/compare/PowerManagement-1740.60.27...PowerManagement-1754.140.4 --- .../darwin/apple-source-releases/PowerManagement/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix index 02dfecec7b9e..f846f1aebc27 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix @@ -21,7 +21,7 @@ in mkAppleDerivation { releaseName = "PowerManagement"; - xcodeHash = "sha256-l6lm8aaiJg4H2BQVCjlFldpfhnmPAlsiMK7Cghzuh1E="; + xcodeHash = "sha256-cjTF4dR6S55mLwp4GkQhkkNk9sMMKDc/5JTm46Z7/KE="; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index a38a8d372ba4..6c4b49d9e843 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -16,8 +16,8 @@ "version": "125" }, "PowerManagement": { - "hash": "sha256-APkvbp0FhNrypQcDUuREUYOnNLOZGOKhsj5JLcDgvAU=", - "version": "1740.60.27" + "hash": "sha256-ssg655SPT7gWnJWDaxambMKCopr+vLPYERW0IMKT0T8=", + "version": "1754.140.4" }, "adv_cmds": { "hash": "sha256-O+SB8sj3yqPv7GEBQQgvq+Y7kQRZI/i/UVa17J/OhZM=", From 15b2c6f38053137ded709653f8c5c3fc6928d08c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0462/2279] darwin.remote_cmds: 303.0.2 -> 306 https://github.com/apple-oss-distributions/remote_cmds/compare/remote_cmds-303.0.2...remote_cmds-306 --- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 6c4b49d9e843..d2f3ba27005e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -92,8 +92,8 @@ "version": "72" }, "remote_cmds": { - "hash": "sha256-a5ELSGJSTlyCb3bPdJqYSX320UzIkS2FiHxSpELIgls=", - "version": "303.0.2" + "hash": "sha256-8c/NgQZ+K6jJ3aoYK78/BsEkM1gmRS+9z0437+SvcCw=", + "version": "306" }, "removefile": { "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=", From a864b5b2cce5dbf7682ff039b6e12d9c1fe992da Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0463/2279] darwin.removefile: 75 -> 81 https://github.com/apple-oss-distributions/removefile/compare/removefile-75...removefile-81 --- .../darwin/apple-source-releases/removefile/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix index 24cd68ead681..2ece68a526a2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix @@ -37,7 +37,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-pE92mVI0KTHOVKBA4T5R1rHy5//uipOimas7DaTVe0U="; + xcodeHash = "sha256-7dNq0nE2MmFM9U+epTrkCoM1lrswm98m3RWuLDsAuDk="; env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index d2f3ba27005e..85f7c993c1b0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -96,8 +96,8 @@ "version": "306" }, "removefile": { - "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=", - "version": "75" + "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=", + "version": "81" }, "shell_cmds": { "hash": "sha256-bcu9NNS7NW5oc5yrOk+GxZcQo0AP0+mOnph9HhLdRts=", From ab2d943dfb6ea8dd46f1d58e297a79d658fa6b76 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0464/2279] darwin.shell_cmds: 319.0.1 -> 326 https://github.com/apple-oss-distributions/shell_cmds/compare/shell_cmds-319.0.1...shell_cmds-326 --- .../darwin/apple-source-releases/shell_cmds/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix index f12c88ef2a64..c8a305b61baa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix @@ -24,7 +24,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-26N7AZV/G+ryc2Nu1v91rEdb1a6jDpnj6t5rzEG2YA4="; + xcodeHash = "sha256-fY8k7qzqqiv/KvGIB4a82qbNsm23QPnGOadrZmNoi54="; postPatch = '' # Fix `mktemp` templates diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 85f7c993c1b0..4610d506773c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -100,8 +100,8 @@ "version": "81" }, "shell_cmds": { - "hash": "sha256-bcu9NNS7NW5oc5yrOk+GxZcQo0AP0+mOnph9HhLdRts=", - "version": "319.0.1" + "hash": "sha256-hoMssbZCrmzyJTgEAzOS4L7DhY9z/yXIcvHRhL6W5qc=", + "version": "326" }, "system_cmds": { "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=", From a3f9461a02f7be7e6f042e8bdae2ae42441720ed Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0465/2279] darwin.system_cmds: 1012.60.2 -> 1026.140.2 https://github.com/apple-oss-distributions/system_cmds/compare/system_cmds-1012.60.2...system_cmds-1026.140.2 --- .../system_cmds/package.nix | 13 +++++++- ...itionalize-security-transition-shims.patch | 33 +++++++++++++++++++ .../apple-source-releases/versions.json | 4 +-- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix index a300bd1534ef..934213c73bd0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix @@ -1,6 +1,8 @@ { lib, + AvailabilityVersions, apple-sdk, + apple-sdk_15, libutil, mkAppleDerivation, ncurses, @@ -18,12 +20,15 @@ let OpenDirectory = apple-sdk.sourceRelease "OpenDirectory"; libplatform = apple-sdk.sourceRelease "libplatform"; - xnu = apple-sdk.sourceRelease "xnu"; + xnu = apple-sdk_15.sourceRelease "xnu"; # Needed for `posix_spawn_secflag_options` privateHeaders = stdenvNoCC.mkDerivation { name = "system_cmds-deps-private-headers"; buildCommand = '' + mkdir -p "$out/include/sys" + '${lib.getExe AvailabilityVersions}' ${lib.getVersion apple-sdk} "$out" + install -D -t "$out/include/CFOpenDirectory" \ '${OpenDirectory}/Core/CFOpenDirectoryPriv.h' \ '${OpenDirectory}/Core/CFODTrigger.h' @@ -105,6 +110,12 @@ mkAppleDerivation { xcodeHash = "sha256-gdtn3zNIneZKy6+X0mQ51CFVLNM6JQYLbd/lotG5/Tw="; + patches = [ + # `posix_spawnattr_set_use_sec_transition_shims_np` is only available on macOS 15.2 or newer. + # Disable the feature that requires it when running on older systems. + ./patches/conditionalize-security-transition-shims.patch + ]; + postPatch = '' # Replace hard-coded, impure system paths with the output path in the store. sed -e "s|PATH=[^;]*|PATH='$out/bin'|" -i "pagesize/pagesize.sh" diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch new file mode 100644 index 000000000000..b51f97e2dfc0 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch @@ -0,0 +1,33 @@ +diff --git a/taskpolicy/taskpolicy.c b/taskpolicy/taskpolicy.c +index b031f944b2..4ad82018ed 100644 +--- a/taskpolicy/taskpolicy.c ++++ b/taskpolicy/taskpolicy.c +@@ -126,7 +126,12 @@ + flag_s = true; + break; + case 'S': +- sec_transition_shims = parse_sec_transition_shims(optarg); ++ if (__builtin_available(macOS 15.2, *)) { ++ sec_transition_shims = parse_sec_transition_shims(optarg); ++ } else { ++ fprintf(stderr, "Running with security transition shims is only supported on macOS 15.2 and newer.\n"); ++ exit(EX_USAGE); ++ } + break; + case '?': + default: +@@ -246,9 +251,11 @@ + if (ret != 0) errc(EX_NOINPUT, ret, "posix_spawnattr_set_darwin_role_np"); + } + +- if (sec_transition_shims) { +- ret = posix_spawnattr_set_use_sec_transition_shims_np(&attr, sec_transition_shims); +- if (ret != 0) errc(EX_NOINPUT, ret, "setting security transition shims"); ++ if (__builtin_available(macOS 15.2, *)) { ++ if (sec_transition_shims) { ++ ret = posix_spawnattr_set_use_sec_transition_shims_np(&attr, sec_transition_shims); ++ if (ret != 0) errc(EX_NOINPUT, ret, "setting security transition shims"); ++ } + } + + ret = posix_spawnp(&pid, argv[0], NULL, &attr, argv, environ); diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index 4610d506773c..b806b523c200 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -104,8 +104,8 @@ "version": "326" }, "system_cmds": { - "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=", - "version": "1012.60.2" + "hash": "sha256-mEo+v0m+aP42XHHwibGKPkT55JFYLTOD5YT5IYQ8Hr0=", + "version": "1026.140.2" }, "text_cmds": { "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=", From bc25178c69cfa863e5b1f2bb1e66e9f405472f89 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Oct 2025 20:32:00 -0400 Subject: [PATCH 0466/2279] darwin.text_cmds: 190.0.1 -> 195 https://github.com/apple-oss-distributions/text_cmds/compare/text_cmds-190.0.1...text_cmds-195 --- .../darwin/apple-source-releases/text_cmds/package.nix | 2 +- pkgs/os-specific/darwin/apple-source-releases/versions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix index b4b31530895d..6c71c21c1ee7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix @@ -45,7 +45,7 @@ mkAppleDerivation { "man" ]; - xcodeHash = "sha256-dZ+yJyfflhmUyx3gitRXC115QxS87SGC4/HjMa199Ts="; + xcodeHash = "sha256-4nwDGUBSx5jjeLQ3EGQFdPZE2MfNGcBvlTU/Sye6OIk="; postPatch = '' # Improve compatiblity with libmd in nixpkgs. diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json index b806b523c200..a80d604e2b83 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/versions.json +++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json @@ -108,8 +108,8 @@ "version": "1026.140.2" }, "text_cmds": { - "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=", - "version": "190.0.1" + "hash": "sha256-5BBH/v1mJpExz65VDX6oh3dFCz49E+JMqJxkO96Y/xo=", + "version": "195" }, "top": { "hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=", From 10d9aca702be20b027c3233a4bb327c4f2a9c68d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 19:48:27 -0300 Subject: [PATCH 0467/2279] scipopt-gcg: 372 -> 372-unstable-2025-10-11 --- pkgs/by-name/sc/scipopt-gcg/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix index d15f8f302f55..2357476ded2c 100644 --- a/pkgs/by-name/sc/scipopt-gcg/package.nix +++ b/pkgs/by-name/sc/scipopt-gcg/package.nix @@ -13,16 +13,16 @@ stdenv.mkDerivation rec { pname = "scipopt-gcg"; - version = "372"; + version = "372-unstable-2025-10-11"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "gcg"; - tag = "v${version}"; - hash = "sha256-Sx0ZSca7XBT4GqxWt3bzelaXlI7kZCJo+by22mtTFhA="; + rev = "83a2d210a03f920dd941d547da94867deb504882"; + hash = "sha256-wbzknCmwDhJ38gItA3DppJxSJfNK7NeIkxZVRd2kmp0="; }; nativeBuildInputs = [ @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { ) ''; doCheck = true; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { maintainers = with lib.maintainers; [ fettgoenner ]; changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; From 089fe097cdd95d1451ada6a768eb2bcf24ad7c4c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 20:04:31 -0300 Subject: [PATCH 0468/2279] scipopt-papilo: 2.4.3 -> 2.4.4 --- pkgs/by-name/sc/scipopt-papilo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index ef557c5904e8..e6e692a1f743 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { pname = "scipopt-papilo"; - version = "2.4.3"; + version = "2.4.4"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; tag = "v${version}"; - hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8="; + hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A="; }; nativeBuildInputs = [ cmake ]; From 925acab2c7f7bf9596f2dd9f7ff2bd8d258d258d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 20:08:34 -0300 Subject: [PATCH 0469/2279] scipopt-soplex: update scipVersion --- pkgs/by-name/sc/scipopt-soplex/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 73ae32e5931b..3e36f07c2f69 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { version = "7.1.5"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; From c9c5db63146fb1899292491b655ae65e362ba629 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 25 Oct 2025 06:45:34 +0100 Subject: [PATCH 0470/2279] valgrind: 3.25.1 -> 3.26.0 Changes: https://valgrind.org/docs/manual/dist.news.html --- pkgs/by-name/va/valgrind/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix index f15572b5acbf..d59156c73a99 100644 --- a/pkgs/by-name/va/valgrind/package.nix +++ b/pkgs/by-name/va/valgrind/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.25.1"; + version = "3.26.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-Yd640HJ7RcJo79wbO2yeZ5zZfL9e5LKNHerXyLeica8="; + hash = "sha256-jVTHFwKRBvFkSq2vgCq5aS5T2T3QFcvRnnQZDrpha9c="; }; patches = [ @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = lib.licenses.gpl2Plus; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.eelco ]; platforms = From aec6faf4d49b8b818bda0dfb8a25b72ccdc81b66 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 22 Oct 2025 22:13:36 -0700 Subject: [PATCH 0471/2279] openssh: remove special-casing for 10.0p2 version --- pkgs/tools/networking/openssh/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 032b0b979657..6e95321b3de1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -8,19 +8,8 @@ let common = opts: callPackage (import ./common.nix opts) { }; - # Gets the correct OpenSSH URL for a given version. - urlFor = - version: - let - urlVersion = - { - # 10.0p1 was accidentally released as 10.0p2: - # https://www.openwall.com/lists/oss-security/2025/04/09/6 - "10.0p2" = "10.0p1"; - } - .${version} or version; - in - "mirror://openbsd/OpenSSH/portable/openssh-${urlVersion}.tar.gz"; + # Gets the OpenSSH mirror URL. + urlFor = version: "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; in { openssh = common rec { From e730dc907eaea35d0073db118a251b14f73524d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Oct 2025 06:16:57 +0000 Subject: [PATCH 0472/2279] jdk: 21.0.9+8 -> 21.0.9+10 --- pkgs/development/compilers/openjdk/21/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json index 438a484ff2b6..a43dec0d9066 100644 --- a/pkgs/development/compilers/openjdk/21/source.json +++ b/pkgs/development/compilers/openjdk/21/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-NgunrSUchIlHkaXM9h75U4xcf44ukCuhhPPHHGVOKXo=", + "hash": "sha256-VYTitbgKgd9co9LXVnneaaKjMwAXFmscYp9McJV01Jg=", "owner": "openjdk", "repo": "jdk21u", - "rev": "refs/tags/jdk-21.0.9+8" + "rev": "refs/tags/jdk-21.0.9+10" } From ba16421414de031bdc54fa7a48c71e49262910b5 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sat, 25 Oct 2025 08:28:17 -0300 Subject: [PATCH 0473/2279] tora: fix build with cmake4, mark as broken --- pkgs/development/tools/tora/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 88482eb91e3c..fdf4002975b7 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -74,11 +74,18 @@ mkDerivation { ''--prefix PATH : ${lib.getBin graphviz}/bin'' ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Tora SQL tool"; mainProgram = "tora"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; license = licenses.asl20; + # fails to build on hydra since 2024 + broken = true; }; } From c43687e298fc4cca1dc3f6bd5c70ee156b912ec4 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 12 Oct 2025 19:04:13 +0200 Subject: [PATCH 0474/2279] iproute2: unconditionalize patch for redefinition error musl This was previously conditionalized to avoid rebuilds Also remove the other two patches which are no longer required to build. --- pkgs/by-name/ip/iproute2/package.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index ea44bacf92f2..fd2e5d893031 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -26,20 +26,6 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchurl { - name = "musl-endian.patch"; - url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw"; - hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E="; - }) - (fetchurl { - name = "musl-basename.patch"; - url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw"; - hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM="; - }) - ] - # Temporarily gated to keep rebuild counts under control. - # The proper fix (targeted to staging) is done in https://github.com/NixOS/nixpkgs/pull/451397 - ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchurl { name = "musl-redefinition.patch"; url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw"; From 7a16e6212633ae74414052dad8ac21d03d972920 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 25 Oct 2025 14:53:50 +0100 Subject: [PATCH 0475/2279] nixos/clickhouse: tests: Add basic Selenium test --- nixos/tests/clickhouse/default.nix | 6 ++ nixos/tests/clickhouse/ui.nix | 118 +++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 nixos/tests/clickhouse/ui.nix diff --git a/nixos/tests/clickhouse/default.nix b/nixos/tests/clickhouse/default.nix index 88e01fcb1fdb..1299eb199f67 100644 --- a/nixos/tests/clickhouse/default.nix +++ b/nixos/tests/clickhouse/default.nix @@ -28,4 +28,10 @@ inherit package; }; }; + ui = runTest { + imports = [ ./ui.nix ]; + _module.args = { + inherit package; + }; + }; } diff --git a/nixos/tests/clickhouse/ui.nix b/nixos/tests/clickhouse/ui.nix new file mode 100644 index 000000000000..b49d8a8d8861 --- /dev/null +++ b/nixos/tests/clickhouse/ui.nix @@ -0,0 +1,118 @@ +{ + lib, + pkgs, + package, + ... +}: + +{ + name = "clickhouse-ui"; + + nodes = { + browser = + { + config, + pkgs, + ... + }: + { + environment.systemPackages = + let + clickhouseSeleniumScript = + pkgs.writers.writePython3Bin "clickhouse-selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } + '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("http://clickhouse:8123/play") + + wait = WebDriverWait(driver, 60) + + assert len(driver.find_elements( + By.ID, "query_div")) == 1 + + server_info_element = driver.find_element( + By.XPATH, "//span[@id='server_info']") + assert "${ + lib.strings.replaceStrings [ "-stable" "-lts" ] [ "" "" ] package.version + }" in server_info_element.text + + # Shouldn't show before query done + assert len(driver.find_elements( + By.CSS_SELECTOR, ".row-number")) == 0 + + query_box = driver.find_element( + By.XPATH, "//textarea[@id='query']") + query_box.click() + query_box.send_keys("SELECT 1") + + query_run_button = driver.find_element( + By.XPATH, "//button[@id='run']").click() + + # Now verify results shown + assert len(driver.find_elements( + By.XPATH, "//div[@id='check-mark']")) == 1 + + assert len(driver.find_elements( + By.CSS_SELECTOR, ".row-number")) == 2 + + driver.close() + ''; + in + with pkgs; + [ + curl + firefox-unwrapped + geckodriver + clickhouseSeleniumScript + ]; + }; + + clickhouse = + { config, pkgs, ... }: + { + networking.firewall.allowedTCPPorts = [ + 8123 + 9000 + ]; + + environment.etc = { + "clickhouse-server/config.d/listen.xml".text = '' + + :: + + ''; + }; + + services.clickhouse = { + enable = true; + inherit package; + }; + }; + }; + + testScript = '' + clickhouse.wait_for_unit("clickhouse") + clickhouse.wait_for_open_port(8123) + clickhouse.wait_for_open_port(9000) + + browser.systemctl("start network-online.target") + browser.wait_for_unit("network-online.target") + + browser.succeed("curl -kLs http://clickhouse:8123/play | grep 'ClickHouse Query'") + + # Ensure the application is actually rendered by the Javascript + browser.succeed("PYTHONUNBUFFERED=1 clickhouse-selenium-script") + ''; +} From 79e66e6c100435b5e5a8107d7665b49d84b182b0 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sat, 25 Oct 2025 11:44:48 -0400 Subject: [PATCH 0476/2279] sbcl: remove broken run-program test --- pkgs/development/compilers/sbcl/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 943c9ca627e2..5befbd94b476 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -152,6 +152,23 @@ stdenv.mkDerivation (self: { # Fail intermittently "gc.impure.lisp" "threads.pure.lisp" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # This test has a gotcha on Darwin which originally showed up in + # 57b36ea5c83a1841b174ec6cd5e423439fe9d7a0, and later again around Oct + # 2025 in staging. The test wants a clean environment (using + # run-program, akin to fork & execve), but darwin keeps injecting this + # envvar: + # + # __CF_USER_TEXT_ENCODING=0x15F:0:0 + # + # It’s not clear to maintainers where the problem lies exactly, but + # removing the test at least fixes the build and unblocks others. + # + # see: + # - https://github.com/NixOS/nixpkgs/pull/359214 + # - https://github.com/NixOS/nixpkgs/pull/453099 + "run-program.test.sh" ]; patches = From d0e837dde8735874974db6af21076b3c37572126 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Sat, 25 Oct 2025 10:15:49 -0700 Subject: [PATCH 0477/2279] cmake.setupHook: drop no-longer-helpful FIND_FRAMEWORK flag This was introduced in https://github.com/NixOS/nixpkgs/pull/37015, before the migration of Apple SDK frameworks to be included by default. More specifically, it breaks anything looking for `Network.framework` (such as qtbase 6.10) because it will prefer `libnetwork.tbd` over the framework. Fixes #455059. Supersedes #455458. --- pkgs/by-name/cm/cmake/setup-hook.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index 5e84594934f4..fe10b117dd4d 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -39,10 +39,6 @@ cmakeConfigurePhase() { prependToVar cmakeFlags "-DCMAKE_RANLIB=$(command -v $RANLIB)" prependToVar cmakeFlags "-DCMAKE_STRIP=$(command -v $STRIP)" - # on macOS we want to prefer Unix-style headers to Frameworks - # because we usually do not package the framework - prependToVar cmakeFlags "-DCMAKE_FIND_FRAMEWORK=LAST" - # correctly detect our clang compiler prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" From f1193203e18cbf69f67a713881790cab46b12147 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Sat, 25 Oct 2025 10:15:49 -0700 Subject: [PATCH 0478/2279] cmake.setupHook: drop outdated CMake policy This policy was introduced in CMake 3.0 (June 2014), and removed entirely in CMake 4.0. As this causes a world-rebuild we'd probably leave it alone except that I'm already changing the setup hook. --- pkgs/by-name/cm/cmake/setup-hook.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index fe10b117dd4d..01302284eb4f 100755 --- a/pkgs/by-name/cm/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh @@ -39,9 +39,6 @@ cmakeConfigurePhase() { prependToVar cmakeFlags "-DCMAKE_RANLIB=$(command -v $RANLIB)" prependToVar cmakeFlags "-DCMAKE_STRIP=$(command -v $STRIP)" - # correctly detect our clang compiler - prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" - # This installs shared libraries with a fully-specified install # name. By default, cmake installs shared libraries with just the # basename as the install name, which means that, on Darwin, they From 789cb71b17f7dd2c3c4979bef25e9fa03500747e Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 25 Oct 2025 14:14:36 -0400 Subject: [PATCH 0479/2279] libsForQt5.kf5gpgmepp: drop Unmaintained upstream since 2017. GnuPG has a maintained version of this now. --- .../libraries/kf5gpgmepp/default.nix | 38 ------------------- pkgs/top-level/qt5-packages.nix | 8 +++- 2 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 pkgs/development/libraries/kf5gpgmepp/default.nix diff --git a/pkgs/development/libraries/kf5gpgmepp/default.nix b/pkgs/development/libraries/kf5gpgmepp/default.nix deleted file mode 100644 index 826a2f25f3c6..000000000000 --- a/pkgs/development/libraries/kf5gpgmepp/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - mkDerivation, - lib, - fetchgit, - cmake, - extra-cmake-modules, - qtbase, - boost, - gpgme, -}: - -mkDerivation { - pname = "kf5gpgmepp"; - version = "16.08.3"; - - src = fetchgit { - url = "https://anongit.kde.org/gpgmepp.git"; - rev = "9826f6674e496ce575f606d17c318566381b3b15"; - sha256 = "02ck2l3s8s7xh44blqaqnc5k49ccicdnzvhiwa67a3zgicz5i0vh"; - }; - - buildInputs = [ - qtbase - boost - ]; - propagatedBuildInputs = [ gpgme ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - license = [ licenses.lgpl2 ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index c70f900e794b..73baf1bc0cc0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -92,8 +92,6 @@ makeScopeWithSplicing' { kdsoap = callPackage ../development/libraries/kdsoap { }; - kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; - kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { }; kimageannotator = callPackage ../development/libraries/kimageannotator { }; @@ -225,6 +223,12 @@ makeScopeWithSplicing' { xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; } + // lib.optionalAttrs config.allowAliases { + kf5gpgmepp = throw '' + 'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017. + Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead. + ''; # Added 2025-10-25 + } )) ); } From e6fbcd515b20613c2adf4ee184e4f3c30597f1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 12:17:39 -0700 Subject: [PATCH 0480/2279] diebahn: 2.8.2 -> 2.9.0 Diff: https://gitlab.com/schmiddi-on-mobile/railway/-/compare/2.8.2...2.9.0 Changelog: https://gitlab.com/schmiddi-on-mobile/railway/-/blob/2.9.0/CHANGELOG.md --- pkgs/by-name/di/diebahn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index abea858d30e7..b77125dd7e2d 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; tag = version; - hash = "sha256-pPjOl46R8hBpyKdwq/gwHv/qCtFkI0LVDsqxcQOgtkU="; + hash = "sha256-9ADJX2NFYv+l7umAmDLa1cO6wEnaNKu9SLzwJjfGrRM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-kxt6z2RaSnlso/Jz36B9VNwti2o3b8+Ggd4zDIjFf2c="; + hash = "sha256-OijGiVBGe4wmGN7e9xOnZRoF9HpiryGi+stqgBIrlzc="; }; nativeBuildInputs = [ From 7beda2a8ea4216abd80cc0ba2aef2ce247b28bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 12:22:52 -0700 Subject: [PATCH 0481/2279] libadwaita: 1.7.6 -> 1.7.8 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.7.6...1.7.8 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.7.8/NEWS --- pkgs/by-name/li/libadwaita/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 91c1f3cb8b1d..629f0fa4a4a7 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.7.6"; + version = "1.7.8"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-HpjP6VSkEAFeXIFXLbndQzEWJwVvHe6B3aSwCz6KiIM="; + hash = "sha256-KeBKrr5+PXSvdqVk74/JJL5F6U+GcDUod2rPwLQz0OY="; }; depsBuildBuild = [ From 64645cd0243ecb8bf4e75ceeae9823c4ff86c14b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Oct 2025 22:49:32 +0000 Subject: [PATCH 0482/2279] vim: 9.1.1833 -> 9.1.1869 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index de4362946baa..eb20cd063c8e 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.1833"; + version = "9.1.1869"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-bcHTwrJt7ERsIYydCj+Um4AY7sREtkdkqlEA0OdgnuM="; + hash = "sha256-AHx4AHsJAsEE5LRzKgBeV3LoCaoHUB+0/gq7kOHObMk="; }; enableParallelBuilding = true; From 84133ae0b76419e4d97b9fa6d004ecf28d92deb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 23:02:48 -0700 Subject: [PATCH 0483/2279] pdfmixtool: 1.1.1 -> 1.2.1 Diff: https://gitlab.com/scarpetta/pdfmixtool/-/compare/v1.1.1...1.2.1 --- .../office/pdfmixtool/default.nix | 32 ++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix index f19bd4dadf93..59c43ddb578f 100644 --- a/pkgs/applications/office/pdfmixtool/default.nix +++ b/pkgs/applications/office/pdfmixtool/default.nix @@ -1,55 +1,41 @@ { lib, - mkDerivation, + stdenv, fetchFromGitLab, - fetchpatch, - fetchpatch2, cmake, pkg-config, - qtbase, - qttools, + qt6Packages, qpdf, podofo, imagemagick, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pdfmixtool"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitLab { owner = "scarpetta"; repo = "pdfmixtool"; rev = "v${version}"; - hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8="; + hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE="; }; nativeBuildInputs = [ cmake pkg-config + qt6Packages.wrapQtAppsHook ]; buildInputs = [ imagemagick - qtbase - qttools + qt6Packages.poppler + qt6Packages.qtbase + qt6Packages.qttools qpdf podofo ]; - patches = [ - # fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1 - (fetchpatch { - url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff"; - hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I="; - }) - # https://gitlab.com/scarpetta/pdfmixtool/-/merge_requests/14 - (fetchpatch2 { - url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/268291317ccd1805dc1c801ff88641ba06c6a7f0.patch"; - hash = "sha256-56bDoFtE+IOQHcV9xPfyrgYYFvTfB0QiLIfRl91irb0="; - }) - ]; - meta = with lib; { description = "Application to split, merge, rotate and mix PDF files"; mainProgram = "pdfmixtool"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 911fdc7cdb23..8be8163c8b92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11865,7 +11865,7 @@ with pkgs; pcmanfm-qt = lxqt.pcmanfm-qt; - pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; + pdfmixtool = callPackage ../applications/office/pdfmixtool { }; pijuice = with python3Packages; toPythonApplication pijuice; From 7131f8ceac5513e5470ec4f669d217ebd39bfce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 23:10:35 -0700 Subject: [PATCH 0484/2279] pdfmixtool: move to pkgs/by-name --- .../default.nix => by-name/pd/pdfmixtool/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/office/pdfmixtool/default.nix => by-name/pd/pdfmixtool/package.nix} (100%) diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/by-name/pd/pdfmixtool/package.nix similarity index 100% rename from pkgs/applications/office/pdfmixtool/default.nix rename to pkgs/by-name/pd/pdfmixtool/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8be8163c8b92..2059b990523f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11865,8 +11865,6 @@ with pkgs; pcmanfm-qt = lxqt.pcmanfm-qt; - pdfmixtool = callPackage ../applications/office/pdfmixtool { }; - pijuice = with python3Packages; toPythonApplication pijuice; pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; }; From 5021ffab07a7d9491f2c366cfc65efe097dd3347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 22:45:44 -0700 Subject: [PATCH 0485/2279] qpdf: 11.10.1 -> 12.2.0 Diff: https://github.com/qpdf/qpdf/compare/v11.10.1...v12.2.0 Changelog: https://qpdf.readthedocs.io/en/12.2/release-notes.html --- pkgs/by-name/qp/qpdf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index 82c7ded43f25..039da8e282b6 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpdf"; - version = "11.10.1"; + version = "12.2.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; - rev = "v${finalAttrs.version}"; - hash = "sha256-MkJpbAIoPZmsYupOjQKOwZomh/rUF+r/kKTdHfT5Dc8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tzOZVQ/XO2mWNtz3mFTdrpdD2PvvCwje5nbEyiIkcZw="; }; outputs = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; mainProgram = "qpdf"; platforms = lib.platforms.all; - changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog"; + changelog = "https://qpdf.readthedocs.io/en/${lib.versions.majorMinor finalAttrs.version}/release-notes.html"; pkgConfigModules = [ "libqpdf" ]; }; }) From 2a364c6dca302dd5ac74aa6ce1437ec9e61a9826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 23:09:28 -0700 Subject: [PATCH 0486/2279] qpdf: add dotlambda to maintainers --- pkgs/by-name/qp/qpdf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index 039da8e282b6..e5f5ccc8df14 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://qpdf.sourceforge.io/"; description = "C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2 - maintainers = [ ]; + maintainers = [ lib.maintainers.dotlambda ]; mainProgram = "qpdf"; platforms = lib.platforms.all; changelog = "https://qpdf.readthedocs.io/en/${lib.versions.majorMinor finalAttrs.version}/release-notes.html"; From b1e4d9ec03a6ffd5ad0acf5468c8c01785110284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Oct 2025 22:40:32 -0700 Subject: [PATCH 0487/2279] python3Packages.pikepdf: 9.11.0 -> 10.0.0 Diff: https://github.com/pikepdf/pikepdf/compare/v9.11.0...v10.0.0 Changelog: https://github.com/pikepdf/pikepdf/blob/v10.0.0/docs/releasenotes/version10.md --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 6f92156c4ae9..8227e6c2e080 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.11.0"; + version = "10.0.0"; pyproject = true; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-mdH7bFfUzjSOOIhRK4GpizohFB82s8v9N2yEX2X/dms="; + hash = "sha256-DiNRjN4tnADaFOxLV9wdvJe9KEOb+h9IOSzaPGtGuk0="; }; patches = [ From c59d119baa58a71289b871ecc847bc343af87dfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 08:05:08 +0000 Subject: [PATCH 0488/2279] rdma-core: 59.0 -> 60.0 --- pkgs/by-name/rd/rdma-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rd/rdma-core/package.nix b/pkgs/by-name/rd/rdma-core/package.nix index c3fe8d64bdaa..6eeab6eed2ac 100644 --- a/pkgs/by-name/rd/rdma-core/package.nix +++ b/pkgs/by-name/rd/rdma-core/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "59.0"; + version = "60.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-GSARu2HNej4tI62RjLWkjS+5FKVbeNmX7jh0atlEpX0="; + hash = "sha256-2V8I/kcOr+/5JxyIAln/r7NnL6bET3vUPgg7PGNe1vc="; }; strictDeps = true; From 991423c5e9d2eaf53db3e5c428c12470b97534b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 08:49:28 +0000 Subject: [PATCH 0489/2279] javaPackages.compiler.openjdk25: 25+36 -> 25.0.1+8 --- pkgs/development/compilers/openjdk/25/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json index b34a8438ef74..26056e281d80 100644 --- a/pkgs/development/compilers/openjdk/25/source.json +++ b/pkgs/development/compilers/openjdk/25/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=", + "hash": "sha256-t5eUiWhAst3Aa16YVx7sMaHK6BHwLWyvxGfTq0C+Z4M=", "owner": "openjdk", "repo": "jdk25u", - "rev": "refs/tags/jdk-25+36" + "rev": "refs/tags/jdk-25.0.1+8" } From 90b1f66e989fe628d1508c43031c4fca18b02f62 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 26 Oct 2025 22:22:20 +0900 Subject: [PATCH 0490/2279] dockerTools: fix throw on invalid compressor --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9cd3aa0a7c18..8aedf460eb0d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -113,7 +113,7 @@ let compressorForImage = compressor: imageName: compressors.${compressor} - or (throw "in docker image ${imageName}: compressor must be one of: [${toString builtins.attrNames compressors}]"); + or (throw "in docker image ${imageName}: compressor must be one of: [${toString (builtins.attrNames compressors)}]"); in rec { From f24f3e939e758ae84d8f66f54dbf93705d11c354 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 26 Oct 2025 13:42:27 +0000 Subject: [PATCH 0491/2279] gleam: skip failing tests on x86_64-darwin --- pkgs/by-name/gl/gleam/package.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix index c19b47f20abb..92c711dac5e3 100644 --- a/pkgs/by-name/gl/gleam/package.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, git, @@ -46,6 +47,26 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # Makes a network request "--skip=tests::echo::echo_dict" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # Snapshot tests fail because a warning is shown on stdout + # warn: CPU lacks AVX support, strange crashes may occur. Reinstall Bun or use *-baseline build: + # https://github.com/oven-sh/bun/releases/download/bun-v1.3.1/bun-darwin-x64-baseline.zip + "--skip=tests::echo::echo_bitarray" + "--skip=tests::echo::echo_bool" + "--skip=tests::echo::echo_charlist" + "--skip=tests::echo::echo_circular_reference" + "--skip=tests::echo::echo_custom_type" + "--skip=tests::echo::echo_float" + "--skip=tests::echo::echo_function" + "--skip=tests::echo::echo_importing_module_named_inspect" + "--skip=tests::echo::echo_int" + "--skip=tests::echo::echo_list" + "--skip=tests::echo::echo_nil" + "--skip=tests::echo::echo_singleton" + "--skip=tests::echo::echo_string" + "--skip=tests::echo::echo_tuple" + "--skip=tests::echo::echo_with_message" ]; doInstallCheck = true; From ed2347dcec2b06fa1683c69160bb3202dac43f1a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Oct 2025 15:49:59 +0000 Subject: [PATCH 0492/2279] elfutils: 0.193 -> 0.194 Changes: https://www.mail-archive.com/elfutils-devel@sourceware.org/msg08584.html --- pkgs/by-name/el/elfutils/package.nix | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix index 9b69efdc42de..db1c0b053bd0 100644 --- a/pkgs/by-name/el/elfutils/package.nix +++ b/pkgs/by-name/el/elfutils/package.nix @@ -28,11 +28,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.193"; + version = "0.194"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-eFf0S2JPTY1CHfhRqq57FALP5rzdLYBJ8V/AfT3edjU="; + hash = "sha256-CeL/Az05uqiziKLX+8U5C/3pmuO3xnx9qvdDP7zw8B4="; }; patches = [ @@ -110,18 +110,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "strictflexarrays3" ]; - # build elfutils out-of-source-tree to avoid ./stack inclusion - # as a c++ header on libc++: https://sourceware.org/PR33103 - preConfigure = - if (stdenv.targetPlatform.useLLVM or false) then - '' - mkdir build-tree - cd build-tree - '' - else - null; - configureScript = if (stdenv.targetPlatform.useLLVM or false) then "../configure" else null; - configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" @@ -146,14 +134,6 @@ stdenv.mkDerivation rec { && (stdenv.hostPlatform == stdenv.buildPlatform); doInstallCheck = !stdenv.hostPlatform.isMusl && (stdenv.hostPlatform == stdenv.buildPlatform); - preCheck = '' - # Workaround lack of rpath linking: - # ./dwarf_srclang_check: error while loading shared libraries: - # libelf.so.1: cannot open shared object file: No such file or directory - # Remove once https://sourceware.org/PR32929 is fixed. - export LD_LIBRARY_PATH="$PWD/libelf:$LD_LIBRARY_PATH" - ''; - passthru.updateScript = gitUpdater { url = "https://sourceware.org/git/elfutils.git"; rev-prefix = "elfutils-"; From 82115da3eff2232edc52190318854c443264097b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 26 Oct 2025 18:53:39 +0100 Subject: [PATCH 0493/2279] courier-unicode: 2.3.2 -> 2.4.0 Changes: ``` 2.4.0 2025-08-24 Sam Varshavchik * Updated to the Unicode 16 standard. 2025-08-10 Sam Varshavchik * unicode.c: when a conversion error is encountered try to include the unconverted input in the output, as <##> sequences. 2025-08-07 Sam Varshavchik * unicodecpp.C (unicode::iconvert::convert): Fix null ptr dereference. 2025-05-25 Sam Varshavchik * Use C++17 features for templates. 2025-05-11 Sam Varshavchik * ABI break. Update the C++ API to C++17. Several functions' std::u32string parameter replaced with a std::u32string_view, where possible. Fill in a small functional gap, implement unicode::totitle(). ``` --- pkgs/by-name/co/courier-unicode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix index e8c757e1a395..c62ac7747720 100644 --- a/pkgs/by-name/co/courier-unicode/package.nix +++ b/pkgs/by-name/co/courier-unicode/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "courier-unicode"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2"; - sha256 = "sha256-tkXS8AqrvGgjIO3mlspQIBJm9xChvOxKxQQmlcmef2k="; + hash = "sha256-6Ay88OOmzC56Z+waGDDWxOiqD/aXcy7B0R5UTg5kVw8="; }; nativeBuildInputs = [ From e62b630bcfc15e69dd57b4c227cbf93f894de20b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 26 Oct 2025 18:56:33 +0100 Subject: [PATCH 0494/2279] maildrop: 3.1.8 -> 3.2.1 https://sourceforge.net/p/courier/mailman/message/59250698/ https://www.openwall.com/lists/oss-security/2025/10/26/1 Changes: ``` 3.2.1 2025-10-23 Sam Varshavchik * Fix MIME parsing bugs 3.2.0 2025-09-09 Sam Varshavchik * mailbot: reimplemented in C++ using the new C++ MIME library. 2025-08-31 Sam Varshavchik * reformail: reimplemented in C++ using the new C++ MIME library. Compare E-mail addresses (for -r, and other options), case-insensitively. 2025-08-16 Sam Varshavchik * reformime: reimplemented in C++ using the new C++ MIME library. 2025-04-27 Sam Varshavchik * all: low level MIME parsing code reimplemented in C++, the C code remains in place, with some changes. * maildrop: update the low-level message header parsing code, used by getaddr() and hasaddr() functions, and the reformail tool. 2024-09-21 Sam Varshavchik * packaging: Fix rpm packaging, use a synthesized changelog entry with the current date, to set the rpmbuild epoch date. 2024-09-07 Sam Varshavchik * packaging: deb packaging fixes. ``` --- pkgs/by-name/ma/maildrop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maildrop/package.nix b/pkgs/by-name/ma/maildrop/package.nix index 3f222a427293..3dc4970918d7 100644 --- a/pkgs/by-name/ma/maildrop/package.nix +++ b/pkgs/by-name/ma/maildrop/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "maildrop"; - version = "3.1.8"; + version = "3.2.1"; src = fetchurl { url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2"; - sha256 = "sha256-foJsAxkXRE8berccH82QODWVZEhG4rOyYONSsc4D6VA="; + hash = "sha256-PFiQ9NQzItTmPz6Aw6YJzeYF9ylm1iNPyIZBjZSdJLk="; }; nativeBuildInputs = [ pkg-config ]; From d10f042142e30aa9c04a7259c804eef8ef455840 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Oct 2025 18:36:57 +0000 Subject: [PATCH 0495/2279] gfal2-util: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/gfal2-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gfal2-util/default.nix b/pkgs/development/python-modules/gfal2-util/default.nix index 1813d3bd285e..7485f05c4dc9 100644 --- a/pkgs/development/python-modules/gfal2-util/default.nix +++ b/pkgs/development/python-modules/gfal2-util/default.nix @@ -11,13 +11,13 @@ }: (buildPythonPackage rec { pname = "gfal2-util"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2-util"; rev = "v${version}"; - hash = "sha256-BJR2fPj9nDXYU0X1HO2k3PiGMM2s8lU7+5SLadxw55Y="; + hash = "sha256-KKtbxr64FsMUIGXPk3yz66dbQVNCWoGbq3/+q47tS6Q="; }; # Replace the ad-hoc python executable finding From 93a4dd9469680ca184a4080968bfe66dac06bdc9 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 21 Oct 2025 19:35:09 -0700 Subject: [PATCH 0496/2279] atuin: 18.8.0 -> 18.10.0 --- pkgs/by-name/at/atuin/package.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index b4638170f815..be7053870fca 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.8.0"; + version = "18.10.0"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; tag = "v${finalAttrs.version}"; - hash = "sha256-FJEXIxdeg6ExXvrQ3dtugMK5xw+NwWyB+ld9rj7okoU="; + hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M="; }; - cargoHash = "sha256-xJPSMu22Bq9Panrafsd5vUSnEQYuJB19OEZaAq8z0mw="; + cargoHash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. @@ -41,13 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/atuin gen-completions -s zsh) ''; - passthru = { - tests = { - inherit (nixosTests) atuin; - }; - updateScript = nix-update-script { }; - }; - checkFlags = [ # tries to make a network access "--skip=registration" @@ -56,11 +49,19 @@ rustPlatform.buildRustPackage (finalAttrs: { # PermissionDenied (Operation not permitted) "--skip=change_password" "--skip=multi_user_test" - "--skip=store::var::tests::build_vars" - # Tries to touch files - "--skip=build_aliases" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + passthru = { + tests = { + inherit (nixosTests) atuin; + }; + updateScript = nix-update-script { }; + }; + meta = { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/atuinsh/atuin"; From d0066b97841d06dfb24d7d22464580e5c4ef80ed Mon Sep 17 00:00:00 2001 From: nat Date: Sun, 26 Oct 2025 23:33:11 +0100 Subject: [PATCH 0497/2279] cfn-changeset-viewer: switch to nix-update-script --- pkgs/by-name/cf/cfn-changeset-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix index ca55f2accb1f..8a4af1eb04b1 100644 --- a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix +++ b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix @@ -1,8 +1,8 @@ { buildNpmPackage, fetchFromGitHub, - gitUpdater, lib, + nix-update-script, versionCheckHook, }: @@ -27,7 +27,7 @@ buildNpmPackage rec { versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = nix-update-script { }; meta = { description = "CLI to view the changes calculated in a CloudFormation ChangeSet in a more human-friendly way"; From 1d0624ac373ccac132313addc5943d5ce3fc1ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Oct 2025 15:33:58 -0700 Subject: [PATCH 0498/2279] linux: remove pie from hardeningDisable --- pkgs/os-specific/linux/kernel/build.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix index da50861fb459..1f18ade92c44 100644 --- a/pkgs/os-specific/linux/kernel/build.nix +++ b/pkgs/os-specific/linux/kernel/build.nix @@ -197,7 +197,6 @@ lib.makeOverridable ( "fortify" "stackprotector" "pic" - "pie" ]; ${if isModular then "outputs" else null} = [ From 48bce76524412f509cbe4f6d96ac9384d9c424b7 Mon Sep 17 00:00:00 2001 From: nat Date: Sun, 26 Oct 2025 23:36:16 +0100 Subject: [PATCH 0499/2279] cfn-changeset-viewer: 0.2.1 -> 0.3.6 --- pkgs/by-name/cf/cfn-changeset-viewer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix index 8a4af1eb04b1..ec2f8037ad5c 100644 --- a/pkgs/by-name/cf/cfn-changeset-viewer/package.nix +++ b/pkgs/by-name/cf/cfn-changeset-viewer/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "cfn-changeset-viewer"; - version = "0.2.1"; + version = "0.3.6"; src = fetchFromGitHub { owner = "trek10inc"; repo = "cfn-changeset-viewer"; tag = version; - hash = "sha256-PPMmU5GMxxzBiTNAv/Rbtvkl5QK1BZjW4TJLT7xlpw4="; + hash = "sha256-hz1woGmJYOVGuu52DPPwkfbA49F/0hsxoAU6tiTvJx0="; }; - npmDepsHash = "sha256-ICaGtofENMaAjk/KGRn8RgpMAICSttx4AIcbi1HsW8Q="; + npmDepsHash = "sha256-NyWZ+8ArlUCsuBN5wZA9vnuX/3HFtuI42/V1+RIKom0="; dontNpmBuild = true; From 7bff6223a9bce201d89550e06d2105ab1542dcac Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Mon, 27 Oct 2025 02:13:10 +0300 Subject: [PATCH 0500/2279] chatzone-desktop: 5.4.1 -> 5.5.0 --- pkgs/by-name/ch/chatzone-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix index 8937af5b3287..f589409a1c01 100644 --- a/pkgs/by-name/ch/chatzone-desktop/package.nix +++ b/pkgs/by-name/ch/chatzone-desktop/package.nix @@ -10,10 +10,10 @@ let pname = "chatzone-desktop"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.4.1/872/chatzone-desktop-linux-5.4.1.AppImage"; - hash = "sha256-ONr8rIP7oXtafACkW4fDHfYew83F4R8un+hGdVI75iA="; + url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.5.0/925/chatzone-desktop-linux-5.5.0.AppImage"; + hash = "sha256-2Ly0qABTqleqH0AoAIJ+JNYFyoikxZroiFrYwSxBtdw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in From b417c65d74019301da1f2bbb92cef2058e07e502 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 03:19:39 +0000 Subject: [PATCH 0501/2279] matugen: 2.4.1 -> 3.0.0 --- pkgs/by-name/ma/matugen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 0c3897632d54..bbaa40dfa15a 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "matugen"; - version = "2.4.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; tag = "v${version}"; - hash = "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk="; + hash = "sha256-2VcdnUjIOEMQ87K5wv+Pbgko94PLygp1nrEYcVHk1v4="; }; - cargoHash = "sha256-ZCH8ka740X/yRbn4Mbno63jZifPMEaDABsftS3juDTo="; + cargoHash = "sha256-HBAsCrD/njZUYkjcaUaTS7xMwfUWLpDXkpIPWSdCvqo="; meta = { description = "Material you color generation tool"; From 2b4c4d16a04ca2163a20af434746ad10ea9753f6 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 9 Oct 2025 16:40:32 +0200 Subject: [PATCH 0502/2279] ares: 145 -> 146 --- pkgs/by-name/ar/ares/darwin-build-fixes.patch | 14 +++++++------- pkgs/by-name/ar/ares/package.nix | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ar/ares/darwin-build-fixes.patch b/pkgs/by-name/ar/ares/darwin-build-fixes.patch index 96b07f2ee141..4457b36c5e8d 100644 --- a/pkgs/by-name/ar/ares/darwin-build-fixes.patch +++ b/pkgs/by-name/ar/ares/darwin-build-fixes.patch @@ -24,15 +24,15 @@ index 3777ac98a..07ff17009 100644 install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application) endif() diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake -index 39c339428..dafb58c66 100644 +index 7b594bb4a..18e886fe7 100644 --- a/ruby/cmake/os-macos.cmake +++ b/ruby/cmake/os-macos.cmake -@@ -43,7 +43,7 @@ target_link_libraries( +@@ -41,7 +41,7 @@ target_link_libraries( + ) + if(SDL_FOUND) - target_link_libraries( - ruby -- PRIVATE "$" -+ PRIVATE "$" - ) +- target_link_libraries(ruby PRIVATE "$") ++ target_link_libraries(ruby PRIVATE "$") endif() + if(librashader_FOUND) diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 39d4bb316fba..31dbaa0fb4ed 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -3,7 +3,7 @@ alsa-lib, apple-sdk_14, cmake, - fetchFromGitHub, + fetchzip, gtk3, gtksourceview3, libGL, @@ -29,13 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "145"; + version = "146"; - src = fetchFromGitHub { - owner = "ares-emulator"; - repo = "ares"; - tag = "v${finalAttrs.version}"; - hash = "sha256-es+K5+qlK7FcJCFEIMcOsXCZSnoXEEmtS0yhpCvaILM"; + src = fetchzip { + url = "https://github.com/ares-emulator/ares/releases/download/v${finalAttrs.version}/ares-source.tar.gz"; + hash = "sha256-D4N0u9NNlhs4nMoUrAY+sg6Ybt1xQPMiH1u0cV0Qixs="; + stripRoot = false; }; nativeBuildInputs = [ @@ -80,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ARES_BUILD_LOCAL" false) (lib.cmakeBool "ARES_SKIP_DEPS" true) + (lib.cmakeBool "ARES_BUILD_OFFICIAL" true) ]; postInstall = From c5f9fa052a5091283335c22d20b8c3602f0741b6 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 27 Oct 2025 06:30:15 +0000 Subject: [PATCH 0503/2279] apostrophe: 3.2 -> 3.4 Diff: https://gitlab.gnome.org/World/apostrophe/-/compare/v3.2...v3.4 --- pkgs/by-name/ap/apostrophe/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 1d63ca61b2ce..63105c63311a 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -20,14 +20,14 @@ }: let - version = "3.2"; + version = "3.4"; src = fetchFromGitLab { owner = "World"; repo = "apostrophe"; domain = "gitlab.gnome.org"; rev = "refs/tags/v${version}"; - hash = "sha256-NPpBu6Wmd8z99vzVQ394CyHRV2RQBtkbuqcaFqKqlkQ="; + hash = "sha256-Sj5Y4QPMYavdXbU+iVv76qOFNhgBjAeX9+/TvQHZzeI="; }; reveal-js = fetchFromGitHub { @@ -87,6 +87,7 @@ python312Packages.buildPythonApplication { pypandoc chardet levenshtein + regex ]; dontWrapGApps = true; From 15986ca7ea82551043917b6339afd6c82092f3b7 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 27 Oct 2025 06:30:24 +0000 Subject: [PATCH 0504/2279] biblioteca: 1.6 -> 1.7 Diff: https://github.com/workbenchdev/Biblioteca/compare/v1.6...v1.7 --- pkgs/by-name/bi/biblioteca/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix index df7d93fd492f..d35040b3ad11 100644 --- a/pkgs/by-name/bi/biblioteca/package.nix +++ b/pkgs/by-name/bi/biblioteca/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "biblioteca"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "workbenchdev"; repo = "Biblioteca"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-9AL8obvXB/bgqhTw8VE30OytNFQmxvJ6TYGN8ir+NfI="; + hash = "sha256-PRm/4t0f8AExOFXCcV7S+JIKkJgYP1gego2xTUbj7FY="; }; patches = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja + blueprint-compiler desktop-file-utils makeShellWrapper gjs @@ -70,9 +71,6 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace src/meson.build \ - --replace-fail "/app/bin/blueprint-compiler" "${lib.getExe blueprint-compiler}" \ - patchShebangs . substituteInPlace build-aux/build-index.js \ From fc390ff82d1c0d7a945f1648005ea568db45e60d Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 27 Oct 2025 06:31:16 +0000 Subject: [PATCH 0505/2279] eartag: 0.6.5 -> 1.0.2 Changelog: https://gitlab.gnome.org/World/eartag/-/releases/1.0.2 Diff: https://gitlab.gnome.org/World/eartag/-/compare/0.6.5..1.0.2 --- pkgs/by-name/ea/eartag/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/eartag/package.nix b/pkgs/by-name/ea/eartag/package.nix index 46ec9fd4ea5a..4431f6407942 100644 --- a/pkgs/by-name/ea/eartag/package.nix +++ b/pkgs/by-name/ea/eartag/package.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.6.5"; + version = "1.0.2"; format = "other"; src = fetchFromGitLab { @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "eartag"; rev = version; - hash = "sha256-sxVivQppX8KdkvHaW6xQ64Wi8Nfv5Rmwf4NADBDpOOo="; + hash = "sha256-Iwfk0SqxYF2bzkKZNqGonJh8MQ2c+K1wN0o4GECR/Rw="; }; postPatch = '' @@ -61,6 +61,8 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + aiofiles + aiohttp pygobject3 eyed3 pillow @@ -68,6 +70,7 @@ python3Packages.buildPythonApplication rec { pytaglib python-magic pyacoustid + xxhash ]; dontWrapGApps = true; @@ -82,6 +85,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/eartag"; description = "Simple music tag editor"; + changelog = "https://gitlab.gnome.org/World/eartag/-/releases/${version}"; # This seems to be using ICU license but we're flagging it to MIT license # since ICU license is a modified version of MIT and to prevent it from # being incorrectly identified as unfree software. From 3eed620a17447b535ee8fab0b3793d657211b001 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Mon, 27 Oct 2025 01:22:03 -0700 Subject: [PATCH 0506/2279] Revert "qt6.qtbase: override bad cmakeFlag in setup hook; fix finding frameworks" This reverts commit dd9fbf60a7167fe933a1ee5fee01a7f9476d5771. --- pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index b16805ed09c2..ab35d1906f73 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -292,9 +292,6 @@ stdenv.mkDerivation rec { # When this variable is not set, cmake tries to execute xcodebuild # to query the version. "-DQT_INTERNAL_XCODE_VERSION=0.1" - # This should be removed once https://github.com/NixOS/nixpkgs/pull/455592 makes it to master - # as it will become redundant. - "-DCMAKE_FIND_FRAMEWORK=FIRST" ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" From b4634379d3350b8c59dade2fa8e0f984a1651092 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 27 Oct 2025 06:32:33 +0000 Subject: [PATCH 0507/2279] mangojuice: 0.8.6 -> 0.8.8 Diff: https://github.com/radiolamp/mangojuice/compare/0.8.6...0.8.8 Changelog: https://github.com/radiolamp/mangojuice/releases/tag/0.8.8 --- pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch | 2 +- pkgs/by-name/ma/mangojuice/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch b/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch index 194574d7f86f..8581d992b133 100644 --- a/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch +++ b/pkgs/by-name/ma/mangojuice/fix-vkbasalt-path.patch @@ -6,7 +6,7 @@ index 8c2cbef..46e7f73 100644 } async bool check_vkbasalt_installed_async () { -- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so" }; +- string[] paths = { "/usr/lib/libvkbasalt.so", "/usr/lib/x86_64-linux-gnu/libvkbasalt.so", "/usr/local/lib/libvkbasalt.so", "/usr/lib64/vkbasalt/libvkbasalt.so" }; + string[] paths = { "@vkbasalt@" }; foreach (var path in paths) { if (FileUtils.test (path, FileTest.EXISTS)) { diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index 4f98f7961fff..5372ee5cf470 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -25,13 +25,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mangojuice"; - version = "0.8.6"; + version = "0.8.8"; src = fetchFromGitHub { owner = "radiolamp"; repo = "mangojuice"; tag = finalAttrs.version; - hash = "sha256-EVjKO+03o8es2t2/K1QuUIhXey7+2VNF37yXiMrv4o4="; + hash = "sha256-M8aKS360AsgoSKCyZXdtD7SbMDvK6OgAuNoGa68NZRQ="; }; patches = [ From 23a6ee04d7fa3f31350308b6cb8589fe230164e9 Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Mon, 27 Oct 2025 13:05:55 +0200 Subject: [PATCH 0508/2279] vrcx: 2025.10.11 -> 2025.10.27 --- pkgs/by-name/vr/vrcx/deps.json | 37 ++++++++++++++------------------ pkgs/by-name/vr/vrcx/package.nix | 12 +++++------ 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/vr/vrcx/deps.json b/pkgs/by-name/vr/vrcx/deps.json index 3fd3e1ebb50c..907d3845da09 100644 --- a/pkgs/by-name/vr/vrcx/deps.json +++ b/pkgs/by-name/vr/vrcx/deps.json @@ -96,8 +96,8 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "9.0.8", - "hash": "sha256-c5gFYcyAO7OgG3K+QPh0HrKJ4GKLIR0R9E69zf0TImk=" + "version": "9.0.9", + "hash": "sha256-5p9c8PwLC5whnkDnk7BvMLIln2RuaKdzdLjpUZDHU98=" }, { "pname": "Newtonsoft.Json", @@ -106,13 +106,13 @@ }, { "pname": "Newtonsoft.Json", - "version": "13.0.3", - "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" }, { "pname": "NLog", - "version": "6.0.3", - "hash": "sha256-lrF4+wTsVr7/hD9sJVAMk3+zwH7JMoOEw/pCZm3ki4g=" + "version": "6.0.5", + "hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY=" }, { "pname": "runtime.any.System.Runtime", @@ -181,8 +181,8 @@ }, { "pname": "System.CodeDom", - "version": "9.0.8", - "hash": "sha256-gDsK8Vc4RQvg1erKCpP4GH2OzV6icGD3UHymANiQ1n4=" + "version": "9.0.9", + "hash": "sha256-ajVuEZIA63vQBPPw/SgoTDSA+gGAU7V+QCcBts1LiTE=" }, { "pname": "System.Collections.Immutable", @@ -231,13 +231,13 @@ }, { "pname": "System.Drawing.Common", - "version": "9.0.8", - "hash": "sha256-D+mrysKnc/zxYLt3tvTBKGO5HXGJTSZU5oOJ5X5EHDs=" + "version": "9.0.9", + "hash": "sha256-gupTW+JBaIaifxULV5m2Q8fccXIboeGd3FI33cn4MFs=" }, { "pname": "System.Management", - "version": "9.0.8", - "hash": "sha256-n6lutagH+MqKDTL0fc0yK1YgreGR4IlP/O0y1fjOqIg=" + "version": "9.0.9", + "hash": "sha256-BjnQqiA2z8SkicxP+71lR+WGrBHz9np7MlCUE3oO8IM=" }, { "pname": "System.Memory", @@ -316,19 +316,14 @@ }, { "pname": "System.Text.Json", - "version": "9.0.8", - "hash": "sha256-CEoLOj0KeuctK2jXd6yZ+/5yx4apsEh7+xsJH95h/1c=" + "version": "9.0.9", + "hash": "sha256-I+GCgXZZUtgAta94BIBqy72HnZJ3egzNBOTxnVy2Ur8=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.1", "hash": "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM=" }, - { - "pname": "System.Threading.Channels", - "version": "8.0.0", - "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" - }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.4", @@ -341,7 +336,7 @@ }, { "pname": "Websocket.Client", - "version": "5.2.0", - "hash": "sha256-5sVfK1iHclxunfm0ioSFFyo5tG8lPfchClBi4YgeJT4=" + "version": "5.3.0", + "hash": "sha256-FgrtCEVMspgLx5jRwJobE1oiK+dWCl4cXoIfH2/kSGk=" } ] diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index db80c19e8455..9b1545f322d7 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -4,30 +4,30 @@ buildDotnetModule, dotnetCorePackages, buildNpmPackage, - electron_37, + electron_38, makeWrapper, copyDesktopItems, makeDesktopItem, stdenv, }: let - electron = electron_37; + electron = electron_38; dotnet = dotnetCorePackages.dotnet_9; in buildNpmPackage (finalAttrs: { pname = "vrcx"; - version = "2025.10.11"; + version = "2025.10.27"; src = fetchFromGitHub { repo = "VRCX"; owner = "vrcx-team"; - rev = "cb6bc979d9371b89b289b6cb0bb8b6f60b350bc7"; - hash = "sha256-0LnFXSLyby5b2gSIse7Qld4cQlwNAFHSuGGqk6B9TZY="; + rev = "5c3d076e10f7edb09831fba0d5ad44036a43a401"; + hash = "sha256-XLzUfOXqikJOb8cmnpMI/SLeF6Jnuo4Xvmi8jfgt71Q="; }; makeCacheWritable = true; npmFlags = [ "--ignore-scripts" ]; - npmDepsHash = "sha256-giWeXrsiFaZOh5zs7L4L0w3wcnD/F3TyrMM/POfOTvE="; + npmDepsHash = "sha256-pghoOI/lotorjCAFGoFjhEx3H7h9J8LhctCMfk6ZTYI="; nativeBuildInputs = [ makeWrapper From c3dc0c97a4c715b8dff6af301e7734924bb310cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 11:17:27 +0000 Subject: [PATCH 0509/2279] grafanaPlugins.grafana-lokiexplore-app: 1.0.29 -> 1.0.30 --- .../grafana/plugins/grafana-lokiexplore-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 95c4b0b184e6..d7edfda21e87 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "1.0.29"; - zipHash = "sha256-YgEMK79KRW3r8rVel+JVf5nWsT1XzYm0L+t5NA2rrdA="; + version = "1.0.30"; + zipHash = "sha256-K22UgO5wdZk6G4zgJk84+sanj2GVoroJdooLNLu40ts="; meta = with lib; { description = "Browse Loki logs without the need for writing complex queries"; license = licenses.agpl3Only; From 52075708d7d07efb699263da5e09b82874d06c75 Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Mon, 27 Oct 2025 13:23:01 +0200 Subject: [PATCH 0510/2279] maintainers: Update ShyAssassin --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22b41192bc54..9cec647bf665 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23877,6 +23877,7 @@ githubId = 49711232; github = "ShyAssassin"; email = "ShyAssassin@assassin.dev"; + keys = [ { fingerprint = "370E 8296 12AF D0E1 9A1A 88F6 AA81 2447 4716 E56D"; } ]; }; shyim = { email = "s.sayakci@gmail.com"; From 5c44839fe9e88b5d470b5ce669d6aa53f0431b6f Mon Sep 17 00:00:00 2001 From: NilaTheDragon Date: Mon, 27 Oct 2025 13:18:08 +0100 Subject: [PATCH 0511/2279] proxyman: 3.2.0 -> 3.4.0 --- pkgs/by-name/pr/proxyman/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix index 55299e114217..4a8143dd7f98 100644 --- a/pkgs/by-name/pr/proxyman/package.nix +++ b/pkgs/by-name/pr/proxyman/package.nix @@ -6,11 +6,11 @@ }: let pname = "proxyman"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage"; - hash = "sha256-u6Lu5blU1z7UJyiBZFj/dqKeoCfMniXz6ul2TQwaOqI="; + hash = "sha256-fwkFQOeHb049qFChLfyU20L6mJCDnrcK2HM9PljUdUg="; }; appimageContents = appimageTools.extract { From 99467bc91689d88ed1d43137d34277707997faec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 12:24:53 +0000 Subject: [PATCH 0512/2279] python3Packages.gfal2-python: 1.13.0 -> 1.13.1 --- pkgs/development/python-modules/gfal2-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix index 4cd4cf2e151e..9447781cfb89 100644 --- a/pkgs/development/python-modules/gfal2-python/default.nix +++ b/pkgs/development/python-modules/gfal2-python/default.nix @@ -13,13 +13,13 @@ }: buildPythonPackage rec { pname = "gfal2-python"; - version = "1.13.0"; + version = "1.13.1"; format = "setuptools"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2-python"; rev = "v${version}"; - hash = "sha256-TF8EwT1UEtB9lhfq8Jkn9rrSkSxMSLzuAywfB23K1kE="; + hash = "sha256-OUpsnKSsFOhiSg0npJW/9Htl4XNt/6zEPuB9nd6b43w="; }; nativeBuildInputs = [ cmake From 58daf511687f191829238fc7f571e08dc9dedf56 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Mon, 27 Oct 2025 12:32:38 +0000 Subject: [PATCH 0513/2279] highs: 1.10.0 -> 1.12.0 --- pkgs/by-name/hi/highs/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 60bdf77d2e81..9fa7ecbaeb9a 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -8,23 +8,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "highs"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac="; + hash = "sha256-FRiYtbl1kWEkHHEIIOpefC9UdusmJKl6UmP3dKRkAXA="; }; - # CMake Error in CMakeLists.txt: - # Imported target "highs::highs" includes non-existent path - # "/include" - # in its INTERFACE_INCLUDE_DIRECTORIES. - postPatch = '' - sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt - ''; - strictDeps = true; outputs = [ "out" ]; From 985ca1f0b16090d5aa983ff7b43f8939ec8eb154 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Mon, 27 Oct 2025 12:33:31 +0000 Subject: [PATCH 0514/2279] maintainers: add galabovaa --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22b41192bc54..3b9a47c508b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9092,6 +9092,12 @@ githubId = 7047019; name = "Florent Becker"; }; + galabovaa = { + name = "Ivet Galabova"; + email = "galabovaa@gmail.com"; + github = "galabovaa"; + githubId = 4016566; + }; galagora = { email = "lightningstrikeiv@gmail.com"; github = "Galagora"; From a2d026d6e5393b9fefac492c37ec449794d50c1b Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Mon, 27 Oct 2025 12:37:18 +0000 Subject: [PATCH 0515/2279] highs: add maintainer galabovaa --- pkgs/by-name/hi/highs/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 9fa7ecbaeb9a..de05d314776b 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; platforms = platforms.all; mainProgram = "highs"; - maintainers = with maintainers; [ silky ]; + maintainers = with maintainers; [ + galabovaa + silky + ]; }; }) From 30166dda2db6bf12258c4174d27ba61cd06a5ef8 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 27 Oct 2025 10:00:10 -0300 Subject: [PATCH 0516/2279] fritzing: move to by-name --- .../fr}/fritzing/fix-stricter-types.patch | 0 .../fritzing/default.nix => by-name/fr/fritzing/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/science/electronics => by-name/fr}/fritzing/fix-stricter-types.patch (100%) rename pkgs/{applications/science/electronics/fritzing/default.nix => by-name/fr/fritzing/package.nix} (100%) diff --git a/pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch b/pkgs/by-name/fr/fritzing/fix-stricter-types.patch similarity index 100% rename from pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch rename to pkgs/by-name/fr/fritzing/fix-stricter-types.patch diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/by-name/fr/fritzing/package.nix similarity index 100% rename from pkgs/applications/science/electronics/fritzing/default.nix rename to pkgs/by-name/fr/fritzing/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e61510636ce..9cfd1c24c1b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10997,8 +10997,6 @@ with pkgs; sqlite = sqlite.override { enableDeserialize = true; }; }; - fritzing = qt6Packages.callPackage ../applications/science/electronics/fritzing { }; - fvwm = fvwm2; gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; From 5a137b91eb39f95fbbf996391645ae9e9a2fef91 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 27 Oct 2025 10:24:56 -0300 Subject: [PATCH 0517/2279] fritzing: 1.0.5 -> 1.0.6 --- pkgs/by-name/fr/fritzing/package.nix | 49 ++++++++++++---------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/fr/fritzing/package.nix b/pkgs/by-name/fr/fritzing/package.nix index 3977ac1249f2..17bdcf72565f 100644 --- a/pkgs/by-name/fr/fritzing/package.nix +++ b/pkgs/by-name/fr/fritzing/package.nix @@ -2,32 +2,25 @@ stdenv, lib, fetchFromGitHub, - wrapQtAppsHook, - qmake, + kdePackages, pkg-config, - qtbase, - qtsvg, - qttools, - qtserialport, - qtwayland, - qt5compat, + qt6, boost, libngspice, libgit2, - quazip, clipper, }: let - # SHA256 of the fritzing-parts HEAD on the master branch, + # SHA256 of the fritzing-parts HEAD on the develop branch, # which contains the latest stable parts definitions - partsSha = "4f7d39b22a6c307e6cca62c7f78eae96696e8b2c"; + partsSha = "73bc0559bb8399b2f895d68f032e41d7efc720c0"; parts = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-parts"; rev = partsSha; - hash = "sha256-mAzY5CVZJF5hAvWVlDiYRxoB+9mGDG9OI/8n9aY5aFE="; + hash = "sha256-2aXvSXWjQliEChQGhcCicOVoAqeNdeq69wQVYQsd2ew="; }; # Header-only library @@ -41,13 +34,13 @@ in stdenv.mkDerivation { pname = "fritzing"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-app"; - rev = "b9add9eaa7c426963de20c8514a69d3f15e83bdf"; - hash = "sha256-OnIX+2eXT0JAs6VgSAIr1t+2DhpoUDgKVGPFjjZrKas="; + rev = "04e5bb0241e8f1de24d0fce9be070041c6d5b68e"; + hash = "sha256-JlqBdzWscJoD859KMYgT/af41WNWThP65K3zh2PC2jM="; }; patches = [ @@ -56,25 +49,25 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - qmake + kdePackages.qmake pkg-config - qttools - wrapQtAppsHook + qt6.qttools + kdePackages.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtsvg - qtserialport - qt5compat + qt6.qtbase + qt6.qtsvg + qt6.qtserialport + kdePackages.qt5compat boost libgit2 - quazip + kdePackages.quazip libngspice clipper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6.qtwayland ]; postPatch = '' @@ -89,7 +82,7 @@ stdenv.mkDerivation { --replace-fail 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' substituteInPlace phoenix.pro \ - --replace-fail "6.5.10" "${qtbase.version}" + --replace-fail "6.5.10" "${qt6.qtbase.version}" substituteInPlace src/simulation/ngspice_simulator.cpp \ --replace-fail 'path + "/" + libName' '"${libngspice}/lib/libngspice.so"' @@ -101,13 +94,13 @@ stdenv.mkDerivation { env = { NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( [ - "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" + "-I${lib.getDev kdePackages.quazip}/include/QuaZip-Qt${lib.versions.major qt6.qtbase.version}-${kdePackages.quazip.version}" "-I${svgpp}/include" "-I${clipper}/include/polyclipping" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-F${qt5compat}/lib" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-F${kdePackages.qt5compat}/lib" ] ); - NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; + NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qt6.qtbase.version}"; }; qmakeFlags = [ From 2f5b43c1c203d165c5b13a18cea20fb08d7eab5b Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:12:54 +0100 Subject: [PATCH 0518/2279] kgraphviewer: fix build with CMake 4 Link: https://github.com/NixOS/nixpkgs/issues/445447 --- .../kg/kgraphviewer/cmake-minimum-required.patch | 10 ++++++++++ pkgs/by-name/kg/kgraphviewer/package.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch diff --git a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch new file mode 100644 index 000000000000..19ca4a46ec88 --- /dev/null +++ b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03dfe43..33553f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.10) + cmake_policy(SET CMP0048 NEW) + project(kgraphviewer VERSION "2.4.3") + set(KGRAPHVIEWERLIB_SOVERION 3) diff --git a/pkgs/by-name/kg/kgraphviewer/package.nix b/pkgs/by-name/kg/kgraphviewer/package.nix index 27320c563890..797ed6c7fb30 100644 --- a/pkgs/by-name/kg/kgraphviewer/package.nix +++ b/pkgs/by-name/kg/kgraphviewer/package.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l"; }; + patches = [ ./cmake-minimum-required.patch ]; + buildInputs = [ libsForQt5.qtbase libsForQt5.qtsvg From aad10bf5b29cb462e5dbd69b9f0ef0d92d58b3c7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 27 Oct 2025 15:55:15 +0200 Subject: [PATCH 0519/2279] python31{2,3}.pkgs.uncertainties: disable flaky tests Fix #456174 . --- pkgs/development/python-modules/uncertainties/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index a54accfa3516..5b130b5ffea9 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { ] ++ optional-dependencies.arrays; + disabledTests = [ + # Flaky tests, see: https://github.com/lmfit/uncertainties/issues/343 + "test_repeated_summation_complexity" + ]; + pythonImportsCheck = [ "uncertainties" ]; meta = { From 9bd62b38f02f4030d06b720339f02593ce20be13 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:25:39 +0100 Subject: [PATCH 0520/2279] massif-visualizer: fix build with CMake 4 Link: https://github.com/NixOS/nixpkgs/issues/445447 --- .../massif-visualizer/cmake-minimum-required.patch | 10 ++++++++++ .../tools/analysis/massif-visualizer/default.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch diff --git a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch new file mode 100644 index 000000000000..0f7d6e87b040 --- /dev/null +++ b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d7067dc..337c4ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10) + project(massif-visualizer) + + set(QT_MIN_VERSION "5.2.0") diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index d459bd320ac1..e20b252ae02d 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -25,6 +25,8 @@ mkDerivation rec { sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; + patches = [ ./cmake-minimum-required.patch ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info From fd7d75f2893f48262389fc67a3b409eee8e7f9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:24:34 -0700 Subject: [PATCH 0521/2279] python3Packages.legacy-cgi: 2.6.3 -> 2.6.4 Diff: https://github.com/jackrosenthal/legacy-cgi/compare/v2.6.3...v2.6.4 Changelog: https://github.com/jackrosenthal/legacy-cgi/releases/tag/v2.6.4 --- pkgs/development/python-modules/legacy-cgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix index ede0920e3411..b52561050407 100644 --- a/pkgs/development/python-modules/legacy-cgi/default.nix +++ b/pkgs/development/python-modules/legacy-cgi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "legacy-cgi"; - version = "2.6.3"; + version = "2.6.4"; pyproject = true; src = fetchFromGitHub { owner = "jackrosenthal"; repo = "legacy-cgi"; tag = "v${version}"; - hash = "sha256-l2BuSlxAA31VlJ/Fhs4cGbidbXEt/zEH3BiWsuh29GM="; + hash = "sha256-2CCYRRWP8FP54AcLnehJ0Kj3F3U4cz8vnesSj5EakdA="; }; build-system = [ hatchling ]; From 396ec023210e289f16cb696aaf903d7b7452fb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:30:51 -0700 Subject: [PATCH 0522/2279] python3Packages.legacy-cgi: set to null on Python < 3.13 The cgi module is part of the standard library up to Python 3.12. --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a65855a2a2aa..3352b2841d10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8143,7 +8143,8 @@ self: super: with self; { legacy-api-wrap = callPackage ../development/python-modules/legacy-api-wrap { }; - legacy-cgi = callPackage ../development/python-modules/legacy-cgi { }; + legacy-cgi = + if pythonOlder "3.13" then null else callPackage ../development/python-modules/legacy-cgi { }; leidenalg = callPackage ../development/python-modules/leidenalg { igraph-c = pkgs.igraph; }; From 814ebb5d7127c03d58880ff86e3216b946700004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:34:08 -0700 Subject: [PATCH 0523/2279] python3Packages.servefile: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/servefile/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index 1d1c0c175bac..67cd43a9094e 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -5,7 +5,6 @@ lib, pyopenssl, pytestCheckHook, - pythonAtLeast, requests, }: @@ -22,9 +21,9 @@ buildPythonPackage rec { }; dependencies = [ + legacy-cgi pyopenssl - ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ]; nativeCheckInputs = [ pytestCheckHook From 1e3b06793c04925af27cdf34d4b1e8fced178b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:34:22 -0700 Subject: [PATCH 0524/2279] python3Packages.filedepot: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/filedepot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix index 072e6ea60ef1..f620aac9a360 100644 --- a/pkgs/development/python-modules/filedepot/default.nix +++ b/pkgs/development/python-modules/filedepot/default.nix @@ -35,9 +35,9 @@ buildPythonPackage rec { dependencies = [ anyascii + legacy-cgi google-cloud-storage - ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ]; nativeCheckInputs = [ flaky From 13704f1cf21720fbf961fabd24caeeace210772e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:35:47 -0700 Subject: [PATCH 0525/2279] python3Packages.pywebcopy: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/pywebcopy/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix index ebdda05aeead..028a78177ea9 100644 --- a/pkgs/development/python-modules/pywebcopy/default.nix +++ b/pkgs/development/python-modules/pywebcopy/default.nix @@ -6,7 +6,6 @@ legacy-cgi, lxml-html-clean, pytestCheckHook, - pythonAtLeast, requests, setuptools, six, @@ -28,11 +27,11 @@ buildPythonPackage rec { dependencies = [ cachecontrol + legacy-cgi lxml-html-clean requests six - ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; From 8e503184565e2e0ddb9fdcfda8a8eeaf913dcf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:36:56 -0700 Subject: [PATCH 0526/2279] python3Packages.webob: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/webob/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 34425a936f34..d45c06105875 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -5,7 +5,6 @@ setuptools, legacy-cgi, pytestCheckHook, - pythonAtLeast, pythonOlder, # for passthru.tests @@ -31,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; # https://github.com/Pylons/webob/issues/437 - dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + dependencies = [ legacy-cgi ]; nativeCheckInputs = [ pytestCheckHook ]; From 96f19043304b1141a8778e5685918e0a045029c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:37:34 -0700 Subject: [PATCH 0527/2279] python3Packages.wfuzz: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/wfuzz/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 2277341460be..9d00d2a3a5c0 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -14,7 +14,6 @@ setuptools, six, fetchpatch2, - pythonAtLeast, legacy-cgi, }: @@ -51,13 +50,13 @@ buildPythonPackage rec { dependencies = [ chardet distutils # src/wfuzz/plugin_api/base.py + legacy-cgi pycurl six setuptools pyparsing ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]; nativeCheckInputs = [ netaddr From 3fd87331eeee862c27d98552e2495086b8df54a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:38:52 -0700 Subject: [PATCH 0528/2279] python3Packages.pydal: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/pydal/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 04db786876f1..fe850650f330 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonAtLeast, pythonOlder, setuptools, legacy-cgi, @@ -26,7 +25,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + checkInputs = [ legacy-cgi ]; enabledTestPaths = [ "tests/*.py" From 5907068fd5fe9a4318e923a5454cd5a2ca895ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:39:40 -0700 Subject: [PATCH 0529/2279] python3Packages.web: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/web/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index b79a399aea5d..7cedc0a391c0 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, pytestCheckHook, cheroot, legacy-cgi, @@ -25,8 +24,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ cheroot - ] - ++ lib.optional (pythonAtLeast "3.13") legacy-cgi; + legacy-cgi + ]; # requires multiple running databases doCheck = false; From 19f7589a8b3811cecb4ef6187a777829df06b2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 09:40:51 -0700 Subject: [PATCH 0530/2279] python3Packages.remi: don't make legacy-cgi optional It's null anyway on Python 3.12 and below. --- pkgs/development/python-modules/remi/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 1e55434b8f9d..0db323c1c46a 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pytestCheckHook, matplotlib, @@ -47,8 +46,6 @@ buildPythonPackage rec { dependencies = [ setuptools # pkg_resources is referenced at runtime - ] - ++ lib.optionals (!pythonOlder "3.13") [ legacy-cgi ]; From 9ee6afafd2856ce57e30d1bbca8be29a8c8ed467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 10:04:34 -0700 Subject: [PATCH 0531/2279] python3Packages.idna: 3.10 -> 3.11 Diff: https://github.com/kjd/idna/compare/v3.10...v3.11 Changelog: https://github.com/kjd/idna/releases/tag/v3.11 --- pkgs/development/python-modules/idna/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index a3fff70db1b4..362e3c319f3a 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -1,28 +1,32 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, flit-core, pytestCheckHook, }: buildPythonPackage rec { pname = "idna"; - version = "3.10"; + version = "3.11"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-EvZcm0cKvabcNc+OY8xXSxxSsR3yyGAwrwrAmwGxPqk="; + src = fetchFromGitHub { + owner = "kjd"; + repo = "idna"; + tag = "v${version}"; + hash = "sha256-4mnWOit+lrZnVslVyfalt6lv7qSYpLlyvET553SplJU="; }; build-system = [ flit-core ]; + pythonImportsCheck = [ "idna" ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { homepage = "https://github.com/kjd/idna/"; - changelog = "https://github.com/kjd/idna/releases/tag/v${version}"; + changelog = "https://github.com/kjd/idna/releases/tag/${src.tag}"; description = "Internationalized Domain Names in Applications (IDNA)"; license = lib.licenses.bsd3; }; From ad9968c5ed434053e1338745b6f9df5cfe86190e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Oct 2025 10:06:35 -0700 Subject: [PATCH 0532/2279] python3Packages.idna: add dotlambda to maintainers --- pkgs/development/python-modules/idna/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 362e3c319f3a..aefe7334db73 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { changelog = "https://github.com/kjd/idna/releases/tag/${src.tag}"; description = "Internationalized Domain Names in Applications (IDNA)"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.dotlambda ]; }; } From 4f37c1cbf12914ec5a382c6897e84d7c21aa4fb6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 19 Oct 2025 08:21:32 -0500 Subject: [PATCH 0533/2279] fluidsynth: 2.4.8 -> 2.5.0 - upgrade fluidsynth from 2.4.8 to 2.5.0 - add missing gcem dependency preventing upgrade - change hash to fluidsynth with submodules - Add stdenv.cc.cc.lib to buildInputs to ensure libfluidsynth is properly linked against the C++ standard library, as required. - Update cmakeFlags to include -Dosal=cpp11 and -Denable-libinstpatch=0 to build fluidsynth without GLib and libinstpatch support. --- pkgs/by-name/fl/fluidsynth/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index 28c8b9ef066f..88e013502421 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -6,7 +6,6 @@ pkg-config, cmake, alsa-lib, - glib, libjack2, libsndfile, libpulseaudio, @@ -14,13 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluidsynth"; - version = "2.4.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; tag = "v${finalAttrs.version}"; - hash = "sha256-rOPoRV0NWrlFZohqQ76gnXvt4/ryEI4nSlX+mNW+qf8="; + hash = "sha256-ouPCbXg9vgxSAHsReC7dmF1cstQZ1HaUoWcLChE35Hk="; + fetchSubmodules = true; }; outputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - glib + stdenv.cc.cc.lib libsndfile libjack2 ] @@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Denable-framework=off" + "-Dosal=cpp11" + "-Denable-libinstpatch=0" ]; meta = { From 5c2c8e14fdb1e5d368c9843022622934467c7b47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Oct 2025 20:26:09 +0000 Subject: [PATCH 0534/2279] geos: 3.14.0 -> 3.14.1 --- pkgs/by-name/ge/geos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/geos/package.nix b/pkgs/by-name/ge/geos/package.nix index 422269bea247..597fad1ec724 100644 --- a/pkgs/by-name/ge/geos/package.nix +++ b/pkgs/by-name/ge/geos/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "libgeos"; repo = "geos"; tag = finalAttrs.version; - hash = "sha256-tPuAYNi2Gfc/2hj8SFqnvuDztXkSAEoGPcvXVULrLKg="; + hash = "sha256-lOf14Qva/bbbiywbSE7GbkDQftjY0RudTOaqjllnsj4="; }; nativeBuildInputs = [ cmake ]; From d15ccc471edf043bb0af2dfef4e5c6d01c36dd40 Mon Sep 17 00:00:00 2001 From: Krishnan Shankar Date: Mon, 20 Oct 2025 20:47:24 -0500 Subject: [PATCH 0535/2279] python3Packages.chipwhisperer: init at 5.7.0 --- .../python-modules/chipwhisperer/default.nix | 118 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 120 insertions(+) create mode 100644 pkgs/development/python-modules/chipwhisperer/default.nix diff --git a/pkgs/development/python-modules/chipwhisperer/default.nix b/pkgs/development/python-modules/chipwhisperer/default.nix new file mode 100644 index 000000000000..1cc7fc8657bb --- /dev/null +++ b/pkgs/development/python-modules/chipwhisperer/default.nix @@ -0,0 +1,118 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build + pythonAtLeast, + setuptools, + setuptools-scm, + cython, + + # dependencies + colorama, + configobj, + ecpy, + fastdtw, + libusb1, + numpy, + pyserial, + tqdm, + + # install + udevCheckHook, + + # check + writableTmpDirAsHomeHook, + pytestCheckHook, +}: + +# Usage: +# In NixOS, add the package to services.udev.packages for non-root plugdev +# users to get device access permission: +# services.udev.packages = [ pkgs.python3Packages.chipwhisperer ]; + +buildPythonPackage rec { + pname = "chipwhisperer"; + version = "5.7.0"; + + src = fetchFromGitHub { + owner = "newaetech"; + repo = "chipwhisperer"; + tag = version; + hash = "sha256-C7QP044QEP7vmz1lMseLtMTYoKn5SoFV/q9URY7yQ6I="; + }; + + # Build + + pyproject = true; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = [ + cython + ]; + + pythonRelaxDeps = [ + "numpy" + ]; + + dependencies = [ + colorama + configobj + ecpy + fastdtw + libusb1 + pyserial + tqdm + ]; + + # Install + + nativeInstallCheckInputs = [ + udevCheckHook + ]; + + postInstall = '' + # Install udev rules + # The 50-newae.rules file from the repo isn't directly installed, since it + # installs to the chipwhisperer group (and not to uaccess) + + mkdir -p $out/etc/udev/rules.d + + cat < $out/etc/udev/rules.d/50-newae.rules + SUBSYSTEMS=="usb", ATTRS{idVendor}=="2b3e", ATTRS{idProduct}=="*", TAG+="uaccess" + SUBSYSTEM=="tty", ATTRS{idVendor}=="2b3e", ATTRS{idProduct}=="*", TAG+="uaccess", SYMLINK+="cw_serial%n" + SUBSYSTEM=="tty", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", SYMLINK+="cw_bootloader%n" + EOF + ''; + + # Check + + pythonImportsCheck = [ "chipwhisperer" ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + ]; + + enabledTestPaths = [ + # All other tests require connected hardware + # Error: "Could not find ChipWhisperer. Is it connected?" + # See: https://chipwhisperer.readthedocs.io/en/latest/contributing.html#unit-tests + "tests/test_api.py" + ]; + + disabledTests = [ "TestCPA" ]; # Tries to open a tutorial project + + meta = { + description = "Toolchain for side-channel power analysis and glitching attacks"; + homepage = "https://github.com/newaetech/chipwhisperer"; + changelog = "https://github.com/newaetech/chipwhisperer/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.krishnans2006 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25030c7b96a6..606e89575e97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2555,6 +2555,8 @@ self: super: with self; { chex = callPackage ../development/python-modules/chex { }; + chipwhisperer = callPackage ../development/python-modules/chipwhisperer { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; chispa = callPackage ../development/python-modules/chispa { }; From f6bf1c913a064ac85d8655e04cb14e6443d8cb5e Mon Sep 17 00:00:00 2001 From: Paul Joubert Date: Tue, 28 Oct 2025 00:37:01 +0200 Subject: [PATCH 0536/2279] brill: fix build --- pkgs/by-name/br/brill/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix index a077e5a1c169..ff7cc19b750f 100644 --- a/pkgs/by-name/br/brill/package.nix +++ b/pkgs/by-name/br/brill/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "4.000.073"; src = fetchzip { - url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip"; + url = "https://web.archive.org/web/20250719162541/https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip"; hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4="; stripRoot = false; }; From 9679d5c14347614319a0df444398ae4baa7afe17 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 18 Oct 2025 10:49:13 -0400 Subject: [PATCH 0537/2279] python313Packages.pygls_2: init at 2.0.0 --- .../pygls/{default.nix => 1.nix} | 15 ++-- pkgs/development/python-modules/pygls/2.nix | 72 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 ++- 3 files changed, 85 insertions(+), 12 deletions(-) rename pkgs/development/python-modules/pygls/{default.nix => 1.nix} (82%) create mode 100644 pkgs/development/python-modules/pygls/2.nix diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/1.nix similarity index 82% rename from pkgs/development/python-modules/pygls/default.nix rename to pkgs/development/python-modules/pygls/1.nix index 935a373cd9b5..830f177f81f1 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/1.nix @@ -10,7 +10,6 @@ pythonOlder, typeguard, websockets, - nix-update-script, }: buildPythonPackage rec { @@ -60,19 +59,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "pygls" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ - # Skips pre-releases - "--version-regex" - "^v([0-9.]+)$" - ]; - }; + passthru.skipBulkUpdate = true; - meta = with lib; { + meta = { description = "Pythonic generic implementation of the Language Server Protocol"; homepage = "https://github.com/openlawlibrary/pygls"; changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ kira-bruneau ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kira-bruneau ]; }; } diff --git a/pkgs/development/python-modules/pygls/2.nix b/pkgs/development/python-modules/pygls/2.nix new file mode 100644 index 000000000000..7cde9005c746 --- /dev/null +++ b/pkgs/development/python-modules/pygls/2.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + attrs, + cattrs, + lsprotocol, + websockets, + pytest-asyncio, + pytestCheckHook, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "pygls"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openlawlibrary"; + repo = "pygls"; + tag = "v${version}"; + hash = "sha256-dQLK18EACiN+DpWp81Vgaan0mwtifhrmH4xwkqttKvg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + cattrs + lsprotocol + ]; + + optional-dependencies = { + ws = [ websockets ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # Fixes hanging tests on Darwin + __darwinAllowLocalNetworking = true; + + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin issue: OSError: [Errno 24] Too many open files + ulimit -n 1024 + ''; + + pythonImportsCheck = [ "pygls" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + # Skips pre-releases + "--version-regex" + "^v([0-9.]+)$" + ]; + }; + + meta = { + description = "Pythonic generic implementation of the Language Server Protocol"; + homepage = "https://github.com/openlawlibrary/pygls"; + changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ kira-bruneau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99a8ce5fcd78..d05e8fd820b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13130,7 +13130,15 @@ self: super: with self; { pyglossary = callPackage ../development/python-modules/pyglossary { }; - pygls = callPackage ../development/python-modules/pygls { }; + pygls = pygls_1; + + pygls_1 = callPackage ../development/python-modules/pygls/1.nix { + lsprotocol = lsprotocol_2023; + }; + + pygls_2 = callPackage ../development/python-modules/pygls/2.nix { + lsprotocol = lsprotocol_2025; + }; pygltflib = callPackage ../development/python-modules/pygltflib { }; From 6301423f62cb173aa3528289488aaa7b0018b62b Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Tue, 28 Oct 2025 08:37:49 +0100 Subject: [PATCH 0538/2279] openssh_10_2: drop The main openssh package has already been updated in [1]. [1] https://github.com/NixOS/nixpkgs/pull/450658 This reverts commit 249e1f973023eb9deb6e0be00e09ad74301d22c7. --- pkgs/tools/networking/openssh/default.nix | 25 ----------------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 29 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 9d7bf1ebb135..6e95321b3de1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,31 +37,6 @@ in }; }; - openssh_10_2 = common rec { - pname = "openssh"; - version = "10.2p1"; - - src = fetchurl { - url = urlFor version; - hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI="; - }; - - extraPatches = [ - # Use ssh-keysign from PATH - # ssh-keysign is used for host-based authentication, and is designed to be used - # as SUID-root program. OpenSSH defaults to referencing it from libexec, which - # cannot be made SUID in Nix. - ./ssh-keysign-8.5.patch - ]; - extraMeta = { - maintainers = with lib.maintainers; [ - philiptaron - numinit - ]; - teams = [ lib.teams.helsinki-systems ]; - }; - }; - openssh_hpn = common rec { pname = "openssh-with-hpn"; version = "10.2p1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28850c752201..944b0550d62a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3629,10 +3629,6 @@ with pkgs; etcDir = "/etc/ssh"; }; - openssh_10_2 = opensshPackages.openssh_10_2.override { - etcDir = "/etc/ssh"; - }; - opensshTest = openssh.tests.openssh; opensshWithKerberos = openssh.override { From ba602f374fe8c4be8522e3a5d03c3e40064fc8e2 Mon Sep 17 00:00:00 2001 From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> Date: Tue, 28 Oct 2025 14:39:36 +0400 Subject: [PATCH 0539/2279] srb2kart: fix build with cmake4 --- pkgs/by-name/sr/srb2kart/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix index adfb3aff654d..394686a94de4 100644 --- a/pkgs/by-name/sr/srb2kart/package.nix +++ b/pkgs/by-name/sr/srb2kart/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + assets = stdenv.mkDerivation { pname = "srb2kart-data"; version = finalAttrs.version; From d3fc63c9f237a1f764d8e67aeddccfb62f2d1b4a Mon Sep 17 00:00:00 2001 From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> Date: Tue, 28 Oct 2025 15:09:40 +0400 Subject: [PATCH 0540/2279] srb2kart: refactor derrivation --- pkgs/by-name/sr/srb2kart/package.nix | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix index 394686a94de4..42e00c935189 100644 --- a/pkgs/by-name/sr/srb2kart/package.nix +++ b/pkgs/by-name/sr/srb2kart/package.nix @@ -32,24 +32,11 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" ''; - assets = stdenv.mkDerivation { - pname = "srb2kart-data"; - version = finalAttrs.version; - - src = fetchzip { - url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; - hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; - stripRoot = false; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/srb2kart - cp -r * $out/share/srb2kart - - runHook postInstall - ''; + assets = fetchzip { + name = "srb2kart-data"; + url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip"; + hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4="; + stripRoot = false; }; nativeBuildInputs = [ @@ -69,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2kart" + "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" @@ -96,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 bin/srb2kart $out/bin/srb2kart wrapProgram $out/bin/srb2kart \ - --set SRB2WADDIR "${finalAttrs.assets}/share/srb2kart" + --set-default SRB2WADDIR ${finalAttrs.assets} runHook postInstall ''; From 3871e9500221c053fbc9ed885ef438a3328de44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Oct 2025 13:51:51 +0100 Subject: [PATCH 0541/2279] Revert "Revert "double-conversion: add pkg-config and testing"" --- pkgs/by-name/do/double-conversion/package.nix | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix index a377165483f0..30e445519ee1 100644 --- a/pkgs/by-name/do/double-conversion/package.nix +++ b/pkgs/by-name/do/double-conversion/package.nix @@ -4,17 +4,19 @@ fetchFromGitHub, fetchpatch, cmake, - enableStatic ? stdenv.hostPlatform.isStatic, + ninja, + ctestCheckHook, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "double-conversion"; version = "3.3.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM="; }; @@ -30,22 +32,46 @@ stdenv.mkDerivation rec { url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch"; hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis="; }) + (fetchpatch { + name = "double-conversion-add-pkg-config.patch"; + url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch"; + hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4="; + }) ]; - nativeBuildInputs = [ cmake ]; + outputs = [ + "out" + "dev" + ]; - cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON"; + nativeBuildInputs = [ + cmake + ninja + ctestCheckHook + ]; + + doCheck = true; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries) + ]; # Case sensitivity issue preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' rm BUILD ''; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { + pkgConfigModules = [ "double-conversion" ]; description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; + maintainers = with lib.maintainers; [ fzakaria ]; }; -} +}) From e9cd95786544873c69db3b31f40e29b628ebe7ea Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 28 Oct 2025 11:30:04 +0100 Subject: [PATCH 0542/2279] gcompris: fix private Qt6 targets search for Qt 6.10 fix https://hydra.nixos.org/build/311320100/log/tail ``` CMake Error at src/core/CMakeLists.txt:112 (target_link_libraries): Target "gcompris-qt" links to: Qt6::CorePrivate but the target was not found. Possible reasons include: * There is a typo in the target name. * A find_package call is missing for an IMPORTED target. * An ALIAS target is missing. ``` --- pkgs/by-name/gc/gcompris/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gc/gcompris/package.nix b/pkgs/by-name/gc/gcompris/package.nix index df8f4c6e90f1..438f28ca1425 100644 --- a/pkgs/by-name/gc/gcompris/package.nix +++ b/pkgs/by-name/gc/gcompris/package.nix @@ -18,11 +18,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Y23pFov1/WKPrwYYRfGI8sOF0tp/ksSwRJE5zmxtoSo="; }; - # fix concatenation of absolute paths like - # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc postPatch = '' + # fix concatenation of absolute paths like + # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc substituteInPlace src/core/config.h.in --replace-fail \ "../@_data_dest_dir@" "../share/gcompris-qt" + + # Fix private Qt6 targets search for Qt 6.10 + substituteInPlace CMakeLists.txt --replace-fail \ + "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript)" \ + "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript CorePrivate QuickControls2BasicPrivate WaylandClientPrivate)" ''; cmakeFlags = [ From 1e51edbef006a28fa46fbedc11425f0ee7b12ab7 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 11:17:11 -0700 Subject: [PATCH 0543/2279] python3Packages.jiter: 0.8.2 -> 0.11.1 --- .../python-modules/jiter/Cargo.lock | 705 ++++++++++++++---- .../python-modules/jiter/default.nix | 4 +- 2 files changed, 582 insertions(+), 127 deletions(-) diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock index 591a3682f576..8d4e23c2c22b 100644 --- a/pkgs/development/python-modules/jiter/Cargo.lock +++ b/pkgs/development/python-modules/jiter/Cargo.lock @@ -1,12 +1,12 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", "getrandom", @@ -16,22 +16,37 @@ dependencies = [ ] [[package]] -name = "arbitrary" -version = "1.4.1" +name = "aho-corasick" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstyle" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" + +[[package]] +name = "arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "bencher" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bitvec" @@ -46,11 +61,24 @@ dependencies = [ ] [[package]] -name = "cc" -version = "1.2.7" +name = "bumpalo" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.2.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -58,29 +86,111 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] -name = "codspeed" -version = "2.7.2" +name = "ciborium" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ - "colored", - "libc", - "serde_json", + "ciborium-io", + "ciborium-ll", + "serde", ] [[package]] -name = "codspeed-bencher-compat" -version = "2.7.2" +name = "ciborium-io" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025afeee31b5b589484a884c7eb92bf80e0a5420bc4cb1f00d3a08c000211558" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +dependencies = [ + "anstyle", + "clap_lex", +] + +[[package]] +name = "clap_lex" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" + +[[package]] +name = "codspeed" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c" +dependencies = [ + "colored", + "libc", + "serde", + "serde_json", + "uuid", +] + +[[package]] +name = "codspeed-criterion-compat" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725" dependencies = [ - "bencher", "codspeed", + "codspeed-criterion-compat-walltime", + "colored", +] + +[[package]] +name = "codspeed-criterion-compat-walltime" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "codspeed", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", ] [[package]] @@ -90,14 +200,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] -name = "equivalent" -version = "1.0.1" +name = "criterion-plot" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" [[package]] name = "funty" @@ -107,7 +270,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fuzz" -version = "0.8.2" +version = "0.11.1" dependencies = [ "indexmap", "jiter", @@ -120,20 +283,32 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "wasi", + "r-efi", + "wasip2", +] + +[[package]] +name = "half" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" +dependencies = [ + "cfg-if", + "crunchy", + "zerocopy", ] [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" [[package]] name = "heck" @@ -142,10 +317,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "indexmap" -version = "2.7.0" +name = "hermit-abi" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "indexmap" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -153,24 +334,46 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.5" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiter" -version = "0.8.2" +version = "0.11.1" dependencies = [ "ahash", - "bencher", "bitvec", - "codspeed-bencher-compat", + "codspeed-criterion-compat", "lexical-parse-float", "num-bigint", "num-traits", @@ -184,7 +387,7 @@ dependencies = [ [[package]] name = "jiter-python" -version = "0.8.2" +version = "0.11.1" dependencies = [ "jiter", "pyo3", @@ -192,13 +395,24 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ + "getrandom", "libc", ] +[[package]] +name = "js-sys" +version = "0.3.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -207,55 +421,56 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lexical-parse-float" -version = "0.8.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +checksum = "52a9f232fbd6f550bc0137dcb5f99ab674071ac2d690ac69704593cb4abbea56" dependencies = [ "lexical-parse-integer", "lexical-util", - "static_assertions", ] [[package]] name = "lexical-parse-integer" -version = "0.8.6" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +checksum = "9a7a039f8fb9c19c996cd7b2fcce303c1b2874fe1aca544edc85c4a5f8489b34" dependencies = [ "lexical-util", - "static_assertions", ] [[package]] name = "lexical-util" -version = "0.8.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] +checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "libfuzzer-sys" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa" +checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404" dependencies = [ "arbitrary", "cc", ] [[package]] -name = "memchr" -version = "2.7.4" +name = "log" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -296,9 +511,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "oorandom" +version = "11.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "paste" @@ -307,27 +528,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "portable-atomic" -version = "1.10.0" +name = "plotters" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "8e0f6df8eaa422d97d72edcd152e1451618fed47fabbdbd5a8864167b1d4aff7" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.23.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ - "cfg-if", "indoc", "libc", "memoffset", @@ -342,20 +590,19 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", "python3-dll-a", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.23.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -363,9 +610,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -375,9 +622,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.3" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -388,22 +635,28 @@ dependencies = [ [[package]] name = "python3-dll-a" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b66f9171950e674e64bad3456e11bb3cca108e5c34844383cfe277f45c8a7a8" +checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" dependencies = [ "cc", ] [[package]] name = "quote" -version = "1.0.38" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "radium" version = "0.7.0" @@ -411,25 +664,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] -name = "ryu" -version = "1.0.18" +name = "rayon" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "serde" -version = "1.0.217" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -438,15 +765,16 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "indexmap", "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -457,21 +785,15 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.94" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -486,21 +808,42 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" [[package]] name = "unindent" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" + +[[package]] +name = "uuid" +version = "1.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +dependencies = [ + "getrandom", + "js-sys", + "wasm-bindgen", +] [[package]] name = "version_check" @@ -509,10 +852,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "walkdir" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-sys" @@ -523,6 +963,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -587,6 +1036,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + [[package]] name = "wyz" version = "0.5.1" @@ -598,18 +1053,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix index 7d5cb4c5931c..ce44681e80aa 100644 --- a/pkgs/development/python-modules/jiter/default.nix +++ b/pkgs/development/python-modules/jiter/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "jiter"; - version = "0.8.2"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "jiter"; tag = "v${version}"; - hash = "sha256-6FPwQ6t/zLB86k97S+6z5xWKBPJvjZ5/x3KrxOOT1gk="; + hash = "sha256-/OSLwqSy/CkAFv0hn1zED70MRsWV8/NTrSfqP7OSRFc="; }; postPatch = '' From c6cccc812d3c3371e36af3e9b962dca19e58ae8f Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 28 Oct 2025 20:08:13 +0100 Subject: [PATCH 0544/2279] nodejs_22: 22.20.0 -> 22.21.1 --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 182103df4262..a9be2fdad4b3 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -23,8 +23,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.20.0"; - sha256 = "ff7a6a6e8a1312af5875e40058351c4f890d28ab64c32f12b2cc199afa22002d"; + version = "22.21.1"; + sha256 = "487d73fd4db00dc2420d659a8221b181a7937fbc5bc73f31c30b1680ad6ded6a"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then From f7362d3b32b80e9d53cebac4d494935d9a8ac813 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 28 Oct 2025 15:16:51 -0300 Subject: [PATCH 0545/2279] libsForQt5.kdb: 3.2.0 -> 3.2.0-unstable-2025-10-17 --- pkgs/development/libraries/kdb/default.nix | 37 ++++++++-------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 8909caffcef7..e04804e60f84 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -1,8 +1,7 @@ { mkDerivation, lib, - fetchurl, - fetchpatch, + fetchFromGitLab, extra-cmake-modules, qtbase, kcoreaddons, @@ -13,28 +12,18 @@ qttools, }: -mkDerivation rec { +mkDerivation { pname = "kdb"; - version = "3.2.0"; + version = "3.2.0-unstable-2025-10-17"; - src = fetchurl { - url = "mirror://kde/stable/kdb/src/kdb-${version}.tar.xz"; - sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "kdb"; + rev = "819f9f61d629ffd80990ae17ae6c8078721a142b"; + hash = "sha256-XkpFFzTgLEjPxEzwinbGhHRTULQrhl5TdakJlQuI27A="; }; - patches = [ - # fix build with newer QT versions - (fetchpatch { - url = "https://github.com/KDE/kdb/commit/b36d74f13a1421437a725fb74502c993c359392a.patch"; - sha256 = "sha256-ENMZTUZ3yCKUhHPMUcDe1cMY2GLBz0G3ZvMRyj8Hfrw="; - }) - # fix build with newer posgresql versions - (fetchpatch { - url = "https://github.com/KDE/kdb/commit/40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911.patch"; - sha256 = "sha256-cZpX6L/NZX3vztnh0s2+v4J7kBcKgUdecY53LRp8CwM="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules qttools @@ -50,11 +39,11 @@ mkDerivation rec { propagatedBuildInputs = [ qtbase ]; - meta = with lib; { + meta = { description = "Database connectivity and creation framework for various database vendors"; mainProgram = "kdb3_sqlite3_dump"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ zraexy ]; + license = lib.licenses.lgpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zraexy ]; }; } From 58f8ad8b06bf13517a4f8c6f7f6ae71cf4645bb5 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 11:28:04 -0700 Subject: [PATCH 0546/2279] python3Packages.anthropic: 0.62.0 -> 0.71.0 --- pkgs/development/python-modules/anthropic/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 6259ce3314c2..696115fc61b9 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -11,6 +11,7 @@ # dependencies anyio, distro, + docstring-parser, httpx, jiter, pydantic, @@ -23,6 +24,7 @@ # test dirty-equals, + inline-snapshot, nest-asyncio, pytest-asyncio, pytest-xdist, @@ -32,14 +34,14 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.62.0"; + version = "0.71.0"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-EVLSC6ClHnmGqMoefMXj3M4dh812ZN5t9nF3gfCLyCo="; + hash = "sha256-n8hu2RFuZN0ojHhhU4qPQaT2DUvqSglFhBo2ORln/mc="; }; postPatch = '' @@ -55,6 +57,7 @@ buildPythonPackage rec { dependencies = [ anyio distro + docstring-parser httpx jiter pydantic @@ -69,6 +72,7 @@ buildPythonPackage rec { nativeCheckInputs = [ dirty-equals + inline-snapshot nest-asyncio pytest-asyncio pytest-xdist From fecbb869233e8f9711acbecc85623bd6a550c6fc Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 11:17:43 -0700 Subject: [PATCH 0547/2279] python3Packages.openai: 1.101.0 -> 2.6.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index c127e68c1923..c1f9d59eea50 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "1.101.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-XCstUYM2jiq3PbNiRmLnguzQtvrGk0Ik5K0tk37bq2U="; + hash = "sha256-GD9+81r0vw4n5jdpJW72cmtfqfz7zGs01YuwiziC3h4="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; From 9fe8f07c723fdf28997b9a22a05ec80ab68c4971 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 11:38:47 -0700 Subject: [PATCH 0548/2279] python3Packages.instructor: fix github tag expression --- pkgs/development/python-modules/instructor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 959449e53e76..d419801f315e 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "instructor"; - version = "1.10.0"; + version = "1.11.3"; pyproject = true; src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; - tag = version; + tag = "v${version}"; hash = "sha256-vknPfRHyLoLo2838p/fbjrqyaBORZzLp9+fN98yVDz0="; }; From f871cd85217a7e8c674bc78d665cab994233df69 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 11:41:48 -0700 Subject: [PATCH 0549/2279] python3Packages.instructor: relax dependencies on jiter and openai --- pkgs/development/python-modules/instructor/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index d419801f315e..993309fd72ad 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -45,7 +45,11 @@ buildPythonPackage rec { build-system = [ hatchling ]; - pythonRelaxDeps = [ "rich" ]; + pythonRelaxDeps = [ + "jiter" + "openai" + "rich" + ]; dependencies = [ aiohttp From f76768e5812e01a2eee5054f6d1df0aa24aa50b9 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 24 Oct 2025 10:20:00 -0700 Subject: [PATCH 0550/2279] python3Packages.google-ai-generativelanguage: 0.6.18 -> 0.9.0 --- .../google-ai-generativelanguage/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 4555e9772d1f..307066a46888 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -11,21 +11,18 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.18"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_ai_generativelanguage"; inherit version; - hash = "sha256-J0up/PaUZv9k6XHVZYhENDiOUjMAr9Ro/I4wM82OYG4="; + hash = "sha256-JSR0j0E5F0Rv68jgh53A1PAmoGT4nxfEK4G+p3q3bIQ="; }; build-system = [ setuptools ]; From 4f3e1e213841a7a8e54dd0a3c281a9e3445ab020 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:54:20 +0000 Subject: [PATCH 0551/2279] python3Packages.langgraph-checkpoint: 2.1.1 -> 3.0.0 --- .../python-modules/langgraph-checkpoint/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index b0769f2a5306..43e5b68aade2 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -18,6 +18,7 @@ pytest-asyncio, pytest-mock, pytestCheckHook, + redis, # passthru gitUpdater, @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "2.1.1"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpoint==${version}"; - hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U="; + hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4="; }; sourceRoot = "${src.name}/libs/checkpoint"; @@ -55,12 +56,7 @@ buildPythonPackage rec { pytest-asyncio pytest-mock pytestCheckHook - ]; - - disabledTests = [ - # assert 1.0000000000000004 == 1.0000000000000002 - # https://github.com/langchain-ai/langgraph/issues/5845 - "test_embed_with_path" + redis ]; passthru = { From 6583104e691526ca0c6d14d2341554dc98286a28 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:55:19 +0000 Subject: [PATCH 0552/2279] python3Packages.langgraph-checkpoint-postgres: 2.0.23 -> 3.0.0 --- .../python-modules/langgraph-checkpoint-postgres/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index 7040ae313543..b1769bb30750 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "2.0.23"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointpostgres==${version}"; - hash = "sha256-QAzT8T3bf3R3gwI/iWDYYDz0SxgLZsP61oMk72dYz4s="; + hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4="; }; postgresqlTestSetupPost = '' @@ -84,6 +84,7 @@ buildPythonPackage rec { "test_vector_search_with_filters" "test_vector_search_pagination" "test_vector_search_edge_cases" + "test_non_ascii" # Flaky under a parallel build (database in use) "test_store_ttl" ]; From 74f6e36f38b407fa1447d67246554af75a1638ec Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:56:22 +0000 Subject: [PATCH 0553/2279] python312Packages.langgraph-checkpoint-sqlite: 2.0.11 -> 3.0.0 --- .../python-modules/langgraph-checkpoint-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 44877b4eadeb..7ffc5b24374d 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "2.0.11"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointsqlite==${version}"; - hash = "sha256-v/gRYkiS4AR1epWwPdG/QYbnUYte894kHTn5F58pVGI="; + hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; From b0a3401119cae676179794a6454bcb2785cdd6c2 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 14:12:20 -0700 Subject: [PATCH 0554/2279] langgraph-prebuilt: 0.6.4 -> 1.0.1 --- .../development/python-modules/langgraph-prebuilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix index 59d69db2ba02..cface66811d5 100644 --- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix +++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix @@ -31,14 +31,14 @@ # It exists so the langgraph team can iterate on it without having to rebuild langgraph. buildPythonPackage rec { pname = "langgraph-prebuilt"; - version = "0.6.4"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "prebuilt==${version}"; - hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I="; + hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4="; }; sourceRoot = "${src.name}/libs/prebuilt"; From 12200a9c9b2ad0f8abdb31b42fbc06a76007e4f4 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:50:53 +0000 Subject: [PATCH 0555/2279] python312Packages.langgraph: 0.6.4 -> 1.0.1 --- pkgs/development/python-modules/langgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index ef3089303418..8c0ac5e6875a 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -40,14 +40,14 @@ }: buildPythonPackage rec { pname = "langgraph"; - version = "0.6.4"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = version; - hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I="; + hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4="; }; postgresqlTestSetupPost = '' From 91877f3f19de29407cef2c9a1f9d76a36309c74e Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:41:16 +0000 Subject: [PATCH 0556/2279] python3Packages.langchain-core: 0.3.72 -> 1.0.0 --- .../development/python-modules/langchain-core/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 80ef77828e11..3b103a45a49d 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies jsonpatch, @@ -36,19 +36,19 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.3.72"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-core==${version}"; - hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; + hash = "sha256-/V2xwpVIR7AWkN85D51LYokMrTrnJlIkGr0q1ztVh8A="; }; sourceRoot = "${src.name}/libs/core"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ "packaging" From ff60a3e096f1ccd19534e7a602d5e33da463d7e1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:47:38 +0000 Subject: [PATCH 0557/2279] python3Packages.langchain-tests: 0.3.21 -> 1.0.0 --- .../python-modules/langchain-tests/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 79528751b939..84f368fa507d 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies httpx, @@ -30,19 +30,19 @@ buildPythonPackage rec { pname = "langchain-tests"; - version = "0.3.21"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-tests==${version}"; - hash = "sha256-CufnUFhYTENuq4/32u0w3UZb7TdZxEpshyQqLH6NEZo="; + hash = "sha256-t+3o7XoemvEALVYMx+FpkGQVx2c/npRrK3cNDp3bp9A="; }; sourceRoot = "${src.name}/libs/standard-tests"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. From 48df7f140c100da76590f7826581b57ac4813482 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:53:23 +0000 Subject: [PATCH 0558/2279] python3Packages.langchain-text-splitters: 0.3.11 -> 1.0.0 --- .../langchain-text-splitters/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index d331a852ca61..2740e682a1c8 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, # tests + beautifulsoup4, httpx, pytest-asyncio, pytestCheckHook, @@ -20,19 +21,19 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.11"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-SShVzssXi18j5gcDSwwDT+umObEk7uhaCP2mMolQJxI="; + hash = "sha256-DOWd94Vx61OS1OI2uIZVonf6BiXkjbS2pTrzleKvifM="; }; sourceRoot = "${src.name}/libs/text-splitters"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. @@ -45,6 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain_text_splitters" ]; nativeCheckInputs = [ + beautifulsoup4 httpx pytest-asyncio pytestCheckHook From 9d2a03c4fcb04f9e705ef4b3f6c7c0c25d4196d5 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 12:51:24 -0700 Subject: [PATCH 0559/2279] python3Packages.langchain: repair damage from bulk update --- .../python-modules/langchain/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 96754ea94d52..30355d4f18cc 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.72"; + version = "0.3.27"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - tag = "langchain-core==${version}"; - hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc="; + tag = "langchain==${version}"; + hash = ""; }; sourceRoot = "${src.name}/libs/langchain"; @@ -150,8 +150,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "langchain" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "langchain=="; + passthru = { + skipBulkUpdate = true; + updateScript = gitUpdater { + rev-prefix = "langchain=="; + }; }; __darwinAllowLocalNetworking = true; From 2ad4864f83d59382530f05d77522ee268a26c3ba Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 13:36:55 -0700 Subject: [PATCH 0560/2279] python3Packages.langchain: 0.3.27 -> 1.0.2 --- .../python-modules/langchain/default.nix | 58 +++++-------------- 1 file changed, 16 insertions(+), 42 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 30355d4f18cc..77e77ce0e5e7 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -5,16 +5,14 @@ pythonOlder, # build-system - pdm-backend, - - # buildInputs - bash, + hatchling, # dependencies aiohttp, async-timeout, langchain-core, langchain-text-splitters, + langgraph, langsmith, numpy, pydantic, @@ -44,21 +42,19 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.27"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain==${version}"; - hash = ""; + hash = "sha256-NQra/L7OfnVyFTbGkSDcG30r8W733eAs9abII53wy4g="; }; - sourceRoot = "${src.name}/libs/langchain"; + sourceRoot = "${src.name}/libs/langchain_v1"; - build-system = [ pdm-backend ]; - - buildInputs = [ bash ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. @@ -72,6 +68,7 @@ buildPythonPackage rec { aiohttp langchain-core langchain-text-splitters + langgraph langsmith numpy pydantic @@ -111,41 +108,19 @@ buildPythonPackage rec { "tests/unit_tests" ]; + # All pass with sandbox=false disabledTests = [ - # These tests have database access - "test_table_info" - "test_sql_database_run" - # These tests have network access - "test_socket_disabled" - "test_openai_agent_with_streaming" - "test_openai_agent_tools_agent" - # This test may require a specific version of langchain-community - "test_compatible_vectorstore_documentation" - # AssertionErrors - "test_callback_handlers" - "test_generic_fake_chat_model" - # Test is outdated - "test_serializable_mapping" - "test_person" - "test_aliases_hidden" - # AssertionError: (failed string match due to terminal control chars in output) - # https://github.com/langchain-ai/langchain/issues/32150 - "test_filecallback" + # Depends on shell's truncation style + "test_truncation_indicator_present" + # Depends on the sleep shell command + "test_timeout_returns_error" + # Can't see the shell session results when sandboxed + "test_startup_and_shutdown_commands" ]; disabledTestPaths = [ - # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`. - "tests/unit_tests/chains/test_conversation.py" - # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`. - "tests/unit_tests/chains/test_memory.py" - # pydantic.errors.PydanticUserError: `ConversationSummaryBufferMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryBufferMemory.model_rebuild()`. - "tests/unit_tests/chains/test_summary_buffer_memory.py" - "tests/unit_tests/output_parsers/test_fix.py" - "tests/unit_tests/chains/test_llm_checker.py" - # TypeError: Can't instantiate abstract class RunnableSerializable[RetryOutputParserRetryChainInput, str] without an implementation for abstract method 'invoke' - "tests/unit_tests/output_parsers/test_retry.py" - # pydantic.errors.PydanticUserError: `LLMSummarizationCheckerChain` is not fully defined; you should define `BaseCache`, then call `LLMSummarizationCheckerChain.model_rebuild()`. - "tests/unit_tests/chains/test_llm_summarization_checker.py" + # Their configuration tests don't place nicely with nixpkgs + "tests/unit_tests/test_pytest_config.py" ]; pythonImportsCheck = [ "langchain" ]; @@ -168,6 +143,5 @@ buildPythonPackage rec { natsukium sarahec ]; - mainProgram = "langchain-server"; }; } From 768ba4e129942a46df9ce5abc79e2fb1d9bfcb2f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:45:01 +0000 Subject: [PATCH 0561/2279] python312Packages.langchain-openai: 0.3.28 -> 1.0.1 --- .../langchain-openai/default.nix | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 2e6bb2ab23fe..8d3d8fe6c6d7 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, @@ -13,6 +13,7 @@ # tests freezegun, + langchain, langchain-tests, lark, pandas, @@ -32,19 +33,19 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.28"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-HpAdCHxmfGJcqXArvtlYagNuEBGBjrbICIwh9nI0qMQ="; + hash = "sha256-lKZZw9kMV3oM7fNpVvofZJfOcyoUdqByWQmBV5MTFZo="; }; sourceRoot = "${src.name}/libs/partners/openai"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. @@ -60,6 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + langchain langchain-tests lark pandas @@ -78,26 +80,16 @@ buildPythonPackage rec { disabledTests = [ # These tests require network access - "test__convert_dict_to_message_tool_call" "test__get_encoding_model" - "test_azure_openai_api_key_is_secret_string" - "test_azure_openai_api_key_masked_when_passed_from_env" - "test_azure_openai_api_key_masked_when_passed_via_constructor" - "test_azure_openai_secrets" - "test_azure_openai_uses_actual_secret_value_from_secretstr" - "test_azure_serialized_secrets" "test_chat_openai_get_num_tokens" "test_embed_documents_with_custom_chunk_size" "test_get_num_tokens_from_messages" "test_get_token_ids" "test_init_o1" - "test_openai_get_num_tokens" - ]; - disabledTestPaths = [ - # TODO recheck on next update. Langchain has been working on Pydantic errors. - # ValidationError from pydantic - "tests/unit_tests/chat_models/test_responses_stream.py" + # TypeError: exceptions must be derived from Warning, not + # https://github.com/langchain-ai/langchain/issues/33705 + "test_init_minimal_reasoning_effort" ]; pythonImportsCheck = [ "langchain_openai" ]; From 5b6d34d9146d8a00c93fa4b867154e19dadfd622 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:51:39 +0000 Subject: [PATCH 0562/2279] python3Packages.langchain-xai: 0.2.5 -> 1.0.0 --- pkgs/development/python-modules/langchain-xai/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix index 6769f74c3440..439645e39337 100644 --- a/pkgs/development/python-modules/langchain-xai/default.nix +++ b/pkgs/development/python-modules/langchain-xai/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies aiohttp, @@ -25,19 +25,19 @@ buildPythonPackage rec { pname = "langchain-xai"; - version = "0.2.5"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-xai==${version}"; - hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc="; + hash = "sha256-engdUNTT3KsAGrJ93PiFQoI6jbBFPAqavDsrD073484="; }; sourceRoot = "${src.name}/libs/partners/xai"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; dependencies = [ aiohttp From 18f5d7ef7f1dee6b34fe2dd89a3963750e4d491f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:40:16 +0000 Subject: [PATCH 0563/2279] python3Packages.langchain-anthropic: 0.3.18 -> 1.0.0 --- .../python-modules/langchain-anthropic/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix index a0d9e62488cc..7c78e8547902 100644 --- a/pkgs/development/python-modules/langchain-anthropic/default.nix +++ b/pkgs/development/python-modules/langchain-anthropic/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies anthropic, @@ -12,6 +12,7 @@ pydantic, # tests + langchain, langchain-tests, pytest-asyncio, pytestCheckHook, @@ -22,19 +23,19 @@ buildPythonPackage rec { pname = "langchain-anthropic"; - version = "0.3.18"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-anthropic==${version}"; - hash = "sha256-ZedCz4FyKowhxLVpHrBsmGKHkMCA5yW7ui6LI0QGQ44="; + hash = "sha256-3kW5w98t5F199k14MoCY2dZGrC/HdBzKuRpM37EY3LQ="; }; sourceRoot = "${src.name}/libs/partners/anthropic"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; dependencies = [ anthropic @@ -49,6 +50,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + langchain langchain-tests pytest-asyncio pytestCheckHook From 9d94f32df3b894458379d17e719581761bdf48d6 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:40:46 +0000 Subject: [PATCH 0564/2279] python3Packages.langchain-chroma: 0.2.6 -> 1.0.0 --- .../langchain-chroma/001-async-test.patch | 13 ------------- .../python-modules/langchain-chroma/default.nix | 15 ++++----------- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/langchain-chroma/001-async-test.patch diff --git a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch deleted file mode 100644 index 178fd37199f8..000000000000 --- a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libs/partners/chroma/tests/integration_tests/test_vectorstores.py b/libs/partners/chroma/tests/integration_tests/test_vectorstores.py -index 382b24cb5..f99a34112 100644 ---- a/tests/integration_tests/test_vectorstores.py -+++ b/tests/integration_tests/test_vectorstores.py -@@ -36,7 +36,7 @@ def test_chroma() -> None: - - assert output == [Document(page_content="foo")] - -- -+@pytest.mark.asyncio - async def test_chroma_async() -> None: - """Test end to end construction and search.""" - texts = ["foo", "bar", "baz"] diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index e412b4e02738..d8ff4c47f065 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies chromadb, @@ -22,21 +22,19 @@ buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.2.6"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-chroma==${version}"; - hash = "sha256-HxoxxOgiDC/rf4hCA6uQBPmK11/fqddc5d4nMpIFxEw="; + hash = "sha256-fKFcl4NiNaypJGoV8bDrH7MwnsXNtnm7Hkxp/+SLc2c="; }; sourceRoot = "${src.name}/libs/partners/chroma"; - patches = [ ./001-async-test.patch ]; - - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. @@ -59,11 +57,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # Bad integration test, not used or vetted by the langchain team - "test_chroma_update_document" - ]; - passthru = { # python updater script sets the wrong tag skipBulkUpdate = true; From 61f941eee7480c0fc65039c38f2bc3ca555c6cf9 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:41:47 +0000 Subject: [PATCH 0565/2279] python3Packages.langchain-deepseek: 0.1.4 -> 1.0.0 --- .../python-modules/langchain-deepseek/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix index e6978addf2e8..cd5683c5007f 100644 --- a/pkgs/development/python-modules/langchain-deepseek/default.nix +++ b/pkgs/development/python-modules/langchain-deepseek/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, @@ -22,20 +22,20 @@ buildPythonPackage rec { pname = "langchain-deepseek"; - version = "0.1.4"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-deepseek==${version}"; - hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc="; + hash = "sha256-sOJxtiYL/hgDEeWkCvHP3mfI4tmrBuQp1BYN5WX+npo="; }; sourceRoot = "${src.name}/libs/partners/deepseek"; build-system = [ - pdm-backend + hatchling ]; pythonRelaxDeps = [ From bd34db9d9ecc593c2663d63af1c57a63e21379e5 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:41:52 +0000 Subject: [PATCH 0566/2279] python3Packages.langchain-aws: 0.2.33 -> 1.0.0 --- pkgs/development/python-modules/langchain-aws/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 2877c9edfff8..5b29a60e1384 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies boto3, @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-aws"; - version = "0.2.33"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; tag = "langchain-aws==${version}"; - hash = "sha256-8VRZhwrR5PdLo9FamQClKbYfuHUGVxamku4osyl8Wl4="; + hash = "sha256-Y4r9a7EiyOACcU41+1Lo89jguu1QmijWsNeoNqKF3cY="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { sourceRoot = "${src.name}/libs/aws"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ boto3 From f627cd6e322d4b580de3fef6273270636944143a Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:42:18 +0000 Subject: [PATCH 0567/2279] python3Packages.langchain-groq: 0.3.8 -> 1.0.0 --- .../development/python-modules/langchain-groq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix index 96478eb5fa85..a70487f2378d 100644 --- a/pkgs/development/python-modules/langchain-groq/default.nix +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, @@ -20,19 +20,19 @@ buildPythonPackage rec { pname = "langchain-groq"; - version = "0.3.8"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-groq==${version}"; - hash = "sha256-mlkNKzVX4VUQ9+/rB0fD4HfwjbCA9Yp4DJkMT+ExJ1c="; + hash = "sha256-OuZEdpPp0mKSejd43RW3bXzCzp3E4Pce7flsSr5JleY="; }; sourceRoot = "${src.name}/libs/partners/groq"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. From 4b48bf0ee9c4e5a5f6a46aaefa1be2411f11e6ef Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:42:33 +0000 Subject: [PATCH 0568/2279] python3Packages.langchain-huggingface: 0.3.1 -> 1.0.0 --- .../python-modules/langchain-huggingface/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index e8a1dd68fc1a..ef4043f16e1c 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies huggingface-hub, @@ -33,19 +33,19 @@ buildPythonPackage rec { pname = "langchain-huggingface"; - version = "0.3.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-huggingface==${version}"; - hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc="; + hash = "sha256-5ovHScT4bi4Ix7ejeyTjYxBvraoegtyIBojTdTBH5Js="; }; sourceRoot = "${src.name}/libs/partners/huggingface"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. From 02066da9390afac33a5f4e3b2333ae8b377a698d Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:42:50 +0000 Subject: [PATCH 0569/2279] python3Packages.langchain-mistralai: 0.2.12 -> 1.0.0 --- .../python-modules/langchain-mistralai/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix index 9b6f5d9abc4c..35ac8078c34e 100644 --- a/pkgs/development/python-modules/langchain-mistralai/default.nix +++ b/pkgs/development/python-modules/langchain-mistralai/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, @@ -24,19 +24,19 @@ buildPythonPackage rec { pname = "langchain-mistralai"; - version = "0.2.12"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-mistralai==${version}"; - hash = "sha256-eZyoveKn4S0nkK/2q8+HK0bpFAQEez4PyRETQeZItMo="; + hash = "sha256-khpZY6kttbgacnY1EKCyIPBR2ZiZHC3OA+0NpIBXg9s="; }; sourceRoot = "${src.name}/libs/partners/mistralai"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; dependencies = [ langchain-core From 1e611eae93b92d72a66675484810a56246616c08 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:42:55 +0000 Subject: [PATCH 0570/2279] python3Packages.langchain-google-genai: 2.1.10 -> 3.0.0 --- .../langchain-google-genai/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix index b28f462f0359..f89cb6787844 100644 --- a/pkgs/development/python-modules/langchain-google-genai/default.nix +++ b/pkgs/development/python-modules/langchain-google-genai/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies filetype, @@ -29,19 +29,19 @@ buildPythonPackage rec { pname = "langchain-google-genai"; - version = "2.1.10"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-google"; tag = "libs/genai/v${version}"; - hash = "sha256-kqII8RG1ep+n5CqKLY1v7Mc+zJh6kl1rAjMmkomfeqM="; + hash = "sha256-9Z0iRSICApA5/iHB7NTVYGpkktaoynG74W2mvn9zeMg="; }; sourceRoot = "${src.name}/libs/genai"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ # Each component release requests the exact latest core. @@ -85,9 +85,9 @@ buildPythonPackage rec { description = "LangChain integrations for Google Gemini"; homepage = "https://github.com/langchain-ai/langchain-google/tree/main/libs/genai"; license = lib.licenses.mit; - maintainers = [ - lib.maintainers.eu90h - lib.maintainers.sarahec + maintainers = with lib.maintainers; [ + eu90h + sarahec ]; }; } From 50f4fa48aec7527b20665503d464b40c34c2db73 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 23 Oct 2025 16:07:29 -0700 Subject: [PATCH 0571/2279] python3Packages.ollama: 0.5.3 -> 0.6.0 --- pkgs/development/python-modules/ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 684091aa6049..cee610f3b5ba 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.5.3"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "ollama"; repo = "ollama-python"; tag = "v${version}"; - hash = "sha256-QpG8bo6tarhW4NpdD4MQ9DWR/w8KjT2zEQyirYtTjJ0="; + hash = "sha256-4GvONxyv3/+mago/AHp5zbfoiKskKxiDZR1h+OhVbPU="; }; pythonRelaxDeps = [ "httpx" ]; From f356a05f8b0771984b32ab022ffce3d91a2d3899 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:44:26 +0000 Subject: [PATCH 0572/2279] python3Packages.langchain-ollama: 0.3.8 -> 1.0.0 --- .../python-modules/langchain-ollama/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index b315678abe78..93072b464538 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, @@ -22,20 +22,20 @@ buildPythonPackage rec { pname = "langchain-ollama"; - version = "0.3.8"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-ollama==${version}"; - hash = "sha256-r6O06JHJOtMPA/FOmkr6YCT5pUnlcG9wu2Bm3Gae5Mk="; + hash = "sha256-BINQYT+tLHAOKU54Cu6KP2vDg02MgkK9+XOYli8AXzs="; }; sourceRoot = "${src.name}/libs/partners/ollama"; build-system = [ - pdm-backend + hatchling ]; pythonRelaxDeps = [ From fa0922dd770243fbe8b8d5fb4a18bbc5f2db5782 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:48:08 +0000 Subject: [PATCH 0573/2279] python3Packages.langchain-perplexity: 0.1.2 -> 1.0.0 --- .../python-modules/langchain-perplexity/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix index 9638e5aa883d..55d0109f1ad5 100644 --- a/pkgs/development/python-modules/langchain-perplexity/default.nix +++ b/pkgs/development/python-modules/langchain-perplexity/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies langchain-core, @@ -23,19 +23,19 @@ buildPythonPackage rec { pname = "langchain-perplexity"; - version = "0.1.2"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-perplexity==${version}"; - hash = "sha256-4KYLyhGbG8Y8cDGffE4/8OM61eAKRFTgxKDKMTQExic="; + hash = "sha256-RUvzV1DQqg0nK/SABBekXlhuKmMT7vHTlyxb7RVpoiI="; }; sourceRoot = "${src.name}/libs/partners/perplexity"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; dependencies = [ langchain-core @@ -73,8 +73,8 @@ buildPythonPackage rec { description = "Build LangChain applications with Perplexity"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/perplexity"; license = lib.licenses.mit; - maintainers = [ - lib.maintainers.sarahec + maintainers = with lib.maintainers; [ + sarahec ]; }; } From 6c322b7a8e960a57454c0108d1357f853c08819b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 22 Oct 2025 03:48:46 +0000 Subject: [PATCH 0574/2279] python3Packages.langchain-fireworks: 0.3.0 -> 1.0.0 --- .../python-modules/langchain-fireworks/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix index 3a614511e244..e30ec4de5018 100644 --- a/pkgs/development/python-modules/langchain-fireworks/default.nix +++ b/pkgs/development/python-modules/langchain-fireworks/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - pdm-backend, + hatchling, # dependencies aiohttp, @@ -24,19 +24,19 @@ buildPythonPackage rec { pname = "langchain-fireworks"; - version = "0.3.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-fireworks==${version}"; - hash = "sha256-OZou323FAk2I4YuQV7sllbzDwFQWy/90FK3gIHnEBd0="; + hash = "sha256-JULxbSSSerM7HifVBRxkv5YgpP5jFdm3XzHIJbM8T1Y="; }; sourceRoot = "${src.name}/libs/partners/fireworks"; - build-system = [ pdm-backend ]; + build-system = [ hatchling ]; dependencies = [ aiohttp @@ -75,8 +75,8 @@ buildPythonPackage rec { description = "Build LangChain applications with Fireworks"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/fireworks"; license = lib.licenses.mit; - maintainers = [ - lib.maintainers.sarahec + maintainers = with lib.maintainers; [ + sarahec ]; }; } From 5ce81b1a4ac7a9c1b77c18adbd39f48aebbb11cf Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 27 Oct 2025 14:57:43 -0700 Subject: [PATCH 0575/2279] tailscale: 1.90.2 -> 1.90.3 Changelog: https://tailscale.com/changelog#2025-10-27 Most important change: 1. tailscaled starts up as expected in a no router configuration environment. --- pkgs/by-name/ta/tailscale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index ec9b9f06f8fc..bc3a35eb7e6b 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.90.2"; + version = "1.90.3"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-GToL03vH0/H6p3IN/UgFijlbonZ+48asr/XqzGQ0px4="; + hash = "sha256-vEsglSB+qCZ/JyPUOUBtA1mth/Ytg6giFbkYqwBZVmQ="; }; vendorHash = "sha256-rV3C2Vi48FCifGt58OdEO4+Av0HRIs8sUJVvp/gEBLw="; From 7201e48b84b482bcb6bbae8fdd65d4f0e9d8aa74 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 28 Oct 2025 13:27:58 -0700 Subject: [PATCH 0576/2279] tailscale: 1.90.3 -> 1.90.4 Changelog: https://tailscale.com/changelog#2025-10-28 Most important changes: * A deadlock issue no longer occurs in the client when checking for the network to be available. * [tailscaled](https://tailscale.com/kb/1278/tailscaled) no longer sporadically panics when a [Trusted Platform Module](https://tailscale.com/kb/1596/secure-node-state-storage) (TPM) device is present. --- pkgs/by-name/ta/tailscale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index bc3a35eb7e6b..814ab17f72cc 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.90.3"; + version = "1.90.4"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-vEsglSB+qCZ/JyPUOUBtA1mth/Ytg6giFbkYqwBZVmQ="; + hash = "sha256-0d6NwGH79TFqOpbu8EUw/lhk+1gF7TupVxFW18pqRmc="; }; vendorHash = "sha256-rV3C2Vi48FCifGt58OdEO4+Av0HRIs8sUJVvp/gEBLw="; From d2e1a42f4c9ac7da1a2c158e98aebf08b43d42ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Oct 2025 01:54:57 +0000 Subject: [PATCH 0577/2279] pyright: 1.1.406 -> 1.1.407 --- pkgs/by-name/py/pyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index dea2ba75cea0..99f9dbab6530 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.406"; + version = "1.1.407"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-hSPnUjIZf9od1u7PwgEFDXGWmizjdqSiXjb45wZIM9Q="; + hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-BzyZEJUOEqPBpPrVNhf/kDOBS3Q4Hgkpfz+JDccHr4g="; + npmDepsHash = "sha256-0czcnWOgIp/KtqBts908r4vGgMuwFLvIom89v+uCzpk="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-Ye8r7m4755GfU74G8Neetu+BlrHQWoQe7y2TyOjvBOo="; + npmDepsHash = "sha256-NyZAvboojw9gTj52WrdNIL2Oyy2wtpVnb5JyxKLJqWM="; postPatch = '' chmod +w ../../ From 48d0d593c39242c870c44786c1780d9b5d1f335f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 28 Oct 2025 22:03:40 -0400 Subject: [PATCH 0578/2279] fromager: fix tests Disable a test that relies on a (now private) `wheel.cli` module. --- pkgs/by-name/fr/fromager/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix index f9edb2825bd1..4dcffcea230a 100644 --- a/pkgs/by-name/fr/fromager/package.nix +++ b/pkgs/by-name/fr/fromager/package.nix @@ -53,6 +53,11 @@ python3.pkgs.buildPythonApplication rec { "fromager" ]; + disabledTestPaths = [ + # Depends on wheel.cli module that is private since wheel 0.46.0 + "tests/test_wheels.py" + ]; + meta = { description = "Wheel maker"; homepage = "https://pypi.org/project/fromager/"; From 996c5669e21d3fecf30aa2721b9cf2f5430794c8 Mon Sep 17 00:00:00 2001 From: ToasterUwU Date: Wed, 29 Oct 2025 03:57:48 +0100 Subject: [PATCH 0579/2279] edmarketconnector: 5.13.1 -> 5.13.2 --- pkgs/by-name/ed/edmarketconnector/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix index 29d56695bbe8..e6d55702a4c2 100644 --- a/pkgs/by-name/ed/edmarketconnector/package.nix +++ b/pkgs/by-name/ed/edmarketconnector/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "edmarketconnector"; - version = "5.13.1"; + version = "5.13.2"; src = fetchFromGitHub { owner = "EDCD"; repo = "EDMarketConnector"; tag = "Release/${finalAttrs.version}"; - hash = "sha256-50OPbAXrDKodN0o6UibGUmMqQ/accF2/gNHnms+8rOI="; + hash = "sha256-BqzrW5pV9ty1MBaILQir+iOda2xQoJeTq8eZG0x6+90="; }; nativeBuildInputs = [ makeWrapper ]; From e068832801c39cae2b1009ea36851f3319e67540 Mon Sep 17 00:00:00 2001 From: ToasterUwU Date: Wed, 29 Oct 2025 03:57:59 +0100 Subject: [PATCH 0580/2279] edmarketconnector: add ToasterUwU as maintainer --- pkgs/by-name/ed/edmarketconnector/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ed/edmarketconnector/package.nix b/pkgs/by-name/ed/edmarketconnector/package.nix index e6d55702a4c2..c680e3517911 100644 --- a/pkgs/by-name/ed/edmarketconnector/package.nix +++ b/pkgs/by-name/ed/edmarketconnector/package.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; platforms = lib.platforms.x86_64; mainProgram = "edmarketconnector"; - maintainers = with lib.maintainers; [ jiriks74 ]; + maintainers = with lib.maintainers; [ + jiriks74 + toasteruwu + ]; }; }) From a297b0e11eb66390f3ff55374c015ac77585836d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Oct 2025 04:18:22 +0000 Subject: [PATCH 0581/2279] nodejs-slim: 22.20.0 -> 22.21.1 --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 182103df4262..a9be2fdad4b3 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -23,8 +23,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.20.0"; - sha256 = "ff7a6a6e8a1312af5875e40058351c4f890d28ab64c32f12b2cc199afa22002d"; + version = "22.21.1"; + sha256 = "487d73fd4db00dc2420d659a8221b181a7937fbc5bc73f31c30b1680ad6ded6a"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then From a3877608f56d7d8b8d8b3649f78ec2e5669d4020 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Oct 2025 04:24:06 +0000 Subject: [PATCH 0582/2279] c-blosc2: 2.21.3 -> 2.22.0 --- pkgs/development/libraries/c-blosc/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index 93ebcc7d95de..02cf43f7f5d6 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc2"; - version = "2.21.3"; + version = "2.22.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc2"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jHp3l9sV5SiIOUjY2NUd5G+rH/8wr3TLZ+q/F8TAVhU="; + sha256 = "sha256-0eB+8zSlKCuHK1J2HlBUmWEJumAXSV2xnYMvnFud75A="; }; # https://github.com/NixOS/nixpkgs/issues/144170 From 1131be4703e0e063d1b23fceed65ed3ec1fd8d9a Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 28 Oct 2025 12:45:22 +0000 Subject: [PATCH 0583/2279] =?UTF-8?q?thanos:=200.39.2=20=E2=86=92=200.40.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/th/thanos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 0e1205299f84..46c795f15f53 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "thanos"; - version = "0.39.2"; + version = "0.40.1"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; tag = "v${version}"; - hash = "sha256-yKw+HGlqEgQmydZ+PIk5y/z5H57nZ0dtw/kEh8079Ws="; + hash = "sha256-g0xvtBwPoX906xHdyOEUfudio/9MZhkzdBp5FcATRsM="; }; - vendorHash = "sha256-6qTxCAD1hbS77erG1Z52JU2iOXAU+qtY3yivX+4bjlw="; + vendorHash = "sha256-ukKoiA7UhqDdMvAWYL5BGf6+FSPSkcRR/Scj5o/MMKc="; subPackages = "cmd/thanos"; From ee5376fb58a5eec26f9810a5702907af1db47b58 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Tue, 28 Oct 2025 12:46:58 +0000 Subject: [PATCH 0584/2279] thanos: Synchronize go build tags with upstream https://github.com/thanos-io/thanos/issues/8543 --- pkgs/by-name/th/thanos/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 46c795f15f53..48e32cec0779 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -24,6 +24,12 @@ buildGoModule rec { subPackages = "cmd/thanos"; + # Verify in sync with https://github.com/thanos-io/thanos/blob/main/.promu.yml + tags = [ + "netgo" + "slicelabels" + ]; + ldflags = let t = "github.com/prometheus/common/version"; From 066aa4808d0163a5df24c06616d775f8d6ef1a73 Mon Sep 17 00:00:00 2001 From: Hans Joachim Kliemeck Date: Wed, 29 Oct 2025 19:32:23 +0100 Subject: [PATCH 0585/2279] ruby_3_3: 3.3.9 -> 3.3.10 --- pkgs/development/interpreters/ruby/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a5c3f7a2e191..33eaaf90ede2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -196,14 +196,6 @@ let # anything and fixes cross compilation. ./dont-refer-to-build-dir.patch ] - ++ ops (lib.versionOlder ver.majMin "3.4") [ - (fetchpatch { - name = "ruby-3.3-fix-llvm-21.patch"; - url = "https://github.com/ruby/ruby/commit/5a8d7642168f4ea0d9331fded3033c225bbc36c5.patch"; - excludes = [ "version.h" ]; - hash = "sha256-dV98gXXTSKM2ZezTvhVXNaKaXJxiWKEeUbqqL360cWw="; - }) - ] ++ ops (lib.versionAtLeast ver.majMin "3.4" && lib.versionOlder ver.majMin "3.5") [ (fetchpatch { name = "ruby-3.4-fix-gcc-15-llvm-21-1.patch"; @@ -420,8 +412,8 @@ in mkRuby = generic; ruby_3_3 = generic { - version = rubyVersion "3" "3" "9" ""; - hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E="; + version = rubyVersion "3" "3" "10" ""; + hash = "sha256-tVW6pGejBs/I5sbtJNDSeyfpob7R2R2VUJhZ6saw6Sg="; cargoHash = "sha256-xE7Cv+NVmOHOlXa/Mg72CTSaZRb72lOja98JBvxPvSs="; }; From d7973fbf3de36ac5ec0e1ad85e0ea39b0a8c5859 Mon Sep 17 00:00:00 2001 From: kpbaks Date: Wed, 29 Oct 2025 22:15:49 +0100 Subject: [PATCH 0586/2279] weaver: install shell completions --- pkgs/by-name/we/weaver/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index aa8a0bd7f52b..aab77df3a68c 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -1,8 +1,10 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, testers, + installShellFiles, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -23,6 +25,15 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=test_cli_interface" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ + --bash <($out/bin/${finalAttrs.meta.mainProgram} completion bash) \ + --zsh <($out/bin/${finalAttrs.meta.mainProgram} completion zsh) \ + --fish <($out/bin/${finalAttrs.meta.mainProgram} completion fish) + ''; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; From 932a10be80014fce33695e0279887ed39be4b5cc Mon Sep 17 00:00:00 2001 From: kpbaks Date: Wed, 29 Oct 2025 22:16:01 +0100 Subject: [PATCH 0587/2279] weaver: add meta.changelog --- pkgs/by-name/we/weaver/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index aab77df3a68c..3984453b1ea9 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "OpenTelemetry tool for dealing with semantic conventions and application telemetry schemas"; homepage = "https://github.com/open-telemetry/weaver"; + changelog = "https://github.com/open-telemetry/weaver/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "weaver"; From f28bdf71bfa9a1e7e66453ca20e9545bd8644e64 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 29 Oct 2025 21:41:44 +0000 Subject: [PATCH 0588/2279] libjodycode: 4.1 -> 4.1.1 Changes: https://codeberg.org/jbruchon/libjodycode/src/tag/v4.1.1/CHANGES.txt --- pkgs/by-name/li/libjodycode/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix index 072fd1519689..4d936184afb0 100644 --- a/pkgs/by-name/li/libjodycode/package.nix +++ b/pkgs/by-name/li/libjodycode/package.nix @@ -2,14 +2,13 @@ lib, stdenv, fetchFromGitea, - fetchpatch, jdupes, fixDarwinDylibNames, }: stdenv.mkDerivation (finalAttrs: { pname = "libjodycode"; - version = "4.1"; + version = "4.1.1"; outputs = [ "out" @@ -22,22 +21,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "jbruchon"; repo = "libjodycode"; rev = "v${finalAttrs.version}"; - hash = "sha256-IBOCl5iFxKwanA28JG4wEzy9tNb6TznKK8RJET8CtSY="; + hash = "sha256-vuFANaQLJjyRTw+0ggye4TpFiqVa50GaRVKboagsJ7Q="; }; - patches = [ - # Fix linux build failure, drop after 4.1 release. - (fetchpatch { - name = "linux-build-fix.patch"; - url = "https://codeberg.org/jbruchon/libjodycode/commit/07294bbfd6c3c4be42c40c9ed81eebb5cd3d83a0.patch"; - hash = "sha256-qgP8MgGenGebM7n5zpPJ1WTsYUTCZwcWUloUKToc1eo="; - }) - ]; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; env.PREFIX = placeholder "out"; + enableParallelBuilding = true; + passthru.tests = { inherit jdupes; }; From 6f042d66db9c1b51ee7bd0d2e59c815453e8d5a4 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 28 Oct 2025 22:04:24 -0400 Subject: [PATCH 0589/2279] fromager: 0.59.0 -> 0.68.1 --- pkgs/by-name/fr/fromager/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix index 4dcffcea230a..66601939fd7a 100644 --- a/pkgs/by-name/fr/fromager/package.nix +++ b/pkgs/by-name/fr/fromager/package.nix @@ -2,18 +2,19 @@ lib, python3, fetchFromGitHub, + writableTmpDirAsHomeHook, }: python3.pkgs.buildPythonApplication rec { pname = "fromager"; - version = "0.59.0"; + version = "0.68.1"; pyproject = true; src = fetchFromGitHub { owner = "python-wheel-build"; repo = "fromager"; tag = version; - hash = "sha256-aKoZKpzgJ3e5JRYSSeLmLlji1Fj8omxvwGZfNXDOhLs="; + hash = "sha256-7NM8hRsMnnHWxzjwNv/cLIm9iOUsUEzoCwPuFUN8+hk="; }; build-system = with python3.pkgs; [ @@ -39,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { stevedore tomlkit tqdm - virtualenv + uv wheel ]; @@ -47,6 +48,8 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook requests-mock twine + uv + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ @@ -58,6 +61,12 @@ python3.pkgs.buildPythonApplication rec { "tests/test_wheels.py" ]; + disabledTests = [ + # Accessing pypi.org (not allowed in sandbox) + "test_get_build_backend_dependencies" + "test_get_build_sdist_dependencies" + ]; + meta = { description = "Wheel maker"; homepage = "https://pypi.org/project/fromager/"; From de7d5d6aa5ee2234cabf8a85b68430a788f34136 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 29 Oct 2025 19:26:20 -0400 Subject: [PATCH 0590/2279] python313Packages.monai-deploy: mark broken Package was broken in a recent mass update as it depends on NVIDIA holoscan and holoscan-cli, which are not in Nixpkgs. Reverting also seems suboptimal as the previously working version of MONAI Deploy is quite dated. --- .../python-modules/monai-deploy/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix index 3ae67044ff93..f3b5d6657ae2 100644 --- a/pkgs/development/python-modules/monai-deploy/default.nix +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -9,6 +9,7 @@ pytestCheckHook, pythonOlder, setuptools, + tritonclient, typeguard, versioneer, }: @@ -18,8 +19,6 @@ buildPythonPackage rec { version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Project-MONAI"; repo = "monai-deploy-app-sdk"; @@ -43,6 +42,7 @@ buildPythonPackage rec { numpy networkx colorama + tritonclient typeguard ]; @@ -64,12 +64,13 @@ buildPythonPackage rec { # like highdicom and pydicom ]; - meta = with lib; { + meta = { description = "Framework and tools to design, develop and verify AI applications in healthcare imaging"; mainProgram = "monai-deploy"; homepage = "https://monai.io/deploy.html"; changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/${src.tag}.md"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + broken = true; # requires holoscan and holoscan-cli, not in Nixpkgs }; } From a74985906f825105733e48344922ea30cc7757a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Oct 2025 00:27:44 +0000 Subject: [PATCH 0591/2279] python3Packages.streamlit: 1.50.0 -> 1.51.0 --- pkgs/development/python-modules/streamlit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index fd34995f750e..fc155688f46a 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.50.0"; + version = "1.51.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-hyIdVoqsWFJ0oF7xijeLA98zK5PggQP//PPNhNhSr0Y="; + hash = "sha256-HnQqnAtpj0Zsb1v1jTM77aWh++jeZgdDl2eRtcFEbvY="; }; build-system = [ From a4dfd6777ec709a745f69caea303fc4abf2fb84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Oct 2025 18:32:20 -0700 Subject: [PATCH 0592/2279] impression: 3.5.1 -> 3.5.3 Diff: https://gitlab.com/adhami3310/Impression/-/compare/v3.5.1...v3.5.3 --- pkgs/by-name/im/impression/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix index 99144834ec56..e7a57617c2d4 100644 --- a/pkgs/by-name/im/impression/package.nix +++ b/pkgs/by-name/im/impression/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "impression"; - version = "3.5.1"; + version = "3.5.3"; src = fetchFromGitLab { owner = "adhami3310"; repo = "Impression"; tag = "v${finalAttrs.version}"; - hash = "sha256-xSgH1k/K52sh3qcIHWyv/WgRX9sVWZAXm+OabWbbNJo="; + hash = "sha256-kS2uWYwYNdgHF5NBPqvFlkFvnv7VTTqWG5Y2g282d24="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cBaScjnhWW9nLFdeCuW7jzlJ8qZecc0FxjpJTRZJ6Lo="; + hash = "sha256-j1fSzEGgKVp5iPvU+yoXFHrG7E6HsaNWk0Ofpr0SHzQ="; }; nativeBuildInputs = [ From a8afde469edfe0eda300bb7b411ab650303284ac Mon Sep 17 00:00:00 2001 From: sapphire-arches Date: Wed, 29 Oct 2025 21:04:22 -0700 Subject: [PATCH 0593/2279] sby: 0.57 -> 0.58 Drops boolector since it is now archived and does not build with CMake4 --- pkgs/by-name/sb/sby/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index 9cc4797657f7..462cdd581115 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -6,7 +6,6 @@ python3, yosys, yices, - boolector, z3, aiger, btor2tools, @@ -19,13 +18,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sby"; - version = "0.57"; + version = "0.58"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; tag = "v${finalAttrs.version}"; - hash = "sha256-vhgLP2twPPGsey5lzmt/zUFme4GjIdWgRyWoCHxLxRU="; + hash = "sha256-msQ+aqdp8i5KMLUABYU6vA5VBkI6G3zF06RrQzfJucY="; }; postPatch = '' @@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { # Fix various executable references substituteInPlace sbysrc/sby_core.py \ --replace-fail '"/usr/bin/env", "bash"' '"${lib.getExe bash}"' \ - --replace-fail ', "btormc"' ', "${lib.getExe' boolector "btormc"}"' \ --replace-fail ', "aigbmc"' ', "${lib.getExe' aiger "aigbmc"}"' substituteInPlace sbysrc/sby_core.py \ @@ -73,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { python3 python3.pkgs.xmlschema yosys - boolector yices z3 aiger From 5516393ce39a2ba847def97dc7bf23dcb27cf014 Mon Sep 17 00:00:00 2001 From: tye-exe Date: Mon, 27 Oct 2025 16:23:35 +0000 Subject: [PATCH 0594/2279] minhtml: 0.16.4 -> 0.18.1 --- pkgs/by-name/mi/minhtml/Cargo.lock | 2063 --------------------------- pkgs/by-name/mi/minhtml/package.nix | 33 +- 2 files changed, 9 insertions(+), 2087 deletions(-) delete mode 100644 pkgs/by-name/mi/minhtml/Cargo.lock diff --git a/pkgs/by-name/mi/minhtml/Cargo.lock b/pkgs/by-name/mi/minhtml/Cargo.lock deleted file mode 100644 index cef443b0778b..000000000000 --- a/pkgs/by-name/mi/minhtml/Cargo.lock +++ /dev/null @@ -1,2063 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.16", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if 1.0.1", - "getrandom 0.3.3", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if 1.0.1", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base64-simd" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" -dependencies = [ - "simd-abstraction", -] - -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags 2.9.1", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.104", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "bumpalo" -version = "3.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" - -[[package]] -name = "c14n" -version = "0.0.1" -dependencies = [ - "minify-html", -] - -[[package]] -name = "cc" -version = "1.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" -dependencies = [ - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" - -[[package]] -name = "charlines" -version = "0.0.1" - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading 0.8.8", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if 1.0.1", - "wasm-bindgen", -] - -[[package]] -name = "const-str" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3" -dependencies = [ - "const-str-proc-macro", -] - -[[package]] -name = "const-str-proc-macro" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - -[[package]] -name = "cssparser" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf", - "smallvec", -] - -[[package]] -name = "cssparser-color" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f" -dependencies = [ - "cssparser", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.104", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.1", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" - -[[package]] -name = "data-url" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" -dependencies = [ - "matches", -] - -[[package]] -name = "dtoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - -[[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "backtrace", - "version_check", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "getrandom" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" -dependencies = [ - "cfg-if 1.0.1", - "js-sys", - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" -dependencies = [ - "cfg-if 1.0.1", - "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "glob" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.12", - "bumpalo", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hashbrown" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "index" -version = "0.16.4" -dependencies = [ - "console_error_panic_hook", - "getrandom 0.2.16", - "js-sys", - "minify-html", - "wasm-bindgen", - "wasm-bindgen-test", - "wee_alloc", -] - -[[package]] -name = "indexmap" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" -dependencies = [ - "equivalent", - "hashbrown 0.15.4", - "serde", -] - -[[package]] -name = "indoc" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - -[[package]] -name = "jni" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1981310da491a4f0f815238097d0d43d8072732b5ae5f8bd0d8eadf5bf245402" -dependencies = [ - "cesu8", - "combine", - "error-chain", - "jni-sys", - "log", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.174" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" - -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if 1.0.1", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" -dependencies = [ - "cfg-if 1.0.1", - "windows-targets 0.53.2", -] - -[[package]] -name = "lightningcss" -version = "1.0.0-alpha.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a73ffa17de66534e4b527232f44aa0a89fad22c4f4e0735f9be35494f058e54" -dependencies = [ - "ahash 0.8.12", - "bitflags 2.9.1", - "const-str", - "cssparser", - "cssparser-color", - "dashmap", - "data-encoding", - "getrandom 0.2.16", - "indexmap", - "itertools 0.10.5", - "lazy_static", - "lightningcss-derive", - "parcel_selectors", - "parcel_sourcemap", - "paste", - "pathdiff", - "rayon", - "serde", - "smallvec", -] - -[[package]] -name = "lightningcss-derive" -version = "1.0.0-alpha.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12744d1279367caed41739ef094c325d53fb0ffcd4f9b84a368796f870252" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "lock_api" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" - -[[package]] -name = "magnus" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479" -dependencies = [ - "magnus-macros", - "rb-sys", - "rb-sys-env", - "seq-macro", -] - -[[package]] -name = "magnus-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "memchr" -version = "2.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - -[[package]] -name = "minhtml" -version = "0.16.4" -dependencies = [ - "minify-html", - "rayon", - "structopt", -] - -[[package]] -name = "minicov" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" -dependencies = [ - "cc", - "walkdir", -] - -[[package]] -name = "minify-html" -version = "0.16.4" -dependencies = [ - "ahash 0.8.12", - "aho-corasick 0.7.20", - "lightningcss", - "memchr", - "minify-html-common", - "minify-js", - "once_cell", -] - -[[package]] -name = "minify-html-bench" -version = "0.0.1" -dependencies = [ - "minify-html", - "serde", - "serde_json", -] - -[[package]] -name = "minify-html-common" -version = "0.0.2" -dependencies = [ - "ahash 0.8.12", - "aho-corasick 0.7.20", - "itertools 0.12.1", - "memchr", - "once_cell", - "serde", - "serde_json", -] - -[[package]] -name = "minify-html-java" -version = "0.16.4" -dependencies = [ - "jni", - "minify-html", -] - -[[package]] -name = "minify-html-nodejs" -version = "0.16.4" -dependencies = [ - "minify-html", - "neon", -] - -[[package]] -name = "minify-html-onepass" -version = "0.16.4" -dependencies = [ - "ahash 0.8.12", - "aho-corasick 0.7.20", - "lightningcss", - "memchr", - "minify-html-common", - "minify-js", - "once_cell", -] - -[[package]] -name = "minify-html-onepass-bench" -version = "0.0.1" -dependencies = [ - "minify-html-onepass", - "serde", - "serde_json", -] - -[[package]] -name = "minify-html-onepass-python" -version = "0.16.4" -dependencies = [ - "minify-html-onepass", - "pyo3", -] - -[[package]] -name = "minify-html-python" -version = "0.16.4" -dependencies = [ - "minify-html", - "pyo3", -] - -[[package]] -name = "minify-html-ruby" -version = "0.16.4" -dependencies = [ - "magnus", - "minify-html", -] - -[[package]] -name = "minify-js" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e" -dependencies = [ - "aho-corasick 0.7.20", - "lazy_static", - "parse-js", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", -] - -[[package]] -name = "neon" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" -dependencies = [ - "neon-build", - "neon-macros", - "neon-runtime", - "semver", - "smallvec", -] - -[[package]] -name = "neon-build" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" - -[[package]] -name = "neon-macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf" -dependencies = [ - "quote", - "syn 1.0.109", - "syn-mid", -] - -[[package]] -name = "neon-runtime" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" -dependencies = [ - "cfg-if 1.0.1", - "libloading 0.6.7", - "smallvec", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "outref" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" - -[[package]] -name = "parcel_selectors" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196" -dependencies = [ - "bitflags 2.9.1", - "cssparser", - "log", - "phf", - "phf_codegen", - "precomputed-hash", - "rustc-hash 2.1.1", - "smallvec", -] - -[[package]] -name = "parcel_sourcemap" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb" -dependencies = [ - "base64-simd", - "data-url", - "rkyv", - "serde", - "serde_json", - "vlq", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" -dependencies = [ - "cfg-if 1.0.1", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "parse-js" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e" -dependencies = [ - "aho-corasick 0.7.20", - "bumpalo", - "hashbrown 0.13.2", - "lazy_static", - "memchr", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathdiff" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" - -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher", -] - -[[package]] -name = "portable-atomic" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pyo3" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219" -dependencies = [ - "cfg-if 1.0.1", - "indoc", - "libc", - "memoffset", - "once_cell", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999" -dependencies = [ - "once_cell", - "python3-dll-a", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-macros" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "python3-dll-a" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" -dependencies = [ - "cc", -] - -[[package]] -name = "quote" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "rb-sys" -version = "0.9.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad" -dependencies = [ - "rb-sys-build", -] - -[[package]] -name = "rb-sys-build" -version = "0.9.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0" -dependencies = [ - "bindgen", - "lazy_static", - "proc-macro2", - "quote", - "regex", - "shell-words", - "syn 2.0.104", -] - -[[package]] -name = "rb-sys-env" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb" - -[[package]] -name = "redox_syscall" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" -dependencies = [ - "bitflags 2.9.1", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick 1.1.3", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick 1.1.3", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - -[[package]] -name = "rustversion" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" - -[[package]] -name = "ryu" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "seq-macro" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" - -[[package]] -name = "serde" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.219" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "serde_json" -version = "1.0.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "simd-abstraction" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" -dependencies = [ - "outref", -] - -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn-mid" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "target-lexicon" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "tinyvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-ident" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unindent" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "uuid" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vlq" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" -dependencies = [ - "wit-bindgen-rt", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" -dependencies = [ - "cfg-if 1.0.1", - "once_cell", - "rustversion", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.104", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" -dependencies = [ - "cfg-if 1.0.1", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3" -dependencies = [ - "js-sys", - "minicov", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] - -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wee_alloc" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "memory_units", - "winapi", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" -dependencies = [ - "windows_aarch64_gnullvm 0.53.0", - "windows_aarch64_msvc 0.53.0", - "windows_i686_gnu 0.53.0", - "windows_i686_gnullvm 0.53.0", - "windows_i686_msvc 0.53.0", - "windows_x86_64_gnu 0.53.0", - "windows_x86_64_gnullvm 0.53.0", - "windows_x86_64_msvc 0.53.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" - -[[package]] -name = "wit-bindgen-rt" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.1", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "zerocopy" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.104", -] diff --git a/pkgs/by-name/mi/minhtml/package.nix b/pkgs/by-name/mi/minhtml/package.nix index 02448af08a0c..3b2145b93548 100644 --- a/pkgs/by-name/mi/minhtml/package.nix +++ b/pkgs/by-name/mi/minhtml/package.nix @@ -1,36 +1,21 @@ { lib, - fetchFromGitHub, rustPlatform, + fetchCrate, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "minhtml"; - version = "0.16.4"; + version = "0.18.1"; - src = fetchFromGitHub { - owner = "wilsonzlin"; - repo = "minify-html"; - tag = "v${finalAttrs.version}"; - hash = "sha256-SoCSHhgTLfztSfvzxxpZn/nQpXbKlkE4iiP0YZ0MVjY="; + # Upstream does not include a lock file. + # See https://github.com/wilsonzlin/minify-html/issues/255 + src = fetchCrate { + pname = "minhtml"; + inherit (finalAttrs) version; + hash = "sha256-yrZueueww9rQXaHCeBO6d2pO58SZ8yz2a9Ia5dp7lBY="; }; - # Upstream does not include a lock file so one has to be patched in. - cargoLock = { - lockFile = ./Cargo.lock; - }; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - - # Ensures that only the correct package gets built, as upstream contains multiple. - cargoBuildFlags = [ - "-p" - "minhtml" - ]; - cargoTestFlags = [ - "-p" - "minhtml" - ]; + cargoHash = "sha256-TFlDbVL8JARwV/xSQ+Cbwguqnr11nw24/L0MbHJazas="; meta = { description = "Minifier for HTML, JavaScript, and CSS"; From 116739a1911d43211c3edad2b4213bf0e989670d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 30 Oct 2025 13:37:58 +0000 Subject: [PATCH 0595/2279] top-level/python-aliases: fix ordering --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2932e8aee2a8..60f6f8c60650 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -154,6 +154,7 @@ mapAliases { face_recognition_models = throw "'face_recognition_models' has been renamed to/replaced by 'face-recognition-models'"; # Converted to throw 2025-10-29 factory_boy = throw "'factory_boy' has been renamed to/replaced by 'factory-boy'"; # Converted to throw 2025-10-29 fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-29 + fb-re2 = throw "fb-re2 has been removed since it is unmaintained upstream, consider google-re2 instead"; # added 2025-10-18 fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07 filebrowser_safe = throw "'filebrowser_safe' has been renamed to/replaced by 'filebrowser-safe'"; # Converted to throw 2025-10-29 filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20 @@ -382,7 +383,6 @@ mapAliases { radicale_infcloud = throw "'radicale_infcloud' has been renamed to/replaced by 'radicale-infcloud'"; # Converted to throw 2025-10-29 radio_beam = throw "'radio_beam' has been renamed to/replaced by 'radio-beam'"; # Converted to throw 2025-10-29 random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17 - fb-re2 = throw "fb-re2 has been removed since it is unmaintained upstream, consider google-re2 instead"; # added 2025-10-18 readme_renderer = throw "'readme_renderer' has been renamed to/replaced by 'readme-renderer'"; # Converted to throw 2025-10-29 recursivePthLoader = throw "'recursivePthLoader' has been renamed to/replaced by 'recursive-pth-loader'"; # Converted to throw 2025-10-29 repeated_test = throw "'repeated_test' has been renamed to/replaced by 'repeated-test'"; # Converted to throw 2025-10-29 From c79102b27551be7281c800b92c2f630bdab0689f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 30 Oct 2025 11:12:54 +0000 Subject: [PATCH 0596/2279] uv: 0.9.5 -> 0.9.6 Diff: https://github.com/astral-sh/uv/compare/0.9.5...0.9.6 Changelog: https://github.com/astral-sh/uv/blob/0.9.6/CHANGELOG.md --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 51b50cafc036..51575372989b 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-Js62zaO44/gXCCwji4LmlyO62zI96CFhnfnYqgI2p+U="; + hash = "sha256-pr93GmvFx2DYt8/LzDSlllwpQ6XZuW7eMWNyEGwbUKg="; }; - cargoHash = "sha256-TadS0YrZV5psCcGiu21w55nQhlzU+gXZPmFCAONLbXE="; + cargoHash = "sha256-nTOovX0Qnjnkx/ub+5mRPPZ4/a1/1nz5vBrq8NoULBA="; buildInputs = [ rust-jemalloc-sys From 00f587fdf2ff0a19df50490fd1c4a971df9843af Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 2 Oct 2025 15:35:43 +0200 Subject: [PATCH 0597/2279] eigen: 3.4.0-unstable-2022-05-19 -> 3.4.1 --- pkgs/by-name/ei/eigen/include-dir.patch | 57 ------------------------- pkgs/by-name/ei/eigen/package.nix | 53 +++++++++++++++-------- 2 files changed, 35 insertions(+), 75 deletions(-) delete mode 100644 pkgs/by-name/ei/eigen/include-dir.patch diff --git a/pkgs/by-name/ei/eigen/include-dir.patch b/pkgs/by-name/ei/eigen/include-dir.patch deleted file mode 100644 index 9928bbdbed1b..000000000000 --- a/pkgs/by-name/ei/eigen/include-dir.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - # cmake_minimum_require must be the first command of the file --cmake_minimum_required(VERSION 3.5.0) -+cmake_minimum_required(VERSION 3.7.0) - - project(Eigen3) - -@@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR - CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed" - ) - --foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) -+foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) - # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}". - if(IS_ABSOLUTE "${${var}}") - file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}") -@@ -466,13 +466,6 @@ install(FILES - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel - ) - --if(EIGEN_BUILD_PKGCONFIG) -- configure_file(eigen3.pc.in eigen3.pc @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc -- DESTINATION ${PKGCONFIG_INSTALL_DIR} -- ) --endif() -- - install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) - - -@@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) - set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) - set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) - set ( EIGEN_DEFINITIONS "") --set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) - set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) -+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) -+ -+if(EIGEN_BUILD_PKGCONFIG) -+ configure_file(eigen3.pc.in eigen3.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc -+ DESTINATION ${PKGCONFIG_INSTALL_DIR} -+ ) -+endif() - - include (CMakePackageConfigHelpers) - ---- a/eigen3.pc.in -+++ b/eigen3.pc.in -@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r - Requires: - Version: @EIGEN_VERSION_NUMBER@ - Libs: --Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ -+Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/pkgs/by-name/ei/eigen/package.nix b/pkgs/by-name/ei/eigen/package.nix index 898f83d2d136..430b27f5be96 100644 --- a/pkgs/by-name/ei/eigen/package.nix +++ b/pkgs/by-name/ei/eigen/package.nix @@ -1,43 +1,60 @@ { lib, + stdenv, fetchFromGitLab, + fetchpatch, + + # nativeBuildInputs cmake, + + # nativeCheckInputs + ctestCheckHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "eigen"; - version = "3.4.0-unstable-2022-05-19"; + version = "3.4.1"; src = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "e7248b26a1ed53fa030c5c459f7ea095dfd276ac"; - hash = "sha256-uQ1YYV3ojbMVfHdqjXRyUymRPjJZV3WHT36PTxPRius="; + tag = finalAttrs.version; + hash = "sha256-NSq1tUfy2thz5gtsyASsKeYE4vMf71aSG4uXfrX86rk="; }; patches = [ - ./include-dir.patch + # fix bug1213 test + # ref https://gitlab.com/libeigen/eigen/-/merge_requests/2005 merged upstream + (fetchpatch { + url = "https://gitlab.com/libeigen/eigen/-/commit/3e1367a3b5efcdc8ce716db77a322cedeb5e01b4.patch"; + hash = "sha256-oykUbzaZeVW1A8nBoiMtJvh68Zpu7PDFtAfAjtTQoC0="; + }) ]; - # ref. https://gitlab.com/libeigen/eigen/-/merge_requests/977 - # This was merged upstream and can be removed on next release - postPatch = '' - substituteInPlace Eigen/src/SVD/BDCSVD.h --replace-fail \ - "if (l == 0) {" \ - "if (i >= k && l == 0) {" - ''; + nativeBuildInputs = [ + cmake + ]; - nativeBuildInputs = [ cmake ]; + nativeCheckInputs = [ + ctestCheckHook + ]; - meta = with lib; { + cmakeFlags = [ + (lib.cmakeBool "EIGEN_LEAVE_TEST_IN_ALL_TARGET" true) # Build tests in parallel + ]; + + # too many flaky tests + doCheck = false; + + meta = { homepage = "https://eigen.tuxfamily.org"; description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ sander raskin ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) From ba1a5001c945a81c5271eb276cb92174d61a4e59 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 29 Oct 2025 20:13:01 +0100 Subject: [PATCH 0598/2279] eigenrand: fix for eigen 3.4.1 --- pkgs/by-name/ei/eigenrand/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ei/eigenrand/package.nix b/pkgs/by-name/ei/eigenrand/package.nix index 954c1fa296c2..2b35100d103f 100644 --- a/pkgs/by-name/ei/eigenrand/package.nix +++ b/pkgs/by-name/ei/eigenrand/package.nix @@ -2,6 +2,7 @@ cmake, eigen, fetchFromGitHub, + fetchpatch, gtest, lib, stdenv, @@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-mrpkWIb6kfLvppmIfzhjF1/3m1zSd8XG1D07V6Zjlu0="; }; + patches = [ + # ref. https://github.com/bab2min/EigenRand/pull/61 merged upstream + (fetchpatch { + name = "support-eigen-341.patch"; + url = "https://github.com/bab2min/EigenRand/commit/8114df93b4c8a84a4f853380f0875a2c9d683cd0.patch"; + hash = "sha256-2KivLlyYGSRZurtxLghNfWwUNEUNWZdC6q+H65EPLnQ="; + }) + ]; + # Avoid downloading googletest: we already have it. postPatch = '' substituteInPlace CMakeLists.txt --replace-fail \ From e82f2d283ce82e14ab323e6be6fbacd58487448d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 30 Oct 2025 13:24:09 +0100 Subject: [PATCH 0599/2279] python3Packages.gym: disable test that segfault ``` gym> tests/wrappers/test_record_video.py Fatal Python error: Segmentation fault gym> gym> Thread 0x00007ffea0f716c0 (most recent call first): gym> File "/nix/store/qlz1jypzdb320jp0ci0igxg2ghf0974d-python3-3.12.11/lib/python3.12/threading.py", line 359 in wait gym> File "/nix/store/qlz1jypzdb320jp0ci0igxg2ghf0974d-python3-3.12.11/lib/python3.12/threading.py", line 655 in wait gym> File "/nix/store/vadca0pz5kfvwxaldqzmjxnhm9zz3sb8-python3.12-tqdm-4.67.1/lib/python3.12/site-packages/tqdm/_monitor.py", line 60 in run gym> File "/nix/store/qlz1jypzdb320jp0ci0igxg2ghf0974d-python3-3.12.11/lib/python3.12/threading.py", line 1075 in _bootstrap_inner gym> File "/nix/store/qlz1jypzdb320jp0ci0igxg2ghf0974d-python3-3.12.11/lib/python3.12/threading.py", line 1032 in _bootstrap gym> gym> Current thread 0x00007ffff7f86740 (most recent call first): gym> File "/build/source/gym/envs/classic_control/cartpole.py", line 250 in render gym> File "/build/source/gym/wrappers/order_enforcing.py", line 51 in render gym> File "/build/source/gym/core.py", line 329 in render gym> File "/build/source/gym/wrappers/render_collection.py", line 33 in step gym> File "/build/source/gym/wrappers/record_video.py", line 142 in step gym> File "/build/source/tests/wrappers/test_record_video.py", line 16 in test_record_video_using_default_trigger gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/python.py", line 157 in pytest_pyfunc_call gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_callers.py", line 121 in _multicall gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_manager.py", line 120 in _hookexec gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_hooks.py", line 512 in __call__ gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/python.py", line 1671 in runtest gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/runner.py", line 178 in pytest_runtest_call gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_callers.py", line 121 in _multicall gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_manager.py", line 120 in _hookexec gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_hooks.py", line 512 in __call__ gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/runner.py", line 246 in gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/runner.py", line 344 in from_call gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/runner.py", line 245 in call_and_report gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/runner.py", line 136 in runtestprotocol gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/runner.py", line 117 in pytest_runtest_protocol gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_callers.py", line 121 in _multicall gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_manager.py", line 120 in _hookexec gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_hooks.py", line 512 in __call__ gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/main.py", line 367 in pytest_runtestloop gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_callers.py", line 121 in _multicall gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_manager.py", line 120 in _hookexec gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_hooks.py", line 512 in __call__ gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/main.py", line 343 in _main gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/main.py", line 289 in wrap_session gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/main.py", line 336 in pytest_cmdline_main gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_callers.py", line 121 in _multicall gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_manager.py", line 120 in _hookexec gym> File "/nix/store/56r3an7jdvdk2086cdm8m4yifgp8wy2p-python3.12-pluggy-1.6.0/lib/python3.12/site-packages/pluggy/_hooks.py", line 512 in __call__ gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/config/__init__.py", line 175 in main gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/_pytest/config/__init__.py", line 201 in console_main gym> File "/nix/store/y35d39jdxlf8nfa6jvl6v084sa8kh73p-python3.12-pytest-8.4.2/lib/python3.12/site-packages/pytest/__main__.py", line 9 in gym> File "", line 88 in _run_code gym> File "", line 198 in _run_module_as_main ``` --- pkgs/development/python-modules/gym/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 764a9cda9e28..28c3e53d8128 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -100,6 +100,9 @@ buildPythonPackage rec { # The requested array has an inhomogeneous shape after 1 dimensions. # The detected shape was (2,) + inhomogeneous part "test_sample_contains" + + # segfault + "test_record_video" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Fatal Python error: Aborted From 7b74c2c7ad2213737d10b52b4f161918b05c6d07 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 30 Oct 2025 22:38:10 +0800 Subject: [PATCH 0600/2279] moserial: add wrapGAppsHook3 --- pkgs/by-name/mo/moserial/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/mo/moserial/package.nix b/pkgs/by-name/mo/moserial/package.nix index 91e506accfff..ec7468760dd3 100644 --- a/pkgs/by-name/mo/moserial/package.nix +++ b/pkgs/by-name/mo/moserial/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, autoreconfHook, + wrapGAppsHook3, intltool, itstool, pkg-config, @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { itstool pkg-config vala + wrapGAppsHook3 ]; buildInputs = [ From 97b472ac81aebe063277541fe6f3d270089ba43e Mon Sep 17 00:00:00 2001 From: arexon Date: Thu, 30 Oct 2025 18:03:07 +0300 Subject: [PATCH 0601/2279] mcpelauncher-client: fix sdl3 audio --- pkgs/by-name/mc/mcpelauncher-client/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index 598fe0b50c14..386a94f1721a 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -98,7 +98,7 @@ clangStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_OWN_CURL" false) (lib.cmakeBool "ENABLE_DEV_PATHS" false) (lib.cmakeFeature "GAMEWINDOW_SYSTEM" "GLFW") - (lib.cmakeBool "USE_SDL3_AUDIO" false) + (lib.cmakeBool "SDL3_VENDORED" false) (lib.cmakeBool "BUILD_WEBVIEW" withQtWebview) (lib.cmakeBool "XAL_WEBVIEW_USE_CLI" (!withQtWebview)) (lib.cmakeBool "XAL_WEBVIEW_USE_QT" withQtWebview) From 598a65ae09eec76eae37ff61c1c6272804ef85a4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 30 Oct 2025 10:23:24 -0500 Subject: [PATCH 0602/2279] crystfel: fix cmake4 error --- pkgs/applications/science/physics/crystfel/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 9c3ffb16c186..d495349aa75e 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -185,6 +185,12 @@ let }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0.0)" \ + "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ hdf5 From 7d7a4c9716d9d3a9d81eb765949452d705408964 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 26 Oct 2025 15:09:38 -0700 Subject: [PATCH 0603/2279] python3Packages.openai-agents: 0.2.9 -> 0.4.2 --- pkgs/development/python-modules/openai-agents/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix index 0812eb19d871..8ae73edda134 100644 --- a/pkgs/development/python-modules/openai-agents/default.nix +++ b/pkgs/development/python-modules/openai-agents/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "openai-agents"; - version = "0.2.9"; + version = "0.4.2"; pyproject = true; src = fetchPypi { inherit version; pname = "openai_agents"; - hash = "sha256-YZxRyM5J+EFHSp5hlXPW9/lqRkMpAHUhRa0EMJq3Cuk="; + hash = "sha256-KByv+DmzqyzzvFIRCr6TysoASYXEG/B96OYNA8SnUo4="; }; build-system = [ From 59e76717eaa398d4c1dc44def16cdde2fd91049a Mon Sep 17 00:00:00 2001 From: r4v3n6101 Date: Thu, 30 Oct 2025 20:55:50 +0300 Subject: [PATCH 0604/2279] tarts: 0.1.16-unstable -> 0.1.24 --- pkgs/by-name/ta/tarts/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix index e6c8cbb5051b..9f75ec1f69ec 100644 --- a/pkgs/by-name/ta/tarts/package.nix +++ b/pkgs/by-name/ta/tarts/package.nix @@ -3,18 +3,18 @@ rustPlatform, fetchFromGitHub, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tarts"; - version = "0.1.16-unstable-2025-05-04"; + version = "0.1.24"; src = fetchFromGitHub { owner = "oiwn"; repo = "tarts"; - rev = "8560a63dda8e5ffd5fdd96a1f7687f8f12d36022"; - hash = "sha256-d06FL0khcI2LUMbrUo3tmQn97pNFIVefPWlxWFSUJ+E="; + rev = "v${finalAttrs.version}"; + hash = "sha256-whkDHgxrHkmYX6hji+z8mc964lQxllaidV8clJhvDqw="; }; - cargoHash = "sha256-DLIBVl7CzhEYjAnkJmLHSlUoXCNos8YPHfSz9rs99/8="; + cargoHash = "sha256-IZyjwbx7V0kPkmD9r8qrqp4nrJg8g6tepw5bvWlLZBE="; meta = { description = "Screen saves and visual effects for your terminal"; @@ -23,4 +23,4 @@ rustPlatform.buildRustPackage { maintainers = [ lib.maintainers.awwpotato ]; mainProgram = "tarts"; }; -} +}) From 96b912fcc057b73a278134c110f4d317fbd43d4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Oct 2025 19:23:41 +0000 Subject: [PATCH 0605/2279] python3Packages.azure-storage-queue: 12.14.0 -> 12.14.1 --- .../python-modules/azure-storage-queue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 11aa7ee0506d..325cd4fb6c46 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.14.0"; + version = "12.14.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_queue"; inherit version; - hash = "sha256-WIhM62wQqF3NIuOJreMr46bzbsWHxC5O/AZO/D7yV0M="; + hash = "sha256-j3r7MR7xuZBzFuWbs+BkU5fI12BzrbG1lfAnsXwLevE="; }; build-system = [ setuptools ]; From 5a3445b59a3cbb0f70dba91eb1344fb925e7795a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 30 Oct 2025 15:30:25 -0500 Subject: [PATCH 0606/2279] ath9k-htc-blobless-firmware,ath9k-htc-blobless-firmware-unstable: fix cmake 4 error --- pkgs/os-specific/linux/firmware/ath9k/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix index 5c9660968579..d7c1bac92f39 100644 --- a/pkgs/os-specific/linux/firmware/ath9k/default.nix +++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs target_firmware/firmware-crc.pl + substituteInPlace target_firmware/CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" \ + "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" ''; nativeBuildInputs = [ From 02c3f819d7887d6c9fd3eed690e3477c169e3f5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Oct 2025 11:55:52 +0200 Subject: [PATCH 0607/2279] python313Packages.locust-cloud: add changelog to meta --- pkgs/development/python-modules/locust-cloud/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix index ac503a0593c0..2f259ad21e56 100644 --- a/pkgs/development/python-modules/locust-cloud/default.nix +++ b/pkgs/development/python-modules/locust-cloud/default.nix @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = { description = "Hosted version of Locust to run distributed load tests"; - homepage = "https://www.locust.cloud/"; + homepage = "https://github.com/locustcloud/locust-cloud"; + changelog = "https://github.com/locustcloud/locust-cloud/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ magicquark ]; }; From 4e2a3f183b22a7e7e9dc73d6606e9893ac64a12f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Oct 2025 12:02:32 +0200 Subject: [PATCH 0608/2279] python313Packages.locust-cloud: add pythonImportsCheck --- pkgs/development/python-modules/locust-cloud/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix index 2f259ad21e56..079416c5252d 100644 --- a/pkgs/development/python-modules/locust-cloud/default.nix +++ b/pkgs/development/python-modules/locust-cloud/default.nix @@ -1,11 +1,11 @@ { + lib, buildPythonPackage, configargparse, fetchFromGitHub, gevent, hatch-vcs, hatchling, - lib, platformdirs, python-engineio, python-socketio, @@ -40,6 +40,8 @@ buildPythonPackage rec { tomli ]; + pythonImportsCheck = [ "locust_cloud" ]; + meta = { description = "Hosted version of Locust to run distributed load tests"; homepage = "https://github.com/locustcloud/locust-cloud"; From ca68306a91130e27a14bc38652319219272d6c67 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 30 Oct 2025 15:36:53 +0100 Subject: [PATCH 0609/2279] python3Packages.python-socketio: 5.13.0 -> 5.14.3 --- .../python-modules/python-socketio/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cd621b30166d..4e5d9c86e1dc 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -21,19 +21,21 @@ pytest7CheckHook, simple-websocket, uvicorn, + redis, + valkey, }: buildPythonPackage rec { pname = "python-socketio"; - version = "5.13.0"; + version = "5.14.3"; pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; tag = "v${version}"; - hash = "sha256-iOipxGALYOXLvUwn6OSjLCMZoUl7u4S5eCktUgcs/X0="; + hash = "sha256-2zts0gkwAoUCC8S1UDg0PlBaFH23jTv04hgGblHSX7c="; }; build-system = [ setuptools ]; @@ -56,6 +58,8 @@ buildPythonPackage rec { pytest7CheckHook uvicorn simple-websocket + redis + valkey ] ++ lib.flatten (lib.attrValues optional-dependencies); From 1969163519edb14b809faae99bb537a71c81cd7a Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 30 Oct 2025 15:38:03 +0100 Subject: [PATCH 0610/2279] python3Packages.locust-cloud: 1.27.0 -> 1.27.9 --- pkgs/development/python-modules/locust-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix index 079416c5252d..c46d093dbb3e 100644 --- a/pkgs/development/python-modules/locust-cloud/default.nix +++ b/pkgs/development/python-modules/locust-cloud/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "locust-cloud"; - version = "1.27.0"; + version = "1.27.9"; pyproject = true; src = fetchFromGitHub { owner = "locustcloud"; repo = "locust-cloud"; tag = version; - hash = "sha256-K69VIyQggwWQQoMld0JpzmtJRQc6HYrKAGA6E9O69MQ="; + hash = "sha256-7k1IZNBVkz+E5WW/wZWpB+yl/W7ONuHlUM8wOKvu0ow="; }; build-system = [ From 579e7cc779a0cc2b25dad032c1a826fb785109d1 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 30 Oct 2025 15:39:09 +0100 Subject: [PATCH 0611/2279] python3Packages.locust: 2.37.14 -> 2.42.1 --- pkgs/development/python-modules/locust/default.nix | 7 +++++-- pkgs/development/python-modules/locust/webui.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix index 40b5d08429ec..d59ba37d5ac9 100644 --- a/pkgs/development/python-modules/locust/default.nix +++ b/pkgs/development/python-modules/locust/default.nix @@ -18,6 +18,7 @@ locust-cloud, psutil, pyquery, + pytest, pyzmq, requests, retry, @@ -27,14 +28,14 @@ buildPythonPackage rec { pname = "locust"; - version = "2.37.14"; + version = "2.42.1"; pyproject = true; src = fetchFromGitHub { owner = "locustio"; repo = "locust"; tag = version; - hash = "sha256-16pMl72OIZlAi6jNx0qv0TO9RTm6O9CgiE84sndsEhc="; + hash = "sha256-yyG4HVti0BAcGWQHID799YfkCEIBmpTkUUm8QzXMivc="; }; postPatch = '' @@ -65,6 +66,7 @@ buildPythonPackage rec { "flask-login" # version 6.0.1 is listed as 0.0.1 in the dependency check and 0.0.1 is not >= 3.0.10 "flask-cors" + "requests" ]; dependencies = [ @@ -81,6 +83,7 @@ buildPythonPackage rec { requests tomli werkzeug + pytest ]; pythonImportsCheck = [ "locust" ]; diff --git a/pkgs/development/python-modules/locust/webui.nix b/pkgs/development/python-modules/locust/webui.nix index 964329564533..8905429828ef 100644 --- a/pkgs/development/python-modules/locust/webui.nix +++ b/pkgs/development/python-modules/locust/webui.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; yarnOfflineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-FbKaU3wezuvcn98FOcUZbmoot/iHtmeStp4n0dNwFYA="; + hash = "sha256-dxt7rRA6kh0msjy3DAUvtj7LoE7vEaf4pmP2B95HoeY="; }; nativeBuildInputs = [ From 51637f7c3980a202805e2f42327e210a47b39dfa Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 30 Oct 2025 22:38:55 +0100 Subject: [PATCH 0612/2279] sdl3: 3.2.24 -> 3.2.26 Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 8488b5345258..6e50417ca6f7 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -62,7 +62,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to stdenv.mkDerivation (finalAttrs: { pname = "sdl3"; - version = "3.2.24"; + version = "3.2.26"; outputs = [ "lib" @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL"; tag = "release-${finalAttrs.version}"; - hash = "sha256-LUkj9Rrf+zOW0IdV7aGccb/5bKh3TWf1IGtQkCDHd4k="; + hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k="; }; postPatch = From 68559d01c07372a4cafdccab010b27748ca984ec Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 30 Oct 2025 22:43:58 +0100 Subject: [PATCH 0613/2279] sdl2-compat: 2.32.56 -> 2.32.58 Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl2-compat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index e8890a344cfa..0aec5ddf963f 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sdl2-compat"; - version = "2.32.56"; + version = "2.32.58"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl2-compat"; tag = "release-${finalAttrs.version}"; - hash = "sha256-Xg886KX54vwGANIhTAFslzPw/sZs2SvpXzXUXcOKgMs="; + hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM="; }; nativeBuildInputs = [ From 14fe4b34deba94cfc51f1f35546c67754c19cb56 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 31 Oct 2025 09:08:04 +0800 Subject: [PATCH 0614/2279] python: fix nixenv test --- .../python/tests/test_environments/test_python.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/tests/test_environments/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py index 80713418a046..0302ae1a6f0b 100644 --- a/pkgs/development/interpreters/python/tests/test_environments/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_environments/test_python.py @@ -8,6 +8,7 @@ that would interfere with the tests. import platform import sys +import sysconfig import unittest import site @@ -38,10 +39,14 @@ class TestCasePython(unittest.TestCase): @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix") def test_base_prefix(self): - if IS_VENV or IS_NIXENV or IS_VIRTUALENV: + if IS_VENV or IS_VIRTUALENV: self.assertNotEqual(sys.prefix, sys.base_prefix) else: self.assertEqual(sys.prefix, sys.base_prefix) + if IS_NIXENV: + self.assertNotEqual(sys.base_prefix, sysconfig.get_config_var('prefix')) + else: + self.assertEqual(sys.base_prefix, sysconfig.get_config_var('prefix')) @unittest.skipIf(sys.version_info.major==3, "sys.real_prefix is only set by virtualenv in case of Python 2.") def test_real_prefix(self): From 2637d7763d9e95d286cd4057ce0f79689b7b00d9 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 31 Oct 2025 10:18:48 +0800 Subject: [PATCH 0615/2279] uv: 0.9.6 -> 0.9.7 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 51575372989b..11a3d85cf615 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-pr93GmvFx2DYt8/LzDSlllwpQ6XZuW7eMWNyEGwbUKg="; + hash = "sha256-I0Oe6vaH7iQh+Ubp5RIk8Ol6Ni7OPu8HKX0fqLdewyk="; }; - cargoHash = "sha256-nTOovX0Qnjnkx/ub+5mRPPZ4/a1/1nz5vBrq8NoULBA="; + cargoHash = "sha256-K/RP7EA0VAAI8TGx+VwfKPmyT6+x4p3kekuoMZ0/egc="; buildInputs = [ rust-jemalloc-sys From 14d0327e9c459d5d353e24890f3c0e0b6c8bd618 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 31 Oct 2025 13:11:29 +0800 Subject: [PATCH 0616/2279] fakesip: init at 0.9.1 --- pkgs/by-name/fa/fakesip/package.nix | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/fa/fakesip/package.nix diff --git a/pkgs/by-name/fa/fakesip/package.nix b/pkgs/by-name/fa/fakesip/package.nix new file mode 100644 index 000000000000..a0ce111a7d5f --- /dev/null +++ b/pkgs/by-name/fa/fakesip/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libnetfilter_queue, + libnfnetlink, + libmnl, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fakesip"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "MikeWang000000"; + repo = "FakeSIP"; + tag = finalAttrs.version; + hash = "sha256-iY9EAvy4E6aM59B1sn9d0xoUMdOsX75LslVzB/Cf5XM="; + }; + + buildInputs = [ + libnetfilter_queue + libnfnetlink + libmnl + ]; + + makeFlags = [ + "CROSS_PREFIX=${stdenv.cc.targetPrefix}" + "VERSION=${finalAttrs.version}" + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Disguise your UDP traffic as SIP protocol to evade DPI detection"; + homepage = "https://github.com/MikeWang000000/FakeSIP"; + changelog = "https://github.com/MikeWang000000/FakeSIP/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "fakesip"; + platforms = lib.platforms.linux; + }; +}) From fa73a6ee9176126fd77f55d8dd242c95157b7c17 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Fri, 31 Oct 2025 07:57:46 +0100 Subject: [PATCH 0617/2279] python3Packages.python-socketio: increase test coverage --- pkgs/development/python-modules/python-socketio/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 4e5d9c86e1dc..ca137a296fec 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -18,11 +18,12 @@ # tests msgpack, - pytest7CheckHook, + pytestCheckHook, simple-websocket, uvicorn, redis, valkey, + pytest-asyncio, }: @@ -55,11 +56,12 @@ buildPythonPackage rec { nativeCheckInputs = [ msgpack - pytest7CheckHook + pytestCheckHook uvicorn simple-websocket redis valkey + pytest-asyncio ] ++ lib.flatten (lib.attrValues optional-dependencies); From a756bcdcb8805e74c134130156b80be2a1b943f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Oct 2025 12:13:09 +0200 Subject: [PATCH 0618/2279] python313Packages.locust-cloud: enable tests --- .../python-modules/locust-cloud/default.nix | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix index c46d093dbb3e..726c20a852c2 100644 --- a/pkgs/development/python-modules/locust-cloud/default.nix +++ b/pkgs/development/python-modules/locust-cloud/default.nix @@ -10,7 +10,11 @@ python-engineio, python-socketio, requests, + gevent-websocket, tomli, + flask, + requests-mock, + pytestCheckHook, }: buildPythonPackage rec { @@ -40,8 +44,33 @@ buildPythonPackage rec { tomli ]; + nativeCheckInputs = [ + flask + gevent-websocket + pytestCheckHook + requests-mock + ]; + pythonImportsCheck = [ "locust_cloud" ]; + preCheck = '' + export LOCUSTCLOUD_USERNAME=dummy + export LOCUSTCLOUD_PASSWORD=dummy + ''; + + disabledTests = [ + # AssertionError + "test_recursive_imports" + "test_from_import_file" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/web_login_test.py" + "tests/cloud_test.py" + "tests/websocket_test.py" + ]; + meta = { description = "Hosted version of Locust to run distributed load tests"; homepage = "https://github.com/locustcloud/locust-cloud"; From aed67158fcece24f16a20dc101ef70631d9ea44b Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Tue, 28 Oct 2025 11:48:43 +0100 Subject: [PATCH 0619/2279] readest: 0.9.88 -> 0.9.90 Changelog: https://github.com/readest/readest/releases/tag/v0.9.90 Diff: https://github.com/readest/readest/compare/v0.9.88...v0.9.90 --- 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 d6f1b65ee125..703cddb1641c 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.88"; + version = "0.9.90"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-z9bRRXQkXsqZRW1EPj0c8A9ZHWytYYtP6o40K86+Fio="; + hash = "sha256-y7fk27uISjjP7fKhaNlZE8cYwxia6lexOPbY+Qe9cMs="; fetchSubmodules = true; }; @@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-sRa1IO8JmMsA0/7dMuYF0as/MYHpclEwAknZIycNQ3Y="; + hash = "sha256-RsmI0avMnVWlLMzwGJJmPNSEJpNaq7IWimjpMJ+nR80="; }; pnpmRoot = "../.."; - cargoHash = "sha256-oNzgsxJb8N++AGCkXuJmK+51iF7XZ0xmShPlOpkAQEg="; + cargoHash = "sha256-nNMD2LnMDz91kI2QniD+zD/Ug9BSVjTIiuxWdz8UxL0="; cargoRoot = "../.."; From 6c79b3b19e9d4766148741dc7cb0cafe67703b06 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 29 Oct 2025 17:05:41 +0100 Subject: [PATCH 0620/2279] readest: 0.9.90 -> 0.9.91 Changelog: https://github.com/readest/readest/releases/tag/v0.9.91 Diff: https://github.com/readest/readest/compare/v0.9.90...v0.9.91 --- pkgs/by-name/re/readest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 703cddb1641c..38861008971e 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.90"; + version = "0.9.91"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-y7fk27uISjjP7fKhaNlZE8cYwxia6lexOPbY+Qe9cMs="; + hash = "sha256-Xz+s+yv0L2bj7T6GA6IkMGTAk2oGyFuYR5zzyeLbTuc="; fetchSubmodules = true; }; From f67498e240de8f91da22a87bc5a8e4213ccc2e2a Mon Sep 17 00:00:00 2001 From: Hans Joachim Kliemeck Date: Fri, 31 Oct 2025 10:32:50 +0100 Subject: [PATCH 0621/2279] google-api-python-client: fix hash --- .../python-modules/google-api-python-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 4023e32564de..54360a12fd12 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "google-api-python-client"; tag = "v${version}"; - hash = "sha256-y6MfDwA1CKsKmXH9NIqFtKIz8vk5XC6d91scrTI4xdY="; + hash = "sha256-uItN7P6tZTxEHfma+S0p4grRRnAaIhuTezvJzWjvkfE="; }; build-system = [ setuptools ]; From 7deaa22e9c6b63d95f5ff01c7dc7e30d2d262023 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Fri, 31 Oct 2025 14:35:08 +0100 Subject: [PATCH 0622/2279] vectorscan: Remove -Werror to fix darwin builds --- pkgs/by-name/ve/vectorscan/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ve/vectorscan/package.nix b/pkgs/by-name/ve/vectorscan/package.nix index 5c43c3fcccd9..8b174dc5feec 100644 --- a/pkgs/by-name/ve/vectorscan/package.nix +++ b/pkgs/by-name/ve/vectorscan/package.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { substituteInPlace libhs.pc.in \ --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \ --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" + substituteInPlace cmake/cflags-generic.cmake \ + --replace-fail "-Werror" "" substituteInPlace cmake/build_wrapper.sh \ --replace-fail 'nm' '${stdenv.cc.targetPrefix}nm' \ --replace-fail 'objcopy' '${stdenv.cc.targetPrefix}objcopy' From 9462239983c89766a499830ae8181480424a8e21 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Thu, 30 Oct 2025 20:44:47 -0400 Subject: [PATCH 0623/2279] nanomq: 0.23.6 -> 0.24.5 --- pkgs/by-name/na/nanomq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index a365ce02aae1..ef1f0e3db184 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.23.6"; + version = "0.24.5"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; tag = finalAttrs.version; - hash = "sha256-Fy/9ASpQ/PHGItYhad69DdHWqCr/Wa+Xdm53Q573Pfc="; + hash = "sha256-tyhAEYdYCO0Tur7HDXXbBSQ8tzTHCbW9B8aBu0sMEEI="; fetchSubmodules = true; }; From 9ed639a0f3067f2b27e289b2fbd5019f3bd265c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Oct 2025 08:31:11 -0700 Subject: [PATCH 0624/2279] python3Packages.psutil: 7.1.0 -> 7.1.2 Diff: https://github.com/giampaolo/psutil/compare/release-7.1.0...release-7.1.2 Changelog: https://github.com/giampaolo/psutil/blob/release-7.1.2/HISTORY.rst --- .../python-modules/psutil/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 20e3bf06c1d3..dac2afcd346f 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -2,25 +2,25 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pytestCheckHook, python, - pythonOlder, + gitUpdater, }: buildPythonPackage rec { pname = "psutil"; - version = "7.1.0"; + version = "7.1.2"; pyproject = true; inherit stdenv; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-ZVcIs8BpOHyLd7By/EKaV9DiFCIdAcCnct99/tyzvNI="; + src = fetchFromGitHub { + owner = "giampaolo"; + repo = "psutil"; + tag = "release-${version}"; + hash = "sha256-LyGnLrq+SzCQmz8/P5DOugoNEyuH0IC7uIp8UAPwH0U="; }; postPatch = '' @@ -63,11 +63,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "psutil" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { + rev-prefix = "release-"; + }; + + meta = { description = "Process and system utilization information interface"; homepage = "https://github.com/giampaolo/psutil"; - changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst"; - license = licenses.bsd3; + changelog = "https://github.com/giampaolo/psutil/blob/${src.tag}/HISTORY.rst"; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From e0472106fdd973dacd3850f31b5702fe1b9a7695 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 31 Oct 2025 17:04:34 +0100 Subject: [PATCH 0625/2279] melonDS: drop qt 6.10 patch --- pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch | 15 --------------- pkgs/by-name/me/melonDS/package.nix | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch diff --git a/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch deleted file mode 100644 index a7138372240e..000000000000 --- a/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt -index 1afa856f..dcd36f84 100644 ---- a/src/frontend/qt_sdl/CMakeLists.txt -+++ b/src/frontend/qt_sdl/CMakeLists.txt -@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON) - if (USE_QT6) - find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED) - set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets) -+ if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10") -+ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED) -+ list(APPEND QT_LINK_LIBS Qt6::GuiPrivate) -+ endif() - else() - find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED) - set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index bde7555c6e54..831f12648b4e 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY="; }; - patches = [ ./fix-build-qt-6.10.patch ]; - nativeBuildInputs = [ cmake extra-cmake-modules From 49b98b13f903ab5b311a270eef293033d027b9bc Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 31 Oct 2025 17:06:51 +0100 Subject: [PATCH 0626/2279] libxml2: 2.15.0 -> 2.15.1 --- pkgs/development/libraries/libxml2/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8c4c1c653092..41d2b1f953f0 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -50,23 +50,14 @@ let }; }; libxml2 = callPackage ./common.nix { - version = "2.15.0"; + version = "2.15.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libxml2"; tag = "v${packages.libxml2.version}"; - hash = "sha256-jumHSiIMDzqG2hvPUdcBP8LsszcU+loOY+vqEh/0Yqo="; + hash = "sha256-FUfYMq5xT2i88JdIw9OtSofraUL3yjsyOVund+mfJKQ="; }; - extraPatches = [ - # Fixes a regression in attribute normalization. - # Also see https://www.postgresql.org/message-id/flat/0756AC61-FBA3-46E2-B3C2-19B58B65EBDC%2540yesql.se - # To be removed with 2.15.1. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/da45a190f718e8e2f0e3d2a6325ffa23abc8b90c.patch"; - hash = "sha256-wqmFszr7w1Lte12YR6Ug7Ng7fXABzizwUsJU1EhylgU="; - }) - ]; extraMeta = { maintainers = with lib.maintainers; [ jtojnar From 0bbff0df8a42ae29c46848116d40cbd4017ce857 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 31 Oct 2025 17:25:43 +0100 Subject: [PATCH 0627/2279] librsvg: 2.61.1 -> 2.61.2, pick upstream patch for libxml 2.15 support --- .../expect-any-error-too-many-elements.patch | 23 ------------------- pkgs/by-name/li/librsvg/package.nix | 22 +++++++++--------- 2 files changed, 11 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch diff --git a/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch b/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch deleted file mode 100644 index 94f145bb744c..000000000000 --- a/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/rsvg/tests/errors.rs b/rsvg/tests/errors.rs -index 02b134bee..46391fa5d 100644 ---- a/rsvg/tests/errors.rs -+++ b/rsvg/tests/errors.rs -@@ -14,15 +14,12 @@ use rsvg::{CairoRenderer, ImplementationLimit, Loader, LoadingError, RenderingEr - - #[ignore] - #[test] -+#[should_panic] - fn too_many_elements() { - let name = "tests/fixtures/errors/bug515-too-many-elements.svgz"; - -- assert!(matches!( -- Loader::new().read_path(name), -- Err(LoadingError::LimitExceeded( -- ImplementationLimit::TooManyLoadedElements -- )) -- )); -+ // libxml2 might return an error without updating the element count, so just expect any error, not specifically too many elements -+ Loader::new().read_path(name).unwrap(); - } - - fn rendering_instancing_limit(name: &str) { diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix index 4317c8cbb319..978cc3cad3b7 100644 --- a/pkgs/by-name/li/librsvg/package.nix +++ b/pkgs/by-name/li/librsvg/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, meson, ninja, @@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.61.1"; + version = "2.61.2"; outputs = [ "out" @@ -61,24 +62,23 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-vBu81BkSCwmNsovqVTNdneJHDU5qn27pcge0EPwVhn0="; + hash = "sha256-RkTYNiPdYcxEecKzw3Lh2isoFVLryQA1yNGsUC6x3AA="; }; patches = [ - # too_many_elements test fails with libxml 2.15.0, - # because libxml2 no longer updates the element count - # before erroring out, which breaks the librsvg limit check. - # - # This is okay, because the error is still detected. - # The error is simply not reported accurately. - # https://gitlab.gnome.org/GNOME/librsvg/-/issues/1201 - ./expect-any-error-too-many-elements.patch + (fetchpatch { + # https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1149 + # libxml 2.15+ requires adjustments to error handling + # remove next librsvg release + url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/6663df8e9aec323f0c124e97a7c7447a90c67c4a.patch"; + hash = "sha256-+iyRvxVMxSCW0IIizXXheBFytwhBtU4cyJNTBebCOSg="; + }) ]; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-3DAFyY7uNB5cP8ry28v12QsFdxHtpr1nyLtzhojBq7c="; + hash = "sha256-OZspQg9ryDNILUZMiB77vIF0uGCMyVe7blX5BJk102k="; dontConfigure = true; }; From f2633f428b8a365514b7d9a9528710f4b01ca464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Oct 2025 17:30:57 +0000 Subject: [PATCH 0628/2279] keychain: 2.9.6 -> 2.9.7 --- pkgs/by-name/ke/keychain/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix index 59a718a4f37f..35523f15ab94 100644 --- a/pkgs/by-name/ke/keychain/package.nix +++ b/pkgs/by-name/ke/keychain/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "keychain"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = version; - sha256 = "sha256-R70W8/tE4suGgiSqkJ1RJ0fJ3C+exdoVesXtvxPORVo="; + sha256 = "sha256-/8OY/URIhVl8bTlJPRGidExHzkwzckm/v3QUq7Fxe04="; }; nativeBuildInputs = [ From a366e979b2389c1b55ce84183c4285e2651402a5 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 31 Oct 2025 20:07:29 +0100 Subject: [PATCH 0629/2279] element-desktop: 1.12.1 -> 1.12.2 Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.2 Full changelog: https://github.com/element-hq/element-desktop/compare/v1.12.1...v1.12.2 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- pkgs/by-name/el/element-desktop/yarn.nix | 6 ++++++ pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index b113722a0d9a..c3c1b7005e3c 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.1"; + "version" = "1.12.2"; "hashes" = { - "desktopSrcHash" = "sha256-4C4WJ3HjiXh24umt80lWujeiDvRaS1mf2IjCj6+n87U="; - "desktopYarnHash" = "sha256-CyP0zy/nJoGolmB/p81jL0qAoD7d5xe5kvlmKW7Yaw8="; + "desktopSrcHash" = "sha256-P/pQpI3kyWGGZo1CK0nnkcg52jlVMrhGh8EFWWn0Euc="; + "desktopYarnHash" = "sha256-M6vz2u7MQuMW1ag3aJW6s2RI6rU6RC2aFEvVvKwtwaA="; }; } diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix index 5a1274349537..159a1db2aaea 100644 --- a/pkgs/by-name/el/element-desktop/yarn.nix +++ b/pkgs/by-name/el/element-desktop/yarn.nix @@ -1,5 +1,6 @@ { stdenvNoCC, + nodejs, yarn, cacert, git, @@ -13,6 +14,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ cacert + nodejs yarn git ]; @@ -26,6 +28,10 @@ stdenvNoCC.mkDerivation { export YARN_ENABLE_TELEMETRY=0 yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive + # Apply upstream patch + # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in + # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de + node ./node_modules/patch-package/index.js mkdir -p $out/node_modules cp -r node_modules/* $out/node_modules/ diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 1b8cdd761417..0230c5e0b02b 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.1"; + "version" = "1.12.2"; "hashes" = { - "webSrcHash" = "sha256-c9VoR+F33xDvLn4PkPGBXW5+Yl9vX7FzedN6HfjfHEI="; - "webYarnHash" = "sha256-Bu0rrzPNRdY5G/nhSlhXpBMq6tcjuc16s0UQR64gUc8="; + "webSrcHash" = "sha256-f81axhmX3KRSzlvi7cST/QfmOySkLhTcDTlnpTETQ6c="; + "webYarnHash" = "sha256-NvFpyopXQ/ZI96f2kFN6tud4JkdBONgobkr9u9Rk4z4="; }; } From e824258139222acdde9c4704d4a97662c216c38e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 31 Oct 2025 20:38:57 +0100 Subject: [PATCH 0630/2279] blockbench: 4.12.6 -> 5.0.3 --- pkgs/by-name/bl/blockbench/package.nix | 47 +++++++++++++------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 547fa42bec90..9d1ef022400d 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "4.12.6"; + version = "5.0.3"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-iV8qpUsUnL1n6hKADegNTmrW/AUWNiiNLxrTU4WPR30="; + hash = "sha256-kUPzAmxTEnUA+2o/IfBLE6hCChQ9YoTUfKKYfPGV0jg="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-ZLFmcK91SrUM+ouBENzc+MdNvQCRDh0ej4tf2TneUtQ="; + npmDepsHash = "sha256-Do5IJvd5ZXDgByKK1Elg0W2SZxeDH8OORloDuT9mIN4="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; @@ -39,7 +39,7 @@ buildNpmPackage rec { sed -i "/afterSign/d" package.json ''; - npmBuildScript = "bundle"; + npmBuildScript = "build-electron"; postBuild = '' # electronDist needs to be modifiable on Darwin @@ -54,28 +54,27 @@ buildNpmPackage rec { installPhase = '' runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r dist-electron/mac*/Blockbench.app $out/Applications + makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + mkdir -p $out/share/blockbench + cp -r dist-electron/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - cp -r dist/mac*/Blockbench.app $out/Applications - makeWrapper $out/Applications/Blockbench.app/Contents/MacOS/Blockbench $out/bin/blockbench - ''} - - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - mkdir -p $out/share/blockbench - cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/blockbench - - for size in 16 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png - done - - makeWrapper ${lib.getExe electron} $out/bin/blockbench \ - --add-flags $out/share/blockbench/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --inherit-argv0 - ''} + for size in 16 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + magick icon.png -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/blockbench.png + done + makeWrapper ${lib.getExe electron} $out/bin/blockbench \ + --add-flags $out/share/blockbench/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --inherit-argv0 + '' + + '' runHook postInstall ''; From 2856550b7abbb8d7d0c471d3cf20365dfaef44dc Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 31 Oct 2025 18:05:56 -0300 Subject: [PATCH 0631/2279] nethack-qt: mark as broken on darwin --- pkgs/by-name/ne/nethack/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix index cda6763fd87b..db5b8c7b01c5 100644 --- a/pkgs/by-name/ne/nethack/package.nix +++ b/pkgs/by-name/ne/nethack/package.nix @@ -238,5 +238,6 @@ stdenvUsed.mkDerivation (finalAttrs: { platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix; maintainers = with lib.maintainers; [ iedame ]; mainProgram = "nethack"; + broken = if qtMode then stdenv.hostPlatform.isDarwin else false; }; }) From ad01a42c44560581b9e52ed3bdf26a39d67c787b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 31 Oct 2025 21:10:56 +0000 Subject: [PATCH 0632/2279] biblesync: fix `cmake-4` build Without the change the build fails as https://hydra.nixos.org/build/310527048: CMake Error at CMakeLists.txt:11 (CMAKE_MINIMUM_REQUIRED): Compatibility with CMake < 3.5 has been removed from CMake. THe change pulls upstream fix as is. --- pkgs/by-name/bi/biblesync/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix index 486244f71329..58201c9ea269 100644 --- a/pkgs/by-name/bi/biblesync/package.nix +++ b/pkgs/by-name/bi/biblesync/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, cmake, libuuid, @@ -19,6 +20,15 @@ stdenv.mkDerivation rec { sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s"; }; + patches = [ + # Fix cmake-4 support + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/karlkleinpaste/biblesync/commit/4b00f9fd3d0c858947eee18206ef44f9f6bd2283.patch?full_index=1"; + hash = "sha256-CVYhYBDneLN3Ogvye01EQCc9zxjSwaKBzk1fBaKINug="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake From 41eea142fa8b8b1a3dcda30428b6ff8b4f951d55 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Fri, 31 Oct 2025 18:25:10 -0400 Subject: [PATCH 0633/2279] libffi: link tsan tests with pthread library on FreeBSD --- pkgs/development/libraries/libffi/default.nix | 3 +++ .../libffi/freebsd-tsan-pthread.patch | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 02f93a256c54..dbabceb5230f 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ + # Threading tests need to be linked against pthread + # See: https://github.com/libffi/libffi/pull/944 + ./freebsd-tsan-pthread.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch b/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch new file mode 100644 index 000000000000..05c278bdbc83 --- /dev/null +++ b/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch @@ -0,0 +1,24 @@ +From e52a0790a9b80492cba2907c27d0a9e4248b6608 Mon Sep 17 00:00:00 2001 +From: Jon Hermansen +Date: Tue, 28 Oct 2025 18:02:39 -0400 +Subject: [PATCH] fix tsan tests on FreeBSD by linking to pthread + +--- + testsuite/lib/libffi.exp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp +index 81eff7752..308db6f8d 100644 +--- a/testsuite/lib/libffi.exp ++++ b/testsuite/lib/libffi.exp +@@ -407,6 +407,10 @@ proc libffi_target_compile { source dest type options } { + lappend options "libs= -lpthread" + } + ++ if { [string match "*-*-freebsd*" $target_triplet] } { ++ lappend options "libs= -lpthread" ++ } ++ + lappend options "libs= -lffi" + + if { [string match "aarch64*-*-linux*" $target_triplet] } { From 8437916107fcfd31ac51783c7269c9453385fd23 Mon Sep 17 00:00:00 2001 From: Mio Date: Sat, 1 Nov 2025 10:15:35 +1100 Subject: [PATCH 0634/2279] rust-cbindgen: 0.29.1 -> 0.29.2 https://github.com/mozilla/cbindgen/releases/tag/v0.29.2 --- pkgs/by-name/ru/rust-cbindgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix index 1989f9bf0bbc..0190edf76fea 100644 --- a/pkgs/by-name/ru/rust-cbindgen/package.nix +++ b/pkgs/by-name/ru/rust-cbindgen/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-w1vLgdyxyZNnPQUJL6yYPHhB99svsryVkwelblEAisQ="; + hash = "sha256-P2A+XSLrcuYsI48gnZSNNs5qX+EatiuEJSEJbMvMSxg="; }; - cargoHash = "sha256-POpdgDlBzHs4/fgV1SWSWcxVrn0UTTfvqYBRGqwD98s="; + cargoHash = "sha256-DbmlpjiOraLWPh5RgJqCIGIYzE1h82MH2S6gpLH+CIQ="; nativeCheckInputs = [ cmake From 406c575b4b31d49156777cedf532e9cf44044e3b Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Sat, 1 Nov 2025 14:59:12 +1100 Subject: [PATCH 0635/2279] base16384: fix hash fixes: https://hydra.nixos.org/build/309554150 --- pkgs/by-name/ba/base16384/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix index ca6badfda00d..e066d25885d7 100644 --- a/pkgs/by-name/ba/base16384/package.nix +++ b/pkgs/by-name/ba/base16384/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "fumiama"; repo = "base16384"; rev = "v${version}"; - hash = "sha256-Xkub0sWT+1oJlznDnnV1mDgQNiMQj8gsWemrCOAYYgE="; + hash = "sha256-qaDnv+KpXMYdx6eqH7pU0pEjSpU5xg9I7afxpoO3iGs="; }; nativeBuildInputs = [ cmake ]; From 13fc806573bb7d8e03a9dfbeb958ec20681cb5b2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 1 Nov 2025 06:18:09 +0000 Subject: [PATCH 0636/2279] bash-completion: 2.16.0 -> 2.17.0 Changes: https://github.com/scop/bash-completion/releases/tag/2.17.0 --- pkgs/by-name/ba/bash-completion/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix index fdec25367b2d..1d7ef107008a 100644 --- a/pkgs/by-name/ba/bash-completion/package.nix +++ b/pkgs/by-name/ba/bash-completion/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.16.0"; + version = "2.17.0"; # Using fetchurl because fetchGithub or fetchzip will have trouble on # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 src = fetchurl { url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"; - hash = "sha256-M2m9XkGKdfuZCGOSWu1bQgOYrOuzIOxMAwaz6uI/EHo="; + hash = "sha256-3Z2CXklkNfs766Oue+qfd+gh6JRmfQdDHR1MjFcLnlg="; }; postPatch = '' From 806d24f4b2193e0541854846d76ac6fb36d222dc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 1 Nov 2025 06:25:29 +0000 Subject: [PATCH 0637/2279] arc_unpacker: fix `cmake-4` build Without the change the build fails as https://hydra.nixos.org/build/310523160: CMake Error at CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. --- pkgs/by-name/ar/arc_unpacker/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ar/arc_unpacker/package.nix b/pkgs/by-name/ar/arc_unpacker/package.nix index e11506a976c6..667b723b868b 100644 --- a/pkgs/by-name/ar/arc_unpacker/package.nix +++ b/pkgs/by-name/ar/arc_unpacker/package.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation { cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h sed '1i#include ' -i src/dec/eagls/pak_archive_decoder.cc # gcc12 sed '1i#include ' -i src/flow/cli_facade.h # gcc14 + + # cmake-4 support + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.8.8)' \ + 'cmake_minimum_required(VERSION 3.10)' ''; nativeBuildInputs = [ From 9bc9429f8680c7c06d76a5ee21f04a77f9fe4297 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 1 Nov 2025 06:30:11 +0000 Subject: [PATCH 0638/2279] blockattack: 2.9.0 -> 2.10.0 (`cmake-4` support) Changes: https://blockattack.net/2025/10/16/version_2_10_0_released.html --- pkgs/by-name/bl/blockattack/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index 5f866a0e7470..aafab547514c 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -9,6 +9,7 @@ fetchFromGitHub, gettext, gitUpdater, + libx11, ninja, physfs, pkg-config, @@ -18,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "blockattack"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "blockattack"; repo = "blockattack-game"; rev = "v${finalAttrs.version}"; - hash = "sha256-6mPj6A7mYm4CXkSSemNPn1CPkd7+01yr8KvCBM3a5po="; + hash = "sha256-sp/D0MSLWV1iV89UULlz8IrP5nmiMv6PsoGf1WM5kGw="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_ttf SDL2_ttf boost + libx11 physfs ]; From 413debbc1474fecd210229d1814be1f8795ca2eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 08:00:52 +0000 Subject: [PATCH 0639/2279] python3Packages.arxiv: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/arxiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix index ad01b4b3a17e..710e393c071e 100644 --- a/pkgs/development/python-modules/arxiv/default.nix +++ b/pkgs/development/python-modules/arxiv/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "arxiv"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "lukasschwab"; repo = "arxiv.py"; tag = version; - hash = "sha256-/lXUWRJ1lbRPWUC/gMRA0NIcuV0HNzFlUVLyhcPAsCQ="; + hash = "sha256-E1Slg7EWSULY68BrevmJO82L47UVFZBreKLVIDko1x0="; }; build-system = [ setuptools ]; From 9a3b053d7fd67902fdcb4921a0faec60964ec57d Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 1 Nov 2025 12:17:27 +0000 Subject: [PATCH 0640/2279] portfolio: 0.80.3 -> 0.80.4 --- pkgs/by-name/po/portfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 163678c77e41..ee474f7d738f 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.80.3"; + version = "0.80.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-qfh0UqEvfkUVAuOj567z9DZfMUQoomPhYOi/gNFRpYE="; + hash = "sha256-IVaowzXl1WKa5wvQiT+Zub81Kxp57JOfb5cZ8egM2q4="; }; nativeBuildInputs = [ From 981d9986ba5aa4b226f177919e23853c5eeb2c7a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 1 Nov 2025 12:34:41 +0000 Subject: [PATCH 0641/2279] python312Packages.blosc2: 3.7.1 -> 3.11.0 --- pkgs/development/python-modules/blosc2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index d62178ee476b..050e881ea0de 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "blosc2"; - version = "3.7.1"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; tag = "v${version}"; - hash = "sha256-mA7/8i77wtl9b6IT4Wp/uFDYp/IacnPnAsRoXe64+z4="; + hash = "sha256-L4NTURGmRlM2ZY11NvP36EoImPu1ncb+CBFCeuCC+eQ="; }; nativeBuildInputs = [ From bdc47235659b15fbd99416c4ec9b6991e49e057d Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 1 Nov 2025 13:38:14 +0000 Subject: [PATCH 0642/2279] coreutils: patch `tail` printing too few lines * https://lists.gnu.org/archive/html/coreutils/2025-09/msg00233.html * https://github.com/coreutils/coreutils/commit/914972e80dbf82aac9ffe3ff1f67f1028e1a788b * https://github.com/NixOS/nixpkgs/pull/445644#issuecomment-3467852989. --- pkgs/tools/misc/coreutils/default.nix | 6 ++++ pkgs/tools/misc/coreutils/tail.patch | 50 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/misc/coreutils/tail.patch diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 4f94c41dcf42..dd7c095900ca 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -55,6 +55,12 @@ stdenv.mkDerivation rec { hash = "sha256-5tT9LYUskUGhwqGKE9FGoM1+RRlfcik6TkwETsbMyhU="; }; + patches = [ + # Extremely bad bug where `tail` prints fewer lines than it should. + # https://github.com/coreutils/coreutils/commit/914972e80dbf82aac9ffe3ff1f67f1028e1a788b + ./tail.patch + ]; + postPatch = '' # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh diff --git a/pkgs/tools/misc/coreutils/tail.patch b/pkgs/tools/misc/coreutils/tail.patch new file mode 100644 index 000000000000..40336daae137 --- /dev/null +++ b/pkgs/tools/misc/coreutils/tail.patch @@ -0,0 +1,50 @@ +(NB: we omit the new test, in order to avoid rerunning autoconf.) + +From 914972e80dbf82aac9ffe3ff1f67f1028e1a788b Mon Sep 17 00:00:00 2001 +From: Hannes Braun +Date: Wed, 24 Sep 2025 21:20:49 +0200 +Subject: [PATCH] tail: fix tailing larger number of lines in regular files + +* src/tail.c (file_lines): Seek to the previous block instead of the +beginning (or a little before) of the block that was just scanned. +Otherwise, the same block is read and scanned (at least partially) +again. This bug was introduced by commit v9.7-219-g976f8abc1. +* tests/tail/basic-seek.sh: Add a new test. +* tests/local.mk: Reference the new test. +* NEWS: mention the bug fix. +--- + NEWS | 4 ++++ + src/tail.c | 2 +- + tests/local.mk | 1 + + tests/tail/basic-seek.sh | 28 ++++++++++++++++++++++++++++ + 4 files changed, 34 insertions(+), 1 deletion(-) + create mode 100755 tests/tail/basic-seek.sh + +diff --git a/NEWS b/NEWS +index 7a1a73113e839f010aa6c734e6f07da68827b953..dc1d26879327761d35499815776477771758edd4 100644 +--- a/NEWS ++++ b/NEWS +@@ -7,6 +7,10 @@ GNU coreutils NEWS -*- outline -*- + `basenc --base58` would not operate correctly with input > 15561475 bytes. + [bug introduced with --base58 in coreutils-9.8] + ++ 'tail' outputs the correct number of lines again for non-small -n values. ++ Previously it may have output too few lines. ++ [bug introduced in coreutils-9.8] ++ + + * Noteworthy changes in release 9.8 (2025-09-22) [stable] + +diff --git a/src/tail.c b/src/tail.c +index b8bef1d91cdb6cde2b666b6c1575376e075eaeb8..c7779c77dfe4cf5a672a265b6e796c7153590170 100644 +--- a/src/tail.c ++++ b/src/tail.c +@@ -596,7 +596,7 @@ file_lines (char const *prettyname, int fd, struct stat const *sb, + goto free_buffer; + } + +- pos = xlseek (fd, -bufsize, SEEK_CUR, prettyname); ++ pos = xlseek (fd, -(bufsize + bytes_read), SEEK_CUR, prettyname); + bytes_read = read (fd, buffer, bufsize); + if (bytes_read < 0) + { From e86da036262bf3656409f1ca8b036e8a77f7e9fb Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Wed, 29 Oct 2025 17:17:31 +0100 Subject: [PATCH 0643/2279] zandronum: add desktop file --- pkgs/by-name/za/zandronum/package.nix | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/by-name/za/zandronum/package.nix b/pkgs/by-name/za/zandronum/package.nix index eaeddab5c79a..7cf331bc8468 100644 --- a/pkgs/by-name/za/zandronum/package.nix +++ b/pkgs/by-name/za/zandronum/package.nix @@ -20,6 +20,9 @@ gtk2, python3, game-music-emu, + copyDesktopItems, + makeDesktopItem, + imagemagick, serverOnly ? false, }: @@ -72,6 +75,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper python3 + copyDesktopItems + imagemagick ]; preConfigure = '' @@ -93,8 +98,22 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; + desktopItems = [ + (makeDesktopItem { + name = "zandronum"; + desktopName = "Zandronum"; + exec = "zandronum"; + icon = "zandronum"; + mimeTypes = [ "application/x-doom-wad" ]; + categories = [ "Game" ]; + comment = finalAttrs.meta.description; + }) + ]; + # Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/lib/zandronum cp zandronum${suffix} \ @@ -104,6 +123,16 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum${suffix} wrapProgram $out/bin/zandronum${suffix} \ --set LC_ALL="C" + + # Upstream only provides an icon file for Windows. + # This converts the .ico file to PNGs, which are used by the desktop file. + for size in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + magick $src/src/win32/zandronum.ico -background none -resize "$size"x"$size" -flatten \ + $out/share/icons/hicolor/"$size"x"$size"/apps/zandronum.png + done; + + runHook postInstall ''; postFixup = lib.optionalString (!serverOnly) '' From b9c7f0e6d4ebe0e0b2c1dc695fc94f2be563fbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 1 Nov 2025 16:15:52 +0100 Subject: [PATCH 0644/2279] empty-epsilon: avoid ambiguous version to make overrides easier --- pkgs/by-name/em/empty-epsilon/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index d4009323fb73..9cb8ec06c7ea 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -14,7 +14,7 @@ }: let - version = { + versions = { seriousproton = "2024.12.08"; emptyepsilon = "2024.12.08"; basis-universal = "1.15_final"; @@ -23,18 +23,18 @@ let basis-universal = fetchFromGitHub { owner = "BinomialLLC"; repo = "basis_universal"; - tag = version.basis-universal; + tag = versions.basis-universal; hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY="; }; serious-proton = stdenv.mkDerivation { pname = "serious-proton"; - version = version.seriousproton; + version = versions.seriousproton; src = fetchFromGitHub { owner = "daid"; repo = "SeriousProton"; - tag = "EE-${version.seriousproton}"; + tag = "EE-${versions.seriousproton}"; hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90="; }; @@ -64,12 +64,12 @@ in stdenv.mkDerivation { pname = "empty-epsilon"; - version = version.emptyepsilon; + version = versions.emptyepsilon; src = fetchFromGitHub { owner = "daid"; repo = "EmptyEpsilon"; - tag = "EE-${version.emptyepsilon}"; + tag = "EE-${versions.emptyepsilon}"; hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48="; }; @@ -87,10 +87,10 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeFeature "SERIOUS_PROTON_DIR" "${serious-proton.src}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${version.emptyepsilon}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major version.emptyepsilon}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor version.emptyepsilon}") - (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch version.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION" "${versions.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MAJOR" "${lib.versions.major versions.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_MINOR" "${lib.versions.minor versions.emptyepsilon}") + (lib.cmakeFeature "CPACK_PACKAGE_VERSION_PATCH" "${lib.versions.patch versions.emptyepsilon}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BASIS" "${basis-universal}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MESHOPTIMIZER" "${meshoptimizer.src}") (lib.cmakeFeature "CMAKE_AR" "${stdenv.cc.cc}/bin/gcc-ar") From 30af8f5003683b8501a5318c185926b0fa2f3ab9 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 20:09:02 -0300 Subject: [PATCH 0645/2279] scipopt-ug: update scipVersion --- pkgs/by-name/sc/scipopt-ug/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix index 1afb8f50b291..96b9ae0d34de 100644 --- a/pkgs/by-name/sc/scipopt-ug/package.nix +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { version = "1.0.0-beta6"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; # Take the SCIPOptSuite source since no other source exists publicly. src = fetchzip { url = "https://github.com/scipopt/scip/releases/download/v${ lib.replaceStrings [ "." ] [ "" ] scipVersion }/scipoptsuite-${scipVersion}.tgz"; - sha256 = "sha256-Hi6oDPtJZODTBIuRYE62sUMTJqfmF0flY3cGoWh2IZE="; + hash = "sha256-ZFgHaC4JL0eFt/do0ucGkarmfL1WdGEecrE1iPBpFh0="; }; sourceRoot = "${src.name}/ug"; From 8a12c0fbb842a703bb1ebf9f305f6fd53e7d6ed3 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 24 Oct 2025 20:09:18 -0300 Subject: [PATCH 0646/2279] scipopt-zimpl: update scipVersion --- pkgs/by-name/sc/scipopt-zimpl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index ef63e973e232..971dc1b5cf19 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { version = "362"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.3"; + scipVersion = "9.2.4"; src = fetchFromGitHub { owner = "scipopt"; repo = "zimpl"; tag = "v${version}"; - sha256 = "juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; + hash = "sha256-juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; }; postPatch = '' From 020f1420f3c455d9e15727c22392cedbc85cdb55 Mon Sep 17 00:00:00 2001 From: Emi Katagiri-Simpson Date: Sat, 1 Nov 2025 11:41:25 -0400 Subject: [PATCH 0647/2279] maintainers: add alch-emi --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3197d3c90b29..a2c6edf7c75f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1069,6 +1069,13 @@ } ]; }; + alch-emi = { + email = "emi@alchemi.dev"; + github = "Alch-Emi"; + githubId = 38897201; + name = "Emi"; + matrix = "@emi:the-apothecary.club"; + }; aldenparker = { github = "aldenparker"; githubId = 32986873; From 89b593f046bf5b15d735407403f19ddf0ef697b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 15:52:28 +0000 Subject: [PATCH 0648/2279] python3Packages.plumbum: 1.9.0 -> 1.10.0 --- pkgs/development/python-modules/plumbum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index fdd6b39f655c..64750378f233 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = "plumbum"; tag = "v${version}"; - hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU="; + hash = "sha256-ca9avbBJnMecuKljIrx3mYIGA50QXmhC/LP3hM9Uvcs="; }; build-system = [ From f15dd0b6770e272f136b1f52aa03833b9b069641 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Sun, 2 Nov 2025 03:09:40 +0700 Subject: [PATCH 0649/2279] rio: install man pages --- pkgs/by-name/ri/rio/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 113d35a18347..2e988f3c33e2 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -7,8 +7,10 @@ nixosTests, nix-update-script, autoPatchelfHook, + installShellFiles, cmake, ncurses, + scdoc, pkg-config, gcc-unwrapped, fontconfig, @@ -62,6 +64,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ rustPlatform.bindgenHook ncurses + scdoc + installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ cmake @@ -99,6 +103,11 @@ rustPlatform.buildRustPackage (finalAttrs: { tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + + scdoc < extra/man/rio.1.scd > rio.1 + scdoc < extra/man/rio.5.scd > rio.5 + scdoc < extra/man/rio-bindings.5.scd > rio-bindings.5 + installManPage rio.1 rio.5 rio-bindings.5 '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications/ From eefc571f0533f78b237324edd90ef4012247f245 Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 1 Nov 2025 21:34:18 +0100 Subject: [PATCH 0650/2279] cctools: fix CURRENT_PROJECT_VERSION in meson.build --- pkgs/by-name/cc/cctools/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cc/cctools/meson.build b/pkgs/by-name/cc/cctools/meson.build index dfe412800ff4..6c0a18016203 100644 --- a/pkgs/by-name/cc/cctools/meson.build +++ b/pkgs/by-name/cc/cctools/meson.build @@ -12,7 +12,7 @@ project( '-DCCTB_PROJECT=cctools', '-DCCTB_PROJVERS=cctools-@version@', '-DCCTB_VERSION=@version@', - '-DCURRENT_PROJECT_VERSION=cctools-@version@', + '-DCURRENT_PROJECT_VERSION="cctools-@version@"', '-DCODEDIRECTORY_SUPPORT', '-DLTO_SUPPORT', ], From af1320c6d679b320f117865fe88a2018e0c5626d Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Sat, 1 Nov 2025 17:57:45 -0400 Subject: [PATCH 0651/2279] git: 2.51.1 -> 2.51.2 --- pkgs/applications/version-management/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 1550944b8001..5ca46db3dcf9 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.51.1"; + version = "2.51.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-qD/Z/67X7uZ57ZLOsG91tGFev2bTrE+9v7yVZ9xTP0o="; + hash = "sha256-Iz1xQ6LVjmB1Xu6bdvVZ7HPqKzwpf1tQMWKs6VlmtOM="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; From a3c0742a7b5093f0f9f70e70d7c1a472261bd4d6 Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 1 Nov 2025 23:04:50 +0000 Subject: [PATCH 0652/2279] coreutils: patch `cp` performance regression on ZFS --- pkgs/tools/misc/coreutils/cp-1.patch | 32 +++++++++++++ pkgs/tools/misc/coreutils/cp-2.patch | 68 +++++++++++++++++++++++++++ pkgs/tools/misc/coreutils/cp-3.patch | 52 ++++++++++++++++++++ pkgs/tools/misc/coreutils/default.nix | 7 +++ 4 files changed, 159 insertions(+) create mode 100644 pkgs/tools/misc/coreutils/cp-1.patch create mode 100644 pkgs/tools/misc/coreutils/cp-2.patch create mode 100644 pkgs/tools/misc/coreutils/cp-3.patch diff --git a/pkgs/tools/misc/coreutils/cp-1.patch b/pkgs/tools/misc/coreutils/cp-1.patch new file mode 100644 index 000000000000..f40fdbbead79 --- /dev/null +++ b/pkgs/tools/misc/coreutils/cp-1.patch @@ -0,0 +1,32 @@ +From 231cc20195294c9774ab68f523dd06059f4b0a5c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Wed, 29 Oct 2025 23:41:55 +0000 +Subject: [PATCH] copy: avoid posix_fadvise bypassing copy offload behavior + +* src/copy-file-data.c (): pass 0 to posix_fadvise to indicate to EOF. +coreutils 9.8 used OFF_T_MAX instead, which triggered OpenZFS 2.2.2 +at least to synchronously (decompress and) populate the page cache. +Addresses https://github.com/coreutils/coreutils/issues/122 +--- + src/copy-file-data.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/copy-file-data.c b/src/copy-file-data.c +index 1eefd3071f58a54f725c96dfcd2fd352012398c5..9eb6f47244f0a62c2f4934c7663794fd4dcf21bf 100644 +--- a/src/copy-file-data.c ++++ b/src/copy-file-data.c +@@ -536,9 +536,12 @@ copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname, + && scantype != PLAIN_SCANTYPE))); + + /* Don't bother calling fadvise for small copies, as it is not +- likely to help performance and might even hurt it. */ ++ likely to help performance and might even hurt it. ++ Note it's important to use a 0 length to indicate the whole file ++ as OpenZFS 2.2.2 at least will otherwise synchronously ++ (decompress and) populate the cache when given a specific length. */ + if (IO_BUFSIZE < ibytes) +- fdadvise (ifd, ipos, ibytes <= OFF_T_MAX - ipos ? ibytes : 0, ++ fdadvise (ifd, ipos, ibytes < OFF_T_MAX - ipos ? ibytes : 0, + FADVISE_SEQUENTIAL); + + /* If not making a sparse file, try to use a more-efficient diff --git a/pkgs/tools/misc/coreutils/cp-2.patch b/pkgs/tools/misc/coreutils/cp-2.patch new file mode 100644 index 000000000000..197269e78768 --- /dev/null +++ b/pkgs/tools/misc/coreutils/cp-2.patch @@ -0,0 +1,68 @@ +(NB: we drop the NEWS change to avoid conflicts) + +From 64b8fdb5b4767e0f833486507c3eae46ed1b40f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Thu, 30 Oct 2025 13:02:48 +0000 +Subject: [PATCH] copy: don't avoid copy-offload upon SEEK_HOLE indicating + non-sparse + +* src/copy-file-data.c (infer_scantype): Fall back to a plain copy +if SEEK_HOLE indicates non-sparse, as zero copy avoids copy offload. +This was seen with transparently compressed files on OpenZFS. +* tests/cp/sparse-perf.sh: Add a test case even though it might +only trigger on compressed file systems that don't support reflink. +* NEWS: Mention the bug fix. +Addresses https://github.com/coreutils/coreutils/issues/122 +--- + NEWS | 8 ++++++++ + src/copy-file-data.c | 11 +++++++++-- + tests/cp/sparse-perf.sh | 10 ++++++++++ + 3 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/src/copy-file-data.c b/src/copy-file-data.c +index 9eb6f47244f0a62c2f4934c7663794fd4dcf21bf..8fd25fee9201eda7bd0a8caf01f02821a3390448 100644 +--- a/src/copy-file-data.c ++++ b/src/copy-file-data.c +@@ -481,12 +481,19 @@ infer_scantype (int fd, struct stat const *sb, off_t pos, + if (scan_inference->hole_start < sb->st_size) + return LSEEK_SCANTYPE; + +- /* Though the file likely has holes, SEEK_DATA and SEEK_HOLE ++ /* Though the file may have holes, SEEK_DATA and SEEK_HOLE + didn't find any. This can happen with file systems like + circa-2025 squashfs that support SEEK_HOLE only trivially. +- Fall back on ZERO_SCANTYPE. */ ++ This can also happen due to transparent file compression, ++ which can also indicate fewer than the usual number of blocks. */ ++ + if (lseek (fd, pos, SEEK_SET) < 0) + return ERROR_SCANTYPE; ++ ++ /* we prefer to return PLAIN_SCANTYPE here so that copy offload ++ continues to be used. Falling through to ZERO_SCANTYPE would be ++ less performant in the compressed file case. */ ++ return PLAIN_SCANTYPE; + } + } + else if (pos < scan_inference->ext_start || errno == ENXIO) +diff --git a/tests/cp/sparse-perf.sh b/tests/cp/sparse-perf.sh +index 5a283c1fe65816a36342d9f583c1ed787947bf10..5ee984c527d7d8b6395d4193fcf81804b1135b8a 100755 +--- a/tests/cp/sparse-perf.sh ++++ b/tests/cp/sparse-perf.sh +@@ -35,6 +35,16 @@ cmp $other_partition_sparse k2 || fail=1 + grep ': avoided' cp.out && { cat cp.out; fail=1; } + + ++# Create a large-non-sparse-but-compressible file ++# Ensure we don't avoid copy offload which we saw with ++# transparent compression on OpenZFS at least ++# (as that triggers our sparse heuristic). ++mls='might-look-sparse' ++yes | head -n1M > "$mls" || framework_failure_ ++cp --debug "$mls" "$mls.cp" >cp.out || fail=1 ++cmp "$mls" "$mls.cp" || fail=1 ++grep ': avoided' cp.out && { cat cp.out; fail=1; } ++ + + # Create a large-but-sparse file on the current partition. + # We disable relinking below, thus verifying SEEK_HOLE support diff --git a/pkgs/tools/misc/coreutils/cp-3.patch b/pkgs/tools/misc/coreutils/cp-3.patch new file mode 100644 index 000000000000..0c662e042e45 --- /dev/null +++ b/pkgs/tools/misc/coreutils/cp-3.patch @@ -0,0 +1,52 @@ +From 2c5754649e08a664f3d43f7bc1df08f498bc1554 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Fri, 31 Oct 2025 15:37:55 +0000 +Subject: [PATCH] copy: be more defensive/restrictive with posix_fadvise + +* src/copy-file-data.c (copy_file_data): Only give the +POSIX_FADV_SEQUENTIAL hint when we _know_ we'll definitely +use a read/write loop to copy the data. Also only apply +the hint to the whole file, as we've seen OpenZFS at least +special case that. +(sparse_copy): Update stale comment. +--- + src/copy-file-data.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/copy-file-data.c b/src/copy-file-data.c +index 8fd25fee9201eda7bd0a8caf01f02821a3390448..c46b7edc5228f5f1e9c398d8ad7ff20b6fa60fb6 100644 +--- a/src/copy-file-data.c ++++ b/src/copy-file-data.c +@@ -105,8 +105,6 @@ is_CLONENOTSUP (int err) + If HOLE_SIZE, look for holes in the input; *HOLE_SIZE contains + the size of the current hole so far, and update *HOLE_SIZE + at end to be the size of the hole at the end of the copy. +- Set *TOTAL_N_READ to the number of bytes read; this counts +- the trailing hole, which has not yet been output. + Read and update *DEBUG as needed. + If successful, return the number of bytes copied, + otherwise diagnose the failure and return -1. */ +@@ -542,14 +540,17 @@ copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname, + || (x->sparse_mode == SPARSE_AUTO + && scantype != PLAIN_SCANTYPE))); + +- /* Don't bother calling fadvise for small copies, as it is not +- likely to help performance and might even hurt it. +- Note it's important to use a 0 length to indicate the whole file ++ /* If we _know_ we're going to read data sequentially into the process, ++ i.e., --reflink or --sparse are not in auto mode, ++ give that hint to the kernel so it can tune caching behavior. ++ Also we don't bother calling fadvise for small copies, ++ as it is not likely to help performance and might even hurt it. ++ Also we only apply this hint for the whole file (0 length) + as OpenZFS 2.2.2 at least will otherwise synchronously + (decompress and) populate the cache when given a specific length. */ +- if (IO_BUFSIZE < ibytes) +- fdadvise (ifd, ipos, ibytes < OFF_T_MAX - ipos ? ibytes : 0, +- FADVISE_SEQUENTIAL); ++ if (ipos == 0 && ibytes == COUNT_MAX ++ && (x->reflink_mode != REFLINK_AUTO || x->sparse_mode != SPARSE_AUTO)) ++ fdadvise (ifd, 0, 0, FADVISE_SEQUENTIAL); + + /* If not making a sparse file, try to use a more-efficient + buffer size. */ diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index dd7c095900ca..221f9853f6af 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -59,6 +59,13 @@ stdenv.mkDerivation rec { # Extremely bad bug where `tail` prints fewer lines than it should. # https://github.com/coreutils/coreutils/commit/914972e80dbf82aac9ffe3ff1f67f1028e1a788b ./tail.patch + # Fix performance regression in cp. + # https://github.com/coreutils/coreutils/commit/231cc20195294c9774ab68f523dd06059f4b0a5c + # https://github.com/coreutils/coreutils/commit/64b8fdb5b4767e0f833486507c3eae46ed1b40f8 + # https://github.com/coreutils/coreutils/commit/2c5754649e08a664f3d43f7bc1df08f498bc1554 + ./cp-1.patch + ./cp-2.patch + ./cp-3.patch ]; postPatch = '' From bbf20cd77847eed6df6ba54245ea7576ff9e72ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Nov 2025 01:02:56 +0100 Subject: [PATCH 0653/2279] python3Packages.aiohttp: 3.13.1 -> 3.13.2 https://github.com/aio-libs/aiohttp/releases/tag/v3.13.2 --- pkgs/development/python-modules/aiohttp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index d9897a535929..d481ea44be06 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.13.1"; + version = "3.13.2"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-gjFNGHfbajktxApj1RfUdMB4FuD8cFc6ueHZsRbV/uU="; + hash = "sha256-LqYGrrWgSZazk0hjQvTFwqtU/PtMEaPi+m1Ya8Ds+pU="; }; patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [ @@ -135,6 +135,7 @@ buildPythonPackage rec { "test_requote_redirect_url_default" "test_tcp_connector_ssl_shutdown_timeout_nonzero_passed" "test_tcp_connector_ssl_shutdown_timeout_zero_not_passed" + "test_invalid_idna" # don't run benchmarks "test_import_time" # racy From eae6d485746acef58e8e19cf96af9e292e2df77e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 00:35:47 +0000 Subject: [PATCH 0654/2279] gotests: 1.6.0 -> 1.9.0 --- pkgs/by-name/go/gotests/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotests/package.nix b/pkgs/by-name/go/gotests/package.nix index d0ad80fbb9da..3e46ef0c4cd9 100644 --- a/pkgs/by-name/go/gotests/package.nix +++ b/pkgs/by-name/go/gotests/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gotests"; - version = "1.6.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cweill"; repo = "gotests"; rev = "v${version}"; - sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw="; + sha256 = "sha256-lx8gbVm4s4kmm252khoSukrlj5USQS+StGuJ+419QZw="; }; - vendorHash = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw="; + vendorHash = "sha256-/dP8uA1yWBrtmFNHUvcicPhA2qr5R2v1uSwYi+ciypg="; # tests are broken in nix environment doCheck = false; From a638aca719601708cacedaebea241dc4a4941da9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 01:30:38 +0000 Subject: [PATCH 0655/2279] quantframe: 1.5.4 -> 1.5.9 --- pkgs/by-name/qu/quantframe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix index 3be23108664b..dd896003c073 100644 --- a/pkgs/by-name/qu/quantframe/package.nix +++ b/pkgs/by-name/qu/quantframe/package.nix @@ -17,13 +17,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "quantframe"; - version = "1.5.4"; + version = "1.5.9"; src = fetchFromGitHub { owner = "Kenya-DK"; repo = "quantframe-react"; tag = "v${finalAttrs.version}"; - hash = "sha256-PCfejmL+dztzw2bBZxXzZlXBiSLO/eRgvP9jLK/G8PQ="; + hash = "sha256-jrGDgK/Z9oLSvtFfC+uIs0vj4Nku4Sp/bdR1MX/SK2E="; }; postPatch = '' From 90dfa42149e0f220742115f7faa8be16575c2e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 1 Nov 2025 14:13:04 -0700 Subject: [PATCH 0656/2279] =?UTF-8?q?biboumi:=209.0=20=E2=86=92=209.0-unst?= =?UTF-8?q?able-2025-10-27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Biboumi was not running as is. Rather than trying keep piling on these patches, it appear to ‘just work’ if using the latest upstream patches. Hopefully they will cut a release. --- pkgs/by-name/bi/biboumi/catch.patch | 30 ----------------------------- pkgs/by-name/bi/biboumi/package.nix | 30 ++++------------------------- 2 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 pkgs/by-name/bi/biboumi/catch.patch diff --git a/pkgs/by-name/bi/biboumi/catch.patch b/pkgs/by-name/bi/biboumi/catch.patch deleted file mode 100644 index bbd0a66909fe..000000000000 --- a/pkgs/by-name/bi/biboumi/catch.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -303,27 +303,6 @@ - endforeach() - - # --## Add a rule to download the catch unit test framework --# --include(ExternalProject) --ExternalProject_Add(catch -- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git" -- PREFIX "external" -- UPDATE_COMMAND "" -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" -- ) --set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) --ExternalProject_Get_Property(catch SOURCE_DIR) --if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) -- target_include_directories(test_suite -- PUBLIC "${SOURCE_DIR}/single_include/" -- ) -- add_dependencies(test_suite catch) --endif() -- --# - ## Add some custom rules to launch the tests - # - add_custom_target(check COMMAND "test_suite" diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix index ebc9dfa625e3..ccf3d25dd507 100644 --- a/pkgs/by-name/bi/biboumi/package.nix +++ b/pkgs/by-name/bi/biboumi/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitea, - fetchpatch, cmake, libuuid, expat, @@ -25,38 +24,18 @@ assert lib.assertMsg ( withPostgreSQL || withSQLite ) "At least one Biboumi database provider required"; -let - catch = fetchFromGitea { - domain = "codeberg.org"; - owner = "poezio"; - repo = "catch"; - tag = "v2.2.1"; - hash = "sha256-dGUnB/KPONqPno1aO5cOSiE5N4lUiTbMUcH0X6HUoCk="; - }; - - pname = "biboumi"; - version = "9.0"; -in stdenv.mkDerivation { - inherit pname version; + pname = "biboumi"; + version = "9.0-unstable-2025-10-27"; src = fetchFromGitea { domain = "codeberg.org"; owner = "poezio"; repo = "biboumi"; - tag = version; - hash = "sha256-yjh9WFuFjaoZLfXTfZajmdRO+3KZqJYBEd0HgqcC28A="; + rev = "61242c35bc825d58c9db4301b5696bc17428bf98"; + hash = "sha256-BZTqu2Qvfqag9pwymlGrItLbOXQf3VMKQS2+3pxlJbE="; }; - patches = [ - ./catch.patch - (fetchpatch { - name = "update_botan_to_version_3.patch"; - url = "https://codeberg.org/poezio/biboumi/commit/e4d32f939240ed726e9981e42c0dc251cd9879da.patch"; - hash = "sha256-QUt2ZQtoouLHAeEUlJh+yfCYEmLboL/tk6O2TbHR67Q="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -87,7 +66,6 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - cp ${catch}/single_include/catch.hpp tests/ ''; doCheck = true; From f234302ec5a95bf2ac69483a29fc0863bc2846cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 05:04:31 +0000 Subject: [PATCH 0657/2279] tparted: 2025-10-10 -> 2025-10-31 --- pkgs/by-name/tp/tparted/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tp/tparted/package.nix b/pkgs/by-name/tp/tparted/package.nix index 474f5d8d30ad..e2d8f8f56ea8 100644 --- a/pkgs/by-name/tp/tparted/package.nix +++ b/pkgs/by-name/tp/tparted/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tparted"; - version = "2025-10-10"; + version = "2025-10-31"; src = fetchurl { url = "https://github.com/Kagamma/tparted/releases/download/${finalAttrs.version}/linux_x86-64_tparted_${finalAttrs.version}.tar.gz"; - hash = "sha256-eLeo+6AGUghrU5szkUFNcieQPA3D/D5pjZV4ZrINiGY="; + hash = "sha256-uBuYZUiQB/RnAXRNqwkz87rYjBanqiJBbRFAPSmEmnw="; }; nativeBuildInputs = [ From ab4e5da85c1270fae5dbcbb0048983e5416a2bae Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 2 Nov 2025 11:04:39 +0300 Subject: [PATCH 0658/2279] qt5: 5.15.17 -> 5.15.18 tfw no webengine --- .../libraries/qt-5/5.15/default.nix | 7 - .../libraries/qt-5/5.15/srcs-generated.json | 160 +++++++++--------- pkgs/development/libraries/qt-5/5.15/srcs.nix | 2 +- 3 files changed, 81 insertions(+), 88 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 14e1fbef6863..4573e7c8ba40 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -65,13 +65,6 @@ let ./qtdeclarative-default-disable-qmlcache.patch # add version specific QML import path ./qtdeclarative-qml-paths.patch - # Fix an undefined behavior, and fix random-seeming build error with Clang. See: - # - https://codereview.qt-project.org/c/qt/qtdeclarative/+/354847 - # - https://github.com/llvm/llvm-project/issues/74070 - (fetchpatch { - url = "https://github.com/qt/qtdeclarative/commit/636481a31110f1819efaf6500b25fbc395854311.patch"; - hash = "sha256-ACOG3IjR0SIlLYioODGdhkNTGNvnKu6iOihsVdzyvgo="; - }) ]; qtlocation = lib.optionals stdenv.cc.isClang [ # Fix build with Clang 16 diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 47b8a3495b70..fd5fcefbff34 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,202 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "73c1dda553f338c5a3b9ebbfd0e7de114f0c93dc", - "sha256": "0szrqm745b541bamwsbbnl7w6yx0hcaj6jsb3v7kxhvb8kfb1jbm" + "rev": "208f5835e6c2415c9dc5cbe92bba83aa28bab7ea", + "sha256": "0zqvdq5y25b1w7agx5wlr16p1wrx54086r0xcdfg9wx8dayhh1md" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "df401a62879521f3fd47097205a440d5b173b524", - "sha256": "1zv5a2ywgvv4k3mgz2bbp5696751azf20pxk3xd1dr4dicr2lxf6" + "rev": "e4c93bc7cac45bac6bccda3310947e8fe026a9ed", + "sha256": "1qq6jvqkl4ff7sw20pi1mawh5pypv7vxmj56d38z6p06r1azkvls" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "484bbac0978eccc9031cbf1bf804a81a6bfb1247", - "sha256": "0h3x582q3m8cpll5f54h2cqngyd7j1mx0j1jqrjcf4mbg5n9y0i5" + "rev": "4928bd58dbc1cdcf44a7e454e3d4654c3c2016f1", + "sha256": "02rsh60lyl6bn2jhx0ajn43safbi904nhwvdpikanrmdbg0z6dpp" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "128a1d2861ca5693e43e8b79fbd4278dcd451fbc", - "sha256": "1jd2my6az2a9l7d1v6f03ygv5m16dij2mmb73jchgrz20h1an7nz" + "rev": "bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8", + "sha256": "0bg36lxngkq2k11bhqdyfvbc1qyqaghwsi446zfn67vxvyxya3hx" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "aaf04515611203a32cef866cce9bfeaa4cef20b6", - "sha256": "0q0qglksgl50kjq5pqigfvww4rks3ig8xwcz72d0h58ga1i3kgid" + "rev": "1093fb53ced126100d14af30a8adffd29b7ef855", + "sha256": "0cnlg59l743milkki8mjbrfd4cx5ycbqw73apcrnrsag9dqdbw41" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "15961348aa26b73248432a0a274b332c36cd0054", - "sha256": "020vh62m098zn8fl43xnd5hhvixfr0q21ziq30jqml0j3slx4adx" + "rev": "f1be05c8efeb65b77a8bfd21763ab55bb5c04906", + "sha256": "1vl7wfw9sd8qfl8ixzl5wz4v5km5zdf9bii53q3pw4f2lplsralq" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "a57e633b675d7886c3e5c64441f50ffe831f2de8", - "sha256": "0w0cv80sa9w42wgw3yji228wyhwc3c8lz9r3296crq136aykyy87" + "rev": "d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60", + "sha256": "09jk32kw7wgcrd117a9lsm5w7jszsdhdslk10qn631wz203zbs4i" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "11ea94fc8ea95d0ba95745a021a1b139283b8b36", - "sha256": "0xw15d7syqw0z6xjnkgckh53rhg7n20j67dm1bhf429ma1cqawqm" + "rev": "1189557a50f11e7bc5716467a149cd09987a9f88", + "sha256": "0cd89d8i8chy1j1yanp1cq5s7467qr24b9c7cx9qw0nb0rf6f8qr" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "36ae30d632c978b795bf40aa1c50abaae7c8ac4d", - "sha256": "10vwkk2b4ysx6i9nyqnl1g7q7rckp5xppwdawd6avlkxhfjayan7" + "rev": "ddb2afda6f713259fc8d95fb22a1c96bb448c36a", + "sha256": "0nk2vwl0ppix794xzj8nqrhsc333v8v4vr1rmwddymwlrdqlqd5d" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "fb2191db07738c9a954a77c2fb15dcb925a4c361", - "sha256": "1061ad1350bi0jr2vzpsmk6cgwyhv63d67nb8np1nr2j1iy2ncp7" + "rev": "269fc0731f6838a1c02877a83c0ada23659c69fc", + "sha256": "06jhby671yzbj753yb0lnk4bv2r0nxxibq7fq1yljxdms0rc72iz" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "fed60f95ddb75103f83cf67bf2c9f471e49576fe", - "sha256": "0ja113vz261farf6c1bilxww4ypzzsnkz7xl37xr1pmxy9hx7lw8" + "rev": "dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5", + "sha256": "1sn46lmq0y56mw0q11sgaijr2vg1wpp6lj237finp6vr3bji2816" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "f86afca95741b9c06202fd13c2b8c01d922a0e24", - "sha256": "1qql5zc2691iazx94s7arnkmk46y8f4p20is0asjfycs30x5cmp5" + "rev": "c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d", + "sha256": "0q0vcymiqfyz8sfs9wdkhhwff55acj2rsmrb8w6yikmwcmcxp2a3" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "c6e6c63e8566fc75551cb901c3b5939b39e7a25c", - "sha256": "1n7wmsmy33v0fihivs18cafrh51bl0sa6gai6mlid0lx4izbs44f" + "rev": "ba48a8b5cedd157d972c08d371ac2581db166bf7", + "sha256": "00kwv405qq9q8fcwar33s2wvs1dm10fb8plxbz1q0jqcjs2ips6x" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "76bc48eedf60c5f98ff9eb378fc8ce16b053bc32", - "sha256": "00ps9rl4yykbqqqhgnph8090rbq816kj90fb7nyrlr76f6zkjwnh" + "rev": "27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e", + "sha256": "04ivyxnn8d3pkjsbx0gwyj3f5if4m4cih6wyavm8bd2m2kkszx35" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "4ebefe8d375054d2244ad7197868cb004c5f99d5", - "sha256": "0006gajlv8mn3gfp83jiy7pg9am86fa2yncn4fqrlv7q4ikqym3b" + "rev": "fc7e9f41d9cec2df05c1d38d6e55d3a0d501dd25", + "sha256": "07q1arvdjwmbrayp2b213b8gqm4psczhx9z1m83invwmbs8iqj07" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "d342547886448dacf38d2933cd40322c7435ee86", - "sha256": "1fyrwbcn9dh6hsqk4z48g4f00aizankjr63ah7nvnzv8y8wcz62p" + "rev": "ff83d119c75cd8406f73ccc08958fe36747e7390", + "sha256": "09jadnvphilcxxy85dlsr8a6x5w32r1c2hrbh93qbvvf9zlg60ld" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "2653044915b3fb1941aa0f8b25af50343efcbff7", - "sha256": "183cbrwxnp2c7shdqlbjmx4vvb097m67mh3m1mqb0d4xc8fggwa4" + "rev": "510687fa4fdee84dd3d6d166e8f080c484016199", + "sha256": "0a8abmql94wxpfvdj5a1rnh3xsd49c5z8x93hm311sgjkd0aajx7" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "062778d6f80df1ba45b8697720eb781bd477c292", - "sha256": "1hakq5aam1x9fpnnj8wavmr4f3bdm0q2kflix0ap9197hj7bvzhy" + "rev": "8e9a5ec9f68639162c85c198b28e072e7150883c", + "sha256": "04pmwqnw907dg0hpas0pdrh2fxcqn2mvqz82b1vkviksg8ny3saw" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "de6e8026c116a47029f4307fd8a62b5f630f33bf", - "sha256": "0w4i0ii7an8z6xiqg1v0i5dm6rp3mi08mhg99mys10996r8f67yr" + "rev": "47a325358078b72016081a86be628411df2728a9", + "sha256": "18h309g6ni6y4bcss930g04z8ymhl2nfm3sv5s4h2fz3dl0xsqwr" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "37ee5e07e82296e24cc02c8bf6f31cb6bd8846b1", - "sha256": "1xq1a9ci7qvlp5f0ydfx86yw1pk14zdm9262nw65bc1z4nx3qfhw" + "rev": "0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041", + "sha256": "0h8bhrbgfcf7nbfppah8lxnhvygc09983qrvp935r5sw7251km4d" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "9bdcebd1c093b6f0886e3a739711470cc37b1adb", - "sha256": "0ihwjw70cb59qvzbdyz9462n7d8f8mcnidkaph3qyqyblnx5rc6b" + "rev": "e464888c53a641ee44a34ff2350cfb156c8ed59f", + "sha256": "08lnqz6v48j1hi6dpll7a052p6r5qfb32md16fppqzn6g5jg9ir2" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "c4f13dd78d6cf2df83335ad0328b892ce4b2ef70", - "sha256": "075q6z6dd1aazpyf03bjmxn6j7lr5g8gjx02jgg2h077h9bdkw9j" + "rev": "43130f2681b76a8d743a04704465b716b6b2faee", + "sha256": "1z1avxxq9d9nzqyxy5pq5maj73cf6dvsn5k83p3sf5kq3x0y75cj" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "e060a0990380134c054bde675d47db048fd3192f", - "sha256": "0qsgixxy6rk8zv8kssfa19asg742y9syl9hc9dkqw0shywi6rm4k" + "rev": "b2740a7c7f5b6ac810240404a947ca5cff9de5f7", + "sha256": "1jxlwc2y165fxdalcr4iqq55gsg5x4nxqd8wdq3dc1824yfnzm6i" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "2b7b19239671784fbf79d6dbc0e985da044ff9dd", - "sha256": "1a67ihj2z4fc6r3y3z18244wswvhf5hshw72z7z9lmmcznls7921" + "rev": "57491f554bc53bd020978b5744437b7ac7e56a27", + "sha256": "00mvwgb3xr116nl7649zq7ai2074clzw760c140sy91zqgqkjsx4" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "79ed5db98f36b8ca70b077edef46fc793debb3ab", - "sha256": "1dzbcqsrl5wlc1r54jgz63i516iaj73g2g4476m8va6ip4zrxxnp" + "rev": "50a61b360877e7c1300df76b5aabf8d75554a398", + "sha256": "0giqwn4grg9999y31avh7ajsv9gkcfzf0xndx8bvv79si0wp59g6" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "971adee604b772d79686126fe8b1e333824f67dc", - "sha256": "0fdr81xj9mhyy7il3x2h87gv5qbjjy5rlps372s5qz97z8jdazy6" + "rev": "c23069351ec31563c9ea9fcdce42ccdba95ea518", + "sha256": "1qgxlgnl53gabrfqihxwygdbdiqjvn2hfajmwb3h44srpq0srk33" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "9bb2b66259413ac4eda1ddf64209ef44412aa55d", - "sha256": "1kpqjmipa2giv1rv1kg25knir9299pnh6gh8l87immnakwnp7q3n" + "rev": "b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f", + "sha256": "134mn0njfvmzgrf325bikazkiq4xdn5wjhj56kxh1hhaz3q25hyp" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "088b86a0e53ebb714c1276d041ab2c06fee58e6e", - "sha256": "0qjpr91wlxq25n72yp5026hdwy560g35xk5419r7hz1snggbly4s" + "rev": "aa2376f9b1302222edcd16b4641bbd7004318c00", + "sha256": "0vcxgkymzhaw01f26zlny4bka9k829rwzkwk95rr3dfq7wlyxshz" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "9c149213f46b844607cf7db8f800d906db3a682f", - "sha256": "14ww7c66fs224gfkawjbb8gfrjfcj1ww90887c01504k7ipvlbwb" + "rev": "b74f7291f343dcbcb487b020868f042d8fe83098", + "sha256": "1n0sjn8h5k2sh8p2a85cxdpqbnd63gz4rf9wwbshhd13w623f9s8" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "e02ce0dfa692913bd5dcc50917f7e21f5a41cd2b", - "sha256": "0dmv4y2lzdkzj9in3w1cchn0hb637280zl17vnzzgcpj4jmyxm3b" + "rev": "fa40a2d3373b89be0cd0a43fe0c1d047e3d34058", + "sha256": "06kr88gmwc7xh1whdbcg84y1naak5rv99jkscjbhzyz3z91xy7hl" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "fd567a42c1b566f22f339db758d29925fd2a8c60", - "sha256": "14cxna8ql87b68wriqkda9bdrympv827cpng7pazjzglgk4lp97y" + "rev": "3cbcceb8e3e2e63a4022f1be946c7118c527a83e", + "sha256": "15lw5snqfkwwcsazh02lhiia39gy08nfijdpkzvll2qvg4b58zkn" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "0d229d587e578fb4a5144594b926d5d3138c407e", - "sha256": "0q7xv7cg4i5aliwaydw7xshwcv1a1icbg58rlwv77vzla7vsyyga" + "rev": "859d2a6ee329cc08414410b2ef8c0af77a6853d3", + "sha256": "06sdpcanzp1a71d99rjivrbjp780mvwssc4w1sap2gskcmmgkwbs" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "c1ac089f3f37ab172d8010b0fabf4007d62d1812", - "sha256": "16wy4xml5k7bg48ai8777h95clny436lkr9vfcjzsbdlw17mgylw" + "rev": "df49b9f3badce793a0a9ea850cf1a02cc5bafef6", + "sha256": "01xm2r1pv7kxb4aj72ldfzmax6d799h6bj4h2xhpcii812wf5lda" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "85ba097de9759efe5563156e43de1ad8473d5d54", - "sha256": "0wkd2fvnwi3hpqpy95mjhkj0msi447302srrfxr9j4xp435dpp9p" + "rev": "2a157921861e651f43456cb7941b250c89feb736", + "sha256": "1w58b602f20mppd0zfr9yvfdn1xwfkfclnjs0p5mgymq6d946dyk" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "adb24841f9fc2eea94f1d2636070411fcb6254b4", - "sha256": "0ra0906g3cqavkl18qp79jghy5n9avwqwf4vqn9jsci5may1bmv5" + "rev": "b9aaac72d0853ba48f6bfd710a43df94d83d4701", + "sha256": "07zx55f52jgk31bm6c68iydknrih245ndnvz714l6kxw66fv4rjq" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "db9cb84499229143506a9692fc65d3cb223b3978", - "sha256": "1kp6gmzh00b07cdpsm062npgf10540aasyhmdqjh4zv9ggnf6dm6" + "rev": "0f910acb737cefc889ce1088fc60d15bc18efe9c", + "sha256": "1ba9ll28hznd6qpjjiqvc2z6gaz2qgq7105dd0w810xpbaiixy0a" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "f16dadb6d147c46565537ede46518a352cdd87c9", - "sha256": "0jm0wxblrlab3yizyrcip1s9n56mavpygfjivj27nmqwsycs8sfp" + "rev": "34342073a59f3a27ef3de02f6b21337c4f8db6cf", + "sha256": "1h6n7dkd6mjclxllyw2brz8wv4d68dx2ykckbwb3bkxyd6rmg1f6" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "03d72f7b7df7892024f7a5a380305ad0347c1141", - "sha256": "164q0d4dhpb3w1qks26qc79ph3y3h4diihcgc41d4kgmc7gi75s6" + "rev": "5e5ae2b77078dbe51fb798743de606e6f9a5e19d", + "sha256": "04x8ax197z0dr01nxrb6bh4q8c077ny5n812fx5mq56l54v2m1ks" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "e6e7633bbd0efcc56035fef77f3f45efccf03a64", - "sha256": "1h02f17cn6x19d4z37w9pvfivqm2c6qflrhm5n0fqydr1wwb6g3l" + "rev": "c44c4fa86fa0794c25baef4ee1f6272aca8c511a", + "sha256": "0287cvs9wqlzz6gnj81gi8rp50s2rdnigcmld3fgddsg8f3v7hdj" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "e645537910450ba8bf5ecfbb735f69acdeeef046", - "sha256": "08lnchs0svgrv45zc3jwinkqzvd4crzzpipm9g1ql426clcdyq8n" + "rev": "0b644263abca66503db1ce8a4e126cf358a34685", + "sha256": "1b1zzglvcdp7wvlpgk1gj8gmyy2r21yi6p8xiyvbccq5bbjpn0hw" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index b3f1e58e14b4..07b617c7b97d 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -5,7 +5,7 @@ }: let - version = "5.15.17"; + version = "5.15.18"; mk = name: args: { inherit version; From 80f6d95b34962ea7c0628c58d964a06e693201d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Krenski?= Date: Sat, 1 Nov 2025 10:45:43 +0100 Subject: [PATCH 0659/2279] boxflat: fix build by unrestricting PyYAML dependency --- pkgs/by-name/bo/boxflat/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 991bb43dc7f4..0a39c938d4db 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -45,12 +45,12 @@ python3Packages.buildPythonPackage rec { udevCheckHook ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "psutil==6.1.0" "psutil" \ - --replace-fail "evdev==1.7.1" "evdev" \ - --replace-fail "pycairo==1.27.0" "pycairo" - ''; + pythonRelaxDeps = [ + "psutil" + "evdev" + "pycairo" + "PyYAML" + ]; preBuild = '' cat > setup.py << EOF From 37eaf9fee4fe1a91f4145c336b5d6a3d19aa51b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Nov 2025 12:30:33 +0000 Subject: [PATCH 0660/2279] gscreenshot: 3.10.0 -> 3.11.0 --- pkgs/by-name/gs/gscreenshot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix index d7f5b0cc7899..f8a873468d72 100644 --- a/pkgs/by-name/gs/gscreenshot/package.nix +++ b/pkgs/by-name/gs/gscreenshot/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.10.0"; + version = "3.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "gscreenshot"; tag = "v${version}"; - sha256 = "sha256-y5G2eJ5G6FpH01n1/YTcjPh6u58N0nJO6gcC9yEr+84="; + sha256 = "sha256-ZdywZhH59L5fk1EB+o6fSj9zCOljS7T/HWpUd2tTl0o="; }; # needed for wrapGAppsHook3 to function From d9430cfe41e219aed8ac856227d8d3414f1cc61b Mon Sep 17 00:00:00 2001 From: Emi Katagiri-Simpson Date: Sat, 1 Nov 2025 12:12:23 -0400 Subject: [PATCH 0661/2279] zatackax: init at 1.1.0 Zatackax is an open-source remake of the early computer game *Achtung, die Kurve!* More information can be found on the projects [GitHub](https://github.com/simenheg/zatackax). Packaging considerations: - **Is the package ready for general use?** Zatackax was originally released in 2010, and is still passively maintained to this day. - **Does the project have a clear license statement?** Zatackax is licensed under GPL3+, as declared in its README. - **How realistic is it that it will be used by other people?** Zatackax is currently packaged by Debian, OpenSUSE, the AUR, and more. A full list of repositories which include Zatackax is included on their README. - **Is the software actively maintained upstream?** Zatackax currently recieves passive maintenance. However, it is not a security-critical package, nor is it integrated into a fast-changing ecosystem. - **Are you willing to maintain the package?** Yes. While I did choose to contribute this package first as an exercise to help familiarize myself with the process of contributing to nixpkgs, and I forsee only a very small maintance burden from this package, I understand that I am taking on a multi-year commitment, and am willing to provide maintainership for at least a release cycle, and likely much longer. Including suggestions from Moraxyc Xu (@Moraxyc) --- pkgs/by-name/za/zatackax/package.nix | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/za/zatackax/package.nix diff --git a/pkgs/by-name/za/zatackax/package.nix b/pkgs/by-name/za/zatackax/package.nix new file mode 100644 index 000000000000..8361f286d084 --- /dev/null +++ b/pkgs/by-name/za/zatackax/package.nix @@ -0,0 +1,50 @@ +{ + autoreconfHook, + fetchFromGitHub, + SDL, + SDL_image, + SDL_mixer, + SDL_ttf, + stdenv, + lib, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zatackax"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "simenheg"; + repo = "zatackax"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1m99hi0kjpj5Yl1nAmwSMMdQWcP0rfLLPFJPkU4oVbM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + SDL_mixer + SDL_ttf + SDL_image + SDL + ]; + + configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open-source remake of the early computer game \"Achtung, die Kurve!\""; + homepage = "https://github.com/simenheg/zatackax"; + changelog = "https://github.com/simenheg/zatackax/releases"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.alch-emi ]; + mainProgram = "zatackax"; + platforms = lib.platforms.linux; + }; +}) From 6fd9ec48b661c775591e0d3222834c1bfbae2e2d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 2 Nov 2025 14:53:11 +0100 Subject: [PATCH 0662/2279] xorg.xorgserver: 21.1.18 -> 21.1.20 Fixes CVE-2025-62229, CVE-2025-62230 and CVE-2025-62231. https://lists.x.org/archives/xorg-announce/2025-October/003635.html Changelog: https://lists.x.org/archives/xorg-announce/2025-October/003636.html https://lists.x.org/archives/xorg-announce/2025-October/003638.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dcd8341ee0fd..61db87acd555 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3352,11 +3352,11 @@ self: with self; { }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.18"; + version = "21.1.20"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz"; - sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz"; + sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc="; }; hardeningDisable = [ "bindnow" diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 5307be640d4b..33aa31bf7c8d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -77,4 +77,4 @@ mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz From 7942113f43d0df1cb750d6fa48c620da43b34f38 Mon Sep 17 00:00:00 2001 From: zimward Date: Sun, 19 Oct 2025 14:12:08 +0200 Subject: [PATCH 0663/2279] ltspice: init at 24.1.10 --- pkgs/by-name/lt/ltspice/ltspice.sh | 19 ++++++ pkgs/by-name/lt/ltspice/package.nix | 91 +++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 pkgs/by-name/lt/ltspice/ltspice.sh create mode 100644 pkgs/by-name/lt/ltspice/package.nix diff --git a/pkgs/by-name/lt/ltspice/ltspice.sh b/pkgs/by-name/lt/ltspice/ltspice.sh new file mode 100644 index 000000000000..d03f7339b651 --- /dev/null +++ b/pkgs/by-name/lt/ltspice/ltspice.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +# Original Authors: fenugrec and Max Stabel + +CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/ltspice" + +if [[ ! -d $CONFIG_DIR ]]; then + mkdir -p "$CONFIG_DIR" +fi +if [[ ! -f "$CONFIG_DIR/LTspice.ini" ]]; then + # disable sending telemetry + echo -e "[Options]\nCaptureAnalytics=false" > "$CONFIG_DIR/LTspice.ini" +fi + +WINEPREFIX="${WINEPREFIX-"${XDG_DATA_HOME-"$HOME/.local/share"}"/ltspice}" +if [[ ! -d $WINEPREFIX ]]; then + mkdir -p "$WINEPREFIX" +fi +WINEARCH=win64 WINEPREFIX=$WINEPREFIX WINEDLLOVERRIDES=winemenubuilder.exe=d wine start.exe /unix @outpath@/libexec/ltspice/LTspice.exe -ini $CONFIG_DIR/LTspice.ini "$@" diff --git a/pkgs/by-name/lt/ltspice/package.nix b/pkgs/by-name/lt/ltspice/package.nix new file mode 100644 index 000000000000..ff4e0e9f7a0d --- /dev/null +++ b/pkgs/by-name/lt/ltspice/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenvNoCC, + fetchurl, + msitools, + icoutils, + imagemagick, + wine64, + makeDesktopItem, + copyDesktopItems, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ltspice"; + version = "24.1.10"; + src = fetchurl { + url = "https://web.archive.org/web/20251028221949/https://ltspice.analog.com/software/LTspice64.msi"; + hash = "sha256-LSK84ogbBk9kP7LKg8rzCGDqq36XfsK4Kzn2Zwea8C4="; + }; + dontUnpack = true; + dontConfigure = true; + + nativeBuildInputs = [ + msitools + icoutils + imagemagick + copyDesktopItems + ]; + + postPatch = '' + cp ${./ltspice.sh} ./ltspice.sh + substituteInPlace ./ltspice.sh \ + --replace-fail wine ${lib.getExe wine64} \ + --replace-fail @outpath@ $out + ''; + + buildPhase = '' + runHook preBuild + msiextract $src + mv -f "APPDIR:."/* . + mv -f "LocalAppDataFolder/LTspice"/* . + wrestool -x -t 14 LTspice.exe | magick ICO:- ltspice.png + rm Remove.exe updater.exe + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + install -Dm644 ltspice.png $out/share/pixmaps/ltspice.png + + install -m755 -d $out/libexec/ltspice + install -m755 *.exe $out/libexec/ltspice + install -m655 *.zip $out/libexec/ltspice + + install -Dm755 ltspice.sh $out/bin/ltspice + runHook postInstall + ''; + desktopItems = [ + (makeDesktopItem { + name = "ltspice"; + desktopName = "LTspice"; + comment = finalAttrs.meta.description; + exec = "${finalAttrs.meta.mainProgram} %f"; + icon = "ltspice"; + mimeTypes = [ + "application/raw" + "application/asc" + "application/res" + "application/asy" + "application/bead" + "application/bjt" + "application/cap" + "application/dio" + "application/ind" + "application/jft" + "application/mos" + ]; + }) + ]; + + meta = { + description = "SPICE simulator, schematic capture and waveform viewer"; + homepage = "https://www.analog.com/en/resources/design-tools-and-calculators/ltspice-simulator.html"; + license = lib.licenses.unfree; + mainProgram = "ltspice"; + maintainers = [ lib.maintainers.zimward ]; + #technically windows too, but for that the builder would need some conditionals + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) From e3bf16ec9e0c4d72aac23a5dd494ca2764be94ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= Date: Sun, 2 Nov 2025 12:31:56 -0300 Subject: [PATCH 0664/2279] forge-mtg: fix darwin build alsa-lib is not available on darwin. fixes #457768 --- pkgs/by-name/fo/forge-mtg/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index 750be8e31532..c8f57b7ddcbb 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, gnused, lib, + stdenv, maven, makeWrapper, openjdk, @@ -108,10 +109,12 @@ maven.buildMavenPackage { PREFIX_CMD="" if [ "$commandToInstall" = "forge-adventure" ]; then PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - libGL - alsa-lib - ] + lib.makeLibraryPath ( + [ + libGL + ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ] + ) }" fi From 514f924995c86b63096cb3ca580ea103159afdf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 2 Nov 2025 16:36:45 +0100 Subject: [PATCH 0665/2279] glm_1_0_1: init --- pkgs/by-name/gl/glm/1_0_1.nix | 15 +++++++ pkgs/by-name/gl/glm/generic.nix | 72 +++++++++++++++++++++++++++++++++ pkgs/by-name/gl/glm/package.nix | 65 +---------------------------- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 91 insertions(+), 63 deletions(-) create mode 100644 pkgs/by-name/gl/glm/1_0_1.nix create mode 100644 pkgs/by-name/gl/glm/generic.nix diff --git a/pkgs/by-name/gl/glm/1_0_1.nix b/pkgs/by-name/gl/glm/1_0_1.nix new file mode 100644 index 000000000000..68ecba82fa53 --- /dev/null +++ b/pkgs/by-name/gl/glm/1_0_1.nix @@ -0,0 +1,15 @@ +{ + callPackage, + fetchFromGitHub, +}: + +callPackage ./generic.nix rec { + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "g-truc"; + repo = "glm"; + rev = version; + sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE="; + }; +} diff --git a/pkgs/by-name/gl/glm/generic.nix b/pkgs/by-name/gl/glm/generic.nix new file mode 100644 index 000000000000..f7d024ab81cb --- /dev/null +++ b/pkgs/by-name/gl/glm/generic.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + + version, + src, +}: + +stdenv.mkDerivation rec { + pname = "glm"; + inherit version src; + + outputs = [ + "out" + "doc" + ]; + + patches = lib.optionals stdenv.hostPlatform.isLinux [ + # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release. + # Relies on , Linux-specific + ./1001-glm-Fix-packing-on-BE.patch + ]; + + nativeBuildInputs = [ cmake ]; + + env.NIX_CFLAGS_COMPILE = + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 + if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then + "-fno-ipa-modref" + # Fix compilation errors on darwin + else if (stdenv.cc.isClang) then + "-Wno-error" + else + ""; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" false) + (lib.cmakeBool "BUILD_STATIC_LIBS" false) + (lib.cmakeBool "GLM_TEST_ENABLE" doCheck) + ]; + + doCheck = true; + + postInstall = '' + # Install pkg-config file + mkdir -p $out/lib/pkgconfig + substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc + + # Install docs + mkdir -p $doc/share/doc/glm + cp -rv ../doc/api $doc/share/doc/glm/html + cp -v ../doc/manual.pdf $doc/share/doc/glm + ''; + + meta = with lib; { + description = "OpenGL Mathematics library for C++"; + longDescription = '' + OpenGL Mathematics (GLM) is a header only C++ mathematics library for + graphics software based on the OpenGL Shading Language (GLSL) + specification and released under the MIT license. + ''; + homepage = "https://github.com/g-truc/glm"; + license = licenses.mit; + platforms = platforms.unix; + # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE. + # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header. + broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux; + maintainers = with maintainers; [ smancill ]; + }; +} diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix index f5dd16d62101..298ad577aa2e 100644 --- a/pkgs/by-name/gl/glm/package.nix +++ b/pkgs/by-name/gl/glm/package.nix @@ -1,13 +1,10 @@ { - lib, - stdenv, + callPackage, fetchFromGitHub, - cmake, }: -stdenv.mkDerivation rec { +callPackage ./generic.nix rec { version = "1.0.2"; - pname = "glm"; src = fetchFromGitHub { owner = "g-truc"; @@ -15,62 +12,4 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0="; }; - - outputs = [ - "out" - "doc" - ]; - - patches = lib.optionals stdenv.hostPlatform.isLinux [ - # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release. - # Relies on , Linux-specific - ./1001-glm-Fix-packing-on-BE.patch - ]; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 - if (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") then - "-fno-ipa-modref" - # Fix compilation errors on darwin - else if (stdenv.cc.isClang) then - "-Wno-error" - else - ""; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - (lib.cmakeBool "BUILD_STATIC_LIBS" false) - (lib.cmakeBool "GLM_TEST_ENABLE" doCheck) - ]; - - doCheck = true; - - postInstall = '' - # Install pkg-config file - mkdir -p $out/lib/pkgconfig - substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc - - # Install docs - mkdir -p $doc/share/doc/glm - cp -rv ../doc/api $doc/share/doc/glm/html - cp -v ../doc/manual.pdf $doc/share/doc/glm - ''; - - meta = with lib; { - description = "OpenGL Mathematics library for C++"; - longDescription = '' - OpenGL Mathematics (GLM) is a header only C++ mathematics library for - graphics software based on the OpenGL Shading Language (GLSL) - specification and released under the MIT license. - ''; - homepage = "https://github.com/g-truc/glm"; - license = licenses.mit; - platforms = platforms.unix; - # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE. - # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header. - broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux; - maintainers = with maintainers; [ smancill ]; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03db0bc700ce..d48c9539019e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1659,6 +1659,8 @@ with pkgs; glances = python3Packages.callPackage ../applications/system/glances { }; + glm_1_0_1 = callPackage ../by-name/gl/glm/1_0_1.nix { }; + go2tv-lite = go2tv.override { withGui = false; }; guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; From 9442012bcbe070493ca9416cc418bbd327759a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 1 Nov 2025 16:16:41 +0100 Subject: [PATCH 0666/2279] empty-epsilon: fix serious-proton build by downgrading glm --- pkgs/by-name/em/empty-epsilon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index 9cb8ec06c7ea..2eb7d5ad2697 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -7,7 +7,7 @@ libX11, glew, python3, - glm, + glm_1_0_1, meshoptimizer, SDL2, ninja, @@ -42,7 +42,7 @@ let buildInputs = [ sfml libX11 - glm + glm_1_0_1 SDL2 ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation { glew libX11 python3 - glm + glm_1_0_1 SDL2 ninja ]; From 573994db71f1f11efe680da0ee51931bcd6b2bbc Mon Sep 17 00:00:00 2001 From: winston Date: Sun, 2 Nov 2025 16:50:16 +0100 Subject: [PATCH 0667/2279] nu_scripts: don't install screenshots removes the screenshot directory, saving 93MB, or ~85% pkg size --- pkgs/by-name/nu/nu_scripts/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index bc12cbaf6c8d..87791850a2e2 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -21,6 +21,7 @@ stdenvNoCC.mkDerivation { mkdir -p $out/share/nu_scripts mv ./* $out/share/nu_scripts + rm -r $out/share/nu_scripts/themes/screenshots runHook postInstall ''; From cf67993b3e17929aebd584c206bf82b7966fefe4 Mon Sep 17 00:00:00 2001 From: Shelvacu Date: Sun, 2 Nov 2025 09:37:24 -0800 Subject: [PATCH 0668/2279] partftpy: init at 0.4.0 This is a fork of tftpy required for copyparty --- .../python-modules/partftpy/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/partftpy/default.nix diff --git a/pkgs/development/python-modules/partftpy/default.nix b/pkgs/development/python-modules/partftpy/default.nix new file mode 100644 index 000000000000..8a0df4e5f57a --- /dev/null +++ b/pkgs/development/python-modules/partftpy/default.nix @@ -0,0 +1,38 @@ +# mostly copied from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/partftpy/default.nix +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: +buildPythonPackage rec { + pname = "partftpy"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "9001"; + repo = "partftpy"; + tag = "v${version}"; + hash = "sha256-9+zY9OpGQ3LbORwtjEYZF1lRaQCLmSyQ9KQdxaOzMuM="; + }; + + postPatch = '' + # poor setuptools gets confused by this dir + rm -r t + ''; + + pyproject = true; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "partftpy.TftpServer" ]; + + meta = { + description = "Pure Python TFTP library (copyparty fork of tftpy)"; + homepage = "https://github.com/9001/partftpy"; + changelog = "https://github.com/9001/partftpy/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.shelvacu ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96b412d8e7a5..7533984b6ae0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11550,6 +11550,8 @@ self: super: with self; { partd = callPackage ../development/python-modules/partd { }; + partftpy = callPackage ../development/python-modules/partftpy { }; + partial-json-parser = callPackage ../development/python-modules/partial-json-parser { }; particle = callPackage ../development/python-modules/particle { }; From 7ec92ade2dfe86f3daa3482a16060cb2479c18b8 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 15 Oct 2025 10:23:44 +0300 Subject: [PATCH 0669/2279] olive-editor: fix build of pinned openimageio - add `override` to pinned `openimageio` with `fmt_10`, it does not build with new default `fmt_11` Fixes build failure of pinned `openimageio`: ``` CMake Error at src/cmake/modules/Findfmt.cmake:19 (string): string sub-command REGEX, mode MATCHALL needs at least 5 arguments total to command. Call Stack (most recent call first): src/cmake/externalpackages.cmake:325 (find_package) src/cmake/externalpackages.cmake:354 (find_or_download_fmt) CMakeLists.txt:166 (include) ``` --- pkgs/by-name/ol/olive-editor/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix index 1be1af06b3b9..110701b74a91 100644 --- a/pkgs/by-name/ol/olive-editor/package.nix +++ b/pkgs/by-name/ol/olive-editor/package.nix @@ -14,12 +14,13 @@ portaudio, imath, qt6, + fmt_10, }: let # https://github.com/olive-editor/olive/issues/2284 # we patch support for 2.3+, but 2.5 fails - openimageio' = openimageio.overrideAttrs (old: rec { + openimageio' = (openimageio.override { fmt = fmt_10; }).overrideAttrs (old: rec { version = "2.4.15.0"; src = ( old.src.override { From d09aec1b2769b6d64e590c0fa921cef2415529db Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 2 Nov 2025 22:38:58 +0300 Subject: [PATCH 0670/2279] olive-editor: fix build with qt6-6.10 - add patch from merged upstream PR of `kddockwidgets` submodule: https://www.github.com/KDAB/KDDockWidgets/pull/615 https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032 (does not apply with `fetchpatch`) Fixes build failure with qt6-6.10: ``` CMake Error at ext/KDDockWidgets/src/CMakeLists.txt:306 (target_link_libraries): Target "kddockwidgets" links to: Qt6::WidgetsPrivate but the target was not found. Possible reasons include: * There is a typo in the target name. * A find_package call is missing for an IMPORTED target. * An ALIAS target is missing. ``` --- ...kddockwidgets-fix-build-with-qt-6_10.patch | 21 +++++++++++++++++++ pkgs/by-name/ol/olive-editor/package.nix | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch diff --git a/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch new file mode 100644 index 000000000000..3ab25e679764 --- /dev/null +++ b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch @@ -0,0 +1,21 @@ +diff --git a/ext/KDDockWidgets/CMakeLists.txt b/ext/KDDockWidgets/CMakeLists.txt +index 608a2491..d0edc399 100644 +--- a/ext/KDDockWidgets/CMakeLists.txt ++++ b/ext/KDDockWidgets/CMakeLists.txt +@@ -160,8 +160,16 @@ + include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables + + set(${PROJECT_NAME}_DEPS "widgets") ++if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0") ++ set(QT_NO_PRIVATE_MODULE_WARNING ON) ++ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate) ++endif() + if(${PROJECT_NAME}_QTQUICK) + find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2) ++ if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0") ++ set(QT_NO_PRIVATE_MODULE_WARNING ON) ++ find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate) ++ endif() + add_definitions(-DKDDOCKWIDGETS_QTQUICK) + set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2") + else() diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix index 110701b74a91..6d98955eea6c 100644 --- a/pkgs/by-name/ol/olive-editor/package.nix +++ b/pkgs/by-name/ol/olive-editor/package.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation { url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch"; hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag="; }) + + # Fix build of `kddockwidgets` with qt6-6.10, adapted from: + # https://github.com/KDAB/KDDockWidgets/pull/615 + # https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032 + ./olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch ]; # https://github.com/olive-editor/olive/issues/2200 From 7d14d8c13fcd5bc7d2cf02440d98c3054b7e40c5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Tue, 21 Oct 2025 10:55:07 -0700 Subject: [PATCH 0671/2279] libportal: remove darwin from platforms --- pkgs/by-name/li/libportal/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix index 2ac26a43b3b8..a26b79f2b48d 100644 --- a/pkgs/by-name/li/libportal/package.nix +++ b/pkgs/by-name/li/libportal/package.nix @@ -102,5 +102,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ jtojnar ]; platforms = lib.platforms.unix; + # needs memfd_create which is available on some unixes but not darwin + badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; } From e82952b2c3d481e2d9a5ef2d3731d6215fb4821b Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 2 Nov 2025 15:21:24 -0600 Subject: [PATCH 0672/2279] stub-ld: remove 32-bit test as it's no longer provided stub-ld 32-bit support was removed in e9b95509b20f328e25e6b5123248cd22b9a6d245 --- nixos/tests/stub-ld.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/nixos/tests/stub-ld.nix b/nixos/tests/stub-ld.nix index c6d045f60c05..a6ba3da49e54 100644 --- a/nixos/tests/stub-ld.nix +++ b/nixos/tests/stub-ld.nix @@ -24,12 +24,6 @@ import ./make-test-python.nix ( libDir = pkgs.stdenv.hostPlatform.libDir; ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker); - check32 = pkgs.stdenv.hostPlatform.isx86_64; - pkgs32 = pkgs.pkgsi686Linux; - - libDir32 = pkgs32.stdenv.hostPlatform.libDir; - ldsoBasename32 = lib.last (lib.splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker); - test-exec = builtins.mapAttrs ( @@ -45,8 +39,6 @@ import ./make-test-python.nix ( aarch64-linux.hash = "sha256-hnldbd2cctQIAhIKoEZLIWY8H3jiFBClkNy2UlyyvAs="; }; exec-name = "rustic"; - - if32 = pythonStatement: if check32 then pythonStatement else "pass"; in '' machine.start() @@ -54,35 +46,26 @@ import ./make-test-python.nix ( with subtest("Check for stub (enabled, initial)"): machine.succeed('test -L /${libDir}/${ldsoBasename}') - ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"} with subtest("Try FHS executable"): machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec') machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi') machine.succeed('grep -qi nixos outfile') - ${if32 "machine.copy_from_host('${ - test-exec.${pkgs32.stdenv.hostPlatform.system} - }','test-exec32')"} - ${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"} - ${if32 "machine.succeed('grep -qi nixos outfile32')"} with subtest("Disable stub"): machine.succeed("/run/booted-system/specialisation/nostub/bin/switch-to-configuration test") with subtest("Check for stub (disabled)"): machine.fail('test -e /${libDir}/${ldsoBasename}') - ${if32 "machine.fail('test -e /${libDir32}/${ldsoBasename32}')"} with subtest("Create file in stub location (to be overwritten)"): machine.succeed('mkdir -p /${libDir};touch /${libDir}/${ldsoBasename}') - ${if32 "machine.succeed('mkdir -p /${libDir32};touch /${libDir32}/${ldsoBasename32}')"} with subtest("Re-enable stub"): machine.succeed("/run/booted-system/bin/switch-to-configuration test") with subtest("Check for stub (enabled, final)"): machine.succeed('test -L /${libDir}/${ldsoBasename}') - ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"} ''; } ) From b0857a62d19c508b8f8fb95498ce053b26b9e4e6 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 2 Nov 2025 18:44:24 -0300 Subject: [PATCH 0673/2279] vite: unstable-2022-05-17 -> 1.4 --- .../science/misc/vite/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 4684bccc31e0..1bdabe3875d6 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitLab, + fetchpatch, lib, cmake, qtbase, @@ -13,18 +14,26 @@ wrapQtAppsHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "vite"; - version = "unstable-2022-05-17"; + version = "1.4"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "solverstack"; repo = "vite"; - rev = "6d497cc519fac623e595bd174e392939c4de845c"; - hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-z2M4BazLzO/NCcq/VKb+tgrZ6QUs+AX0BbzJW809Krg="; }; + patches = [ + (fetchpatch { + name = "cmake4-fix"; + url = "https://gitlab.inria.fr/solverstack/vite/-/commit/0359f78c8b11ced3a79ac4d73f4ecb9087eba1e8.patch"; + hash = "sha256-UMg21ZlwyRSVQ4CD1oKNUkT+RNxqOIQi2WNBLbYPkJg="; + }) + ]; + nativeBuildInputs = [ cmake qttools @@ -54,4 +63,4 @@ stdenv.mkDerivation { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) From 058acd2bd4deda57934118bc9707c4e174fd4987 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 2 Nov 2025 18:48:13 -0300 Subject: [PATCH 0674/2279] vite: add maintainer iedame --- pkgs/applications/science/misc/vite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 1bdabe3875d6..956cf1f81569 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://vite.gforge.inria.fr/"; license = lib.licenses.cecill20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iedame ]; platforms = lib.platforms.linux; }; }) From 2878a4f05245408c3acfbb7f615e7319a4b49b5d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 2 Nov 2025 22:17:35 +0100 Subject: [PATCH 0675/2279] valgrind: fix build for musl Fixes: c9c5db63146f ("valgrind: 3.25.1 -> 3.26.0") --- pkgs/by-name/va/valgrind/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix index 967245b01ac8..135d600fd03a 100644 --- a/pkgs/by-name/va/valgrind/package.nix +++ b/pkgs/by-name/va/valgrind/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { url = "https://bugsfiles.kde.org/attachment.cgi?id=148912"; sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I="; }) + # https://bugs.kde.org/show_bug.cgi?id=511548 + (fetchpatch { + url = "https://bugsfiles.kde.org/attachment.cgi?id=186435"; + hash = "sha256-Ifsg3Hr78umZR5nwy9DOY8bB59wp8EtV+fYm+h8sk9k="; + }) + # Fix build on armv7l. # see also https://bugs.kde.org/show_bug.cgi?id=454346 (fetchpatch { From 55f863d0b328004852be2a40c64f3a9bb1cff74f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 2 Nov 2025 19:09:20 -0300 Subject: [PATCH 0676/2279] veryfasttree: mark as broken on darwin --- pkgs/by-name/ve/veryfasttree/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix index 98682898e598..a20bcbd1f06b 100644 --- a/pkgs/by-name/ve/veryfasttree/package.nix +++ b/pkgs/by-name/ve/veryfasttree/package.nix @@ -35,5 +35,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.all; + # last successful hydra build on darwin was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; }) From e4d31bd6c5fb691f7cbac93ea6179668349288a6 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 2 Nov 2025 21:36:09 -0300 Subject: [PATCH 0677/2279] robodoc: fix build on darwin --- pkgs/by-name/ro/robodoc/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix index 4a8bb485a6f6..bfb50edaaf68 100644 --- a/pkgs/by-name/ro/robodoc/package.nix +++ b/pkgs/by-name/ro/robodoc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, }: @@ -16,6 +17,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; }; + patches = [ + (fetchpatch { + name = "troff_generator-fix"; + url = "https://github.com/gumpu/ROBODoc/commit/0f8b35c42523810415bec70bb2200d2ecb41c82f.patch?index=full"; + hash = "sha256-Pbuc1gHrOeHbR4QT/dZ8wP+vqYQlilayjCGKOJP5wvk="; + }) + ]; + postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Docs/makefile.am \ --replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS =' From d7c400085f3656d078c4e16a15322904b030daa1 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 2 Nov 2025 21:44:20 -0300 Subject: [PATCH 0678/2279] robodoc: add maintainer iedame --- pkgs/by-name/ro/robodoc/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix index bfb50edaaf68..69e6ddcc7deb 100644 --- a/pkgs/by-name/ro/robodoc/package.nix +++ b/pkgs/by-name/ro/robodoc/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "gumpu"; repo = "ROBODoc"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; }; @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Docs/makefile.am \ - --replace 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS =' + --replace-fail 'man1_MANS = robodoc.1 robohdrs.1' 'man1_MANS =' ''; nativeBuildInputs = [ autoreconfHook ]; hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { homepage = "https://github.com/gumpu/ROBODoc"; description = "Documentation Extraction Tool"; longDescription = '' @@ -56,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: { Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++, Java -- basically any program in which you can use remarks/comments. ''; - license = with licenses; gpl3Plus; - maintainers = [ ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ iedame ]; + platforms = lib.platforms.all; + mainProgram = "robodoc"; }; }) From 6b79217b1717739329f39d98db86dfd4080601ae Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 3 Nov 2025 02:13:44 +0100 Subject: [PATCH 0679/2279] drawing: fix double wrapping --- pkgs/by-name/dr/drawing/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix index 86e6b711add7..c42420618191 100644 --- a/pkgs/by-name/dr/drawing/package.nix +++ b/pkgs/by-name/dr/drawing/package.nix @@ -60,6 +60,13 @@ python3.pkgs.buildPythonApplication rec { patchShebangs build-aux/meson/postinstall.py ''; + # Prevent double wrapping because of wrapGAppsHook3 + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + strictDeps = false; meta = { From f0a15b8c4e5d0e65c4df82e64927181195280fea Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 18 Jul 2025 00:17:36 -0400 Subject: [PATCH 0680/2279] connectome-workbench: 2.0.1 -> 2.1.0 Also support building with cmake 4 and bump Qt5 to Qt6. --- .../co/connectome-workbench/package.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix index 0f3ed3d244cf..ecd7044c3d67 100644 --- a/pkgs/by-name/co/connectome-workbench/package.nix +++ b/pkgs/by-name/co/connectome-workbench/package.nix @@ -6,57 +6,57 @@ cmake, libGL, libGLU, - libsForQt5, + qt6, }: stdenv.mkDerivation (finalAttrs: { pname = "connectome-workbench"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Washington-University"; repo = "workbench"; tag = "v${finalAttrs.version}"; - hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg="; + hash = "sha256-f1T0i4x7rr3u/3ZvJ4cEAb377e7YcaGMKa2uUslVqR0="; }; sourceRoot = "${finalAttrs.src.name}/src"; - patches = [ - # remove after next release: - (fetchpatch { - name = "fix-missing-includes-in-CZIlib"; - url = "https://github.com/Washington-University/workbench/commit/7ba3345d161d567a4b628ceb02ab4471fc96cb20.diff"; - hash = "sha256-DMrJOr/2Wr4o4Z3AuhWfMZTX8f/kOYWwZQzBUwIrTd8="; - relative = "src"; - }) - ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "ADD_SUBDIRECTORY ( Tests )" "" \ - --replace-fail "ENABLE_TESTING()" "" - ''; - # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored): - # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv' - # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line + substituteInPlace kloewe/{cpuinfo,dot}/CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + '' + + + # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored): + # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv' + # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line + '' + substituteInPlace CMakeLists.txt \ + --replace-fail "ADD_SUBDIRECTORY ( Tests )" "" \ + --replace-fail "ENABLE_TESTING()" "" + ''; env.NIX_CFLAGS_COMPILE = "-fpermissive"; nativeBuildInputs = [ cmake - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ libGL libGLU ] - ++ (with libsForQt5; [ + ++ (with qt6; [ qtbase + qt5compat ]); # note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly + cmakeFlags = [ + "-DWORKBENCH_USE_QT6=TRUE" + "-DWORKBENCH_USE_QT5=FALSE" + ]; + meta = { description = "Visualization and discovery tool used to map neuroimaging data"; homepage = "https://www.humanconnectome.org/software/connectome-workbench"; From e34d04444be07fca1ce791c128ebfb5a1dcbc580 Mon Sep 17 00:00:00 2001 From: Kieran Klukas Date: Sun, 2 Nov 2025 21:40:55 -0500 Subject: [PATCH 0681/2279] rapidraw: 1.3.2 -> 1.4.1 --- pkgs/by-name/ra/rapidraw/package.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index bafcc3aea287..2a1c187ee1a6 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, fetchNpmDeps, rustPlatform, @@ -34,20 +35,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rapidraw"; - version = "1.3.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "CyberTimon"; repo = "RapidRAW"; tag = "v${finalAttrs.version}"; - hash = "sha256-j9Mpg3o90/PdKlSpJEePcnXZoO2BfnGtJEielM/5/uQ="; + hash = "sha256-aDOE2VXStPx4POQoSxoQbLwdBmt3LuMPxSZ8ZshE7Fc="; + fetchSubmodules = true; }; - cargoHash = "sha256-emwlK16NgeTYyQevWD4baHUxMP5xWJsKpQp/q5krAhQ="; + cargoHash = "sha256-+7CK2KxUMQ56CBVVb2esM+9ntJ7SzpVb2OmQ3mM5vNU="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-MULxH6gmHC58XdQe4ePvHcXP7/7fYNHgGHHltkODQ6w="; + hash = "sha256-QaPGXb26pDQLBJfYZoWt3jDeCdwameGkBvrTzhRMxYs="; }; nativeBuildInputs = [ @@ -64,11 +66,9 @@ rustPlatform.buildRustPackage (finalAttrs: { nodejs_20 glib-networking openssl - webkitgtk_4_1 gtk3 glib gdk-pixbuf - libappindicator cairo pango xorg.libX11 @@ -90,6 +90,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libheif onnxruntime wrapGAppsHook4 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_1 + libappindicator ]; cargoRoot = "src-tauri"; @@ -101,7 +105,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # Configure Tauri to use lowercase binary name substituteInPlace src-tauri/tauri.conf.json \ - --replace ' "identifier": "com.rapidraw.app",' ' "identifier": "com.rapidraw.app", "mainBinaryName": "rapidraw",' + --replace-fail ' "identifier": "io.github.CyberTimon.RapidRAW",' ' "identifier": "io.github.CyberTimon.RapidRAW", "mainBinaryName": "rapidraw",' + + # Disable downloading of ONNX runtime library this is correctly linked during postInstall + substituteInPlace src-tauri/build.rs \ + --replace-fail 'if !is_valid' 'if false' ''; dontWrapGApps = true; @@ -109,7 +117,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # needs to be declared twice annoyingly ORT_STRATEGY = "system"; - postInstall = '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Patch the .desktop file to set the Categories field sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop" @@ -123,7 +131,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -rf $out/lib/RapidRAW/resources/libonnxruntime.dylib ''; - postFixup = '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapGApp $out/bin/rapidraw \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ --set ORT_STRATEGY "system" \ From 0dadfcda394976839e19b12dc78c9926b0c7aff3 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 2 Nov 2025 21:48:05 -0600 Subject: [PATCH 0682/2279] nixos/tests: fix swap-random-encryption It parses cryptsetup cli output and the format changed. --- nixos/tests/swap-random-encryption.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/swap-random-encryption.nix b/nixos/tests/swap-random-encryption.nix index 0b88c21654ca..80601e89d108 100644 --- a/nixos/tests/swap-random-encryption.nix +++ b/nixos/tests/swap-random-encryption.nix @@ -78,7 +78,7 @@ if not any(cipher_pattern.fullmatch(line) for line in results): raise Exception ("swap device encryption does not use the cipher specified in the configuration") - key_size_pattern = re.compile(r"\s*keysize:\s+512\s+bits\s*") + key_size_pattern = re.compile(r"\s*keysize:\s+512\s+\[?bits\]?\s*") if not any(key_size_pattern.fullmatch(line) for line in results): raise Exception ("swap device encryption does not use the key size specified in the configuration") ''; From 2752e97f4cbe92873de6722ee6f70eff5c0e7653 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 3 Nov 2025 05:49:08 +0100 Subject: [PATCH 0683/2279] python3Packages.boltztrap2: fix build --- pkgs/development/python-modules/boltztrap2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 6ce0e46680ee..791596ce4a34 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { }; postPatch = '' + substituteInPlace external/spglib-1.9.9/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)" substituteInPlace pyproject.toml \ --replace-fail "numpy>=2.0.0" "numpy" ''; From 43911e59ce75810aa8b41f16224aea760c1f4bf5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 3 Nov 2025 07:09:43 +0100 Subject: [PATCH 0684/2279] top-level/release.nix: drop GHC 9.4. job for HLS haskell-language-server no longer supports GHC 9.4. --- pkgs/top-level/release.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index db45d46e098b..db6955850668 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -361,7 +361,6 @@ let packages = genAttrs [ - "ghc94" "ghc96" "ghc98" "ghc910" From 852026e67bce5ae2636e3b1bfdeaadc8080895ef Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 3 Nov 2025 07:10:35 +0100 Subject: [PATCH 0685/2279] haskell.packages.ghc94.haskell-language-server: fix ref to config --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e26f612d821e..fe58bea65f88 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -138,7 +138,7 @@ self: super: { path = self.path_0_9_5; haskell-language-server = - lib.throwIf config.allowAliases + lib.throwIf pkgs.config.allowAliases "haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs" (markBroken super.haskell-language-server); From 4754a31af5118d360f7915012d63bd2b9dbed0ee Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 3 Nov 2025 09:23:19 +0100 Subject: [PATCH 0686/2279] valgrind: fix build for Glibc Add missing include. Fixes: 2878a4f05245 ("valgrind: fix build for musl") Closes: https://github.com/NixOS/nixpkgs/pull/457933 --- pkgs/by-name/va/valgrind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix index 135d600fd03a..bb420e060fac 100644 --- a/pkgs/by-name/va/valgrind/package.nix +++ b/pkgs/by-name/va/valgrind/package.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { }) # https://bugs.kde.org/show_bug.cgi?id=511548 (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=186435"; - hash = "sha256-Ifsg3Hr78umZR5nwy9DOY8bB59wp8EtV+fYm+h8sk9k="; + url = "https://bugsfiles.kde.org/attachment.cgi?id=186451"; + hash = "sha256-IGmyHwwGoy00hcz3XxQSDcwcU8zHLBJ9dfqTvWDQ520="; }) # Fix build on armv7l. From a36931ccf2c4a5d146c5617708ad199276e2547a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 09:22:01 +0100 Subject: [PATCH 0687/2279] haskell.packages.ghc96.haskell-language-server: fix build This dependency is only needed for the "plugin-tutorial" executable. This is only built with GHC 9.6 and 9.8, but the expression is created with GHC 9.10. Thus add the missing dependency. It would be better to just disable that tutorial, but I didn't find a quick way of doing that - toggling the related flag did not work. This only fixed the build for GHC 9.6 for me, GHC 9.8 failed with a different error right after. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 987897276982..5c2be32d1d5e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -220,6 +220,7 @@ in haskell-language-server = addBuildDepends [ self.retrie self.floskell + self.markdown-unlit ] super.haskell-language-server; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 58e801c64ba9..01f9d43a269f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -124,6 +124,7 @@ in haskell-language-server = addBuildDepends [ self.retrie self.floskell + self.markdown-unlit ] super.haskell-language-server; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; From 7f8ab22df9c6e9ffb088e3e6b2edd387df9a9b10 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 3 Nov 2025 09:24:10 +0100 Subject: [PATCH 0688/2279] haskell.packages.ghc98.haskell-language-server: fix build It was complaining about different versions of some regex dependency in the closure, the differing one introduced by hls-plugin-api. GHC 9.6 didn't fail that way, but I figured such a change can't hurt either, for consistency. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 5c2be32d1d5e..41b81b6ba15f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -222,6 +222,7 @@ in self.floskell self.markdown-unlit ] super.haskell-language-server; + hls-plugin-api = super.hls-plugin-api; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; retrie = doJailbreak (unmarkBroken super.retrie); @@ -232,6 +233,7 @@ in floskell fourmolu haskell-language-server + hls-plugin-api hlint ormolu retrie diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 01f9d43a269f..8b430b143451 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -126,6 +126,7 @@ in self.floskell self.markdown-unlit ] super.haskell-language-server; + hls-plugin-api = super.hls-plugin-api; hlint = self.hlint_3_8; ormolu = self.ormolu_0_7_4_0; retrie = doJailbreak (unmarkBroken super.retrie); @@ -136,6 +137,7 @@ in floskell fourmolu haskell-language-server + hls-plugin-api hlint ormolu retrie From dcf6b5c8afbd5a928f069a26ceeee2021dbe7f4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Nov 2025 08:56:43 +0000 Subject: [PATCH 0689/2279] moor: 2.6.1 -> 2.8.1 --- pkgs/by-name/mo/moor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index 15300c423454..b366352cd223 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-5MiTxspdNTFfLnif5C3gcQ0suxRrjerlZl2+kPAjiBM="; + hash = "sha256-VipHPRxSre6U3VXNtP+NrlaVfgUkzIDLvg4UsZucAdY="; }; vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw="; From 4991fe06682f5653fe39816e11fec6e9295d2d2b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 3 Nov 2025 10:02:59 +0100 Subject: [PATCH 0690/2279] pioneer: fix build --- pkgs/by-name/pi/pioneer/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix index ea86c3c0c0e3..a5df5859db70 100644 --- a/pkgs/by-name/pi/pioneer/package.nix +++ b/pkgs/by-name/pi/pioneer/package.nix @@ -32,8 +32,10 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})' + substituteInPlace contrib/lz4/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.4)' 'cmake_minimum_required(VERSION 3.13)' + substituteInPlace contrib/nanosockets/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.13)' ''; nativeBuildInputs = [ From 968be1d62f52977303ee9698d936577a05e31b67 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 3 Nov 2025 10:34:15 +0100 Subject: [PATCH 0691/2279] pothos: fix build --- pkgs/applications/radio/pothos/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index cf9b3be83409..3d49bd8229f9 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -46,6 +46,20 @@ mkDerivation rec { ./cstring.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace spuce/{,spuce}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + + substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + + substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)" + + ''; + # poco 1.14 requires c++17 NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ]; From f26cbb942554f461a548e2c1a4dc18365a8dc6ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 16:58:21 +0200 Subject: [PATCH 0692/2279] gnome-keysign: Fix eval future package is marked as broken so this was not evaluating. As a result, in conjunction with https://github.com/python/cpython/issues/103847, update.nix froze when trying to bump GNOME package set. --- pkgs/by-name/gn/gnome-keysign/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix index 0e17038371b9..871de9db73c0 100644 --- a/pkgs/by-name/gn/gnome-keysign/package.nix +++ b/pkgs/by-name/gn/gnome-keysign/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitLab, + fetchpatch, python3, wrapGAppsHook3, gobject-introspection, @@ -22,6 +23,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss="; }; + patches = [ + # Remove broken future dependency + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keysign/-/commit/ea197254baf70a499a371678369eda85aff7a4c5.patch"; + hash = "sha256-Msd0NzNAkoAAxZ/WNiM3xV382lnx+xT6gyQiNGDEMM8="; + }) + ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection @@ -43,7 +52,6 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ dbus-python - future gpgme magic-wormhole pygobject3 From 0c848561553459860db9622b2bc32eb819fc9636 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:29 +0200 Subject: [PATCH 0693/2279] gnome-recipes: Remove Unmaintained upstream and depends on libsoup 2 which is insecure. --- pkgs/by-name/gn/gnome-recipes/package.nix | 89 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 pkgs/by-name/gn/gnome-recipes/package.nix diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix deleted file mode 100644 index b2e7461a3b6d..000000000000 --- a/pkgs/by-name/gn/gnome-recipes/package.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - fetchpatch, - meson, - ninja, - pkg-config, - desktop-file-utils, - gettext, - itstool, - python3, - wrapGAppsHook3, - gtk3, - glib, - libsoup_2_4, - gnome-online-accounts, - librest, - json-glib, - gnome-autoar, - gspell, - libcanberra, - nix-update-script, -}: - -stdenv.mkDerivation rec { - pname = "gnome-recipes"; - version = "2.0.4"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "recipes"; - rev = version; - fetchSubmodules = true; - sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw="; - }; - - patches = [ - # gcc-14 build failure fix - (fetchpatch { - name = "gcc-14.patch"; - url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch"; - hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - desktop-file-utils - gettext - itstool - python3 - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - glib - libsoup_2_4 - gnome-online-accounts - librest - json-glib - gnome-autoar - gspell - libcanberra - ]; - - postPatch = '' - chmod +x src/list_to_c.py - patchShebangs src/list_to_c.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Recipe management application for GNOME"; - mainProgram = "gnome-recipes"; - homepage = "https://gitlab.gnome.org/GNOME/recipes"; - teams = [ teams.gnome ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec725127a893..22d7855c3478 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -660,6 +660,7 @@ mapAliases { gnatinspect = throw "'gnatinspect' has been renamed to/replaced by 'gnatPackages.gnatinspect'"; # Converted to throw 2025-10-27 gnome-firmware-updater = throw "'gnome-firmware-updater' has been renamed to/replaced by 'gnome-firmware'"; # Converted to throw 2025-10-27 gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27 + gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06 gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27 gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27 gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16 From 24b850ee40cef1a7befecd0cc3d63aece52ea252 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:21:24 +0200 Subject: [PATCH 0694/2279] maintainers/scripts/update.nix: Print stderr on instantiation failure For some reason `asyncio.create_subprocess_exec` freezes after failing previous call returns `CalledProcessError`. Perhaps because `asyncio.gather` fails and cancels the later tasks, triggering https://github.com/python/cpython/issues/103847 --- maintainers/scripts/update.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 10d197d5fe78..ca35f04d1285 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -92,7 +92,15 @@ async def attr_instantiation_worker( ) -> tuple[Path, str]: async with semaphore: eprint(f"Instantiating {attr_path}…") - return (await nix_instantiate(attr_path), attr_path) + try: + return (await nix_instantiate(attr_path), attr_path) + except Exception as e: + # Failure should normally terminate the script but + # looks like Python is buggy so we need to do it ourselves. + eprint(f"Failed to instantiate {attr_path}") + if e.stderr: + eprint(e.stderr.decode("utf-8")) + sys.exit(1) async def requisites_worker( From 1490dad3cef801f7d709479d5e755ca1fe084214 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:22:18 +0200 Subject: [PATCH 0695/2279] gssdp: Unmaintain It is long deprecated and unmaintained upstream and depends on insecure libraries. --- pkgs/development/libraries/gssdp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 111897349641..a4c669eebe9f 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; - teams = [ teams.gnome ]; platforms = platforms.all; }; } From 9cc6eebe6643b400afecb37ea7edace7e3c0643e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:35:08 +0200 Subject: [PATCH 0696/2279] libchamplain: Unmaintain Only maintain libsoup3 based version. Eval failure was breaking GNOME updates. Also change the canonical attribute path for `updateScript` to the maintained variant. --- pkgs/by-name/li/libchamplain/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix index a37ccdd95264..433c828b5182 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain/package.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libchamplain"; + attrPath = "libchamplain_libsoup3"; versionPolicy = "odd-unstable"; }; }; @@ -88,7 +89,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - teams = [ + teams = lib.optionals withLibsoup3 [ teams.gnome teams.pantheon ]; From f9a95af85f2b4334070648c3b19c1fffaecbf2fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 18:55:12 +0200 Subject: [PATCH 0697/2279] libsoup: Unmaintain It is abandoned upstream, projects should port to libsoup3. --- pkgs/development/libraries/libsoup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 7a9bb46c76d4..d8710b19efb7 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { description = "HTTP client/server library for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libsoup"; license = lib.licenses.lgpl2Plus; - inherit (glib.meta) maintainers platforms teams; + platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "libsoup-2.4" "libsoup-gnome-2.4" From 9df7c3f4fed8f4e31af466bb0e7543ce80ada7a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:10:34 +0000 Subject: [PATCH 0698/2279] =?UTF-8?q?gnome-logs:=2045.0=20=E2=86=92=2049.r?= =?UTF-8?q?c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-logs/-/compare/gnome-logs-45.0...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-logs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix index 61f978fcfcd7..0decabbe7d35 100644 --- a/pkgs/by-name/gn/gnome-logs/package.nix +++ b/pkgs/by-name/gn/gnome-logs/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "45.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz"; - hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI="; + hash = "sha256-FgqCL/N2Wgl6xFsbRSyGZajMJFQF1CH5/xZMk2q3hV4="; }; nativeBuildInputs = [ From d11e1418c93606f9683eca3a70bf5ecd74317c3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:00 +0000 Subject: [PATCH 0699/2279] =?UTF-8?q?gnome-connections:=2048.0=20=E2=86=92?= =?UTF-8?q?=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-connections/-/compare/48.0...49.rc Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-connections/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 7213e140b894..9e120fd0e682 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -17,16 +17,18 @@ libxml2, gtk-vnc, gtk-frdp, + spice-gtk, + spice-protocol, gnome, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-connections"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz"; - hash = "sha256-Nw75QFBrVybG8rfLl5ayI9HW1Chfg8/DOFvWdMMon9A="; + hash = "sha256-Y+lApq2dV+K/vIJo0IHglrKWajGrzhAS86+S8HcrJwM="; }; nativeBuildInputs = [ @@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: { libsecret libxml2 gtk-frdp + spice-gtk + spice-protocol ]; passthru = { From d6bc2505a19849988235e90924fa0510f8371ef9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:13 +0000 Subject: [PATCH 0700/2279] =?UTF-8?q?xdg-desktop-portal-gnome:=2048.0=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/48.0...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix index 9fa4feeef447..1a28e7908b34 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-zRWsouE2TaMI6zeWu4rkpXfmDKT+EgBrMVIyz9GciGE="; + hash = "sha256-JgB422chatw3I3g2lvrtq6hxkVgdgLT0BfYkrwFqTa4="; }; nativeBuildInputs = [ From d36247889881fbdf26f2c66146478a741b43a88b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:15 +0000 Subject: [PATCH 0701/2279] =?UTF-8?q?gnome-chess:=2048.0=20=E2=86=92=2049.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/48.0...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-chess/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index 9c0fb5f950bd..d23311b60968 100644 --- a/pkgs/by-name/gn/gnome-chess/package.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "48.0"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; - hash = "sha256-eDTEdvCLvyd5BrApNjLtMugDdMuUQyayGeqQVqapXz8="; + hash = "sha256-QDST8Bbpkn1/nFR3O7ydCpNB8+751DF7Re3AqwoiyI8="; }; nativeBuildInputs = [ From e502d79045f5be2ab93b967088a03198c4866ae2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:18 +0000 Subject: [PATCH 0702/2279] =?UTF-8?q?gnome-sudoku:=2048.1=20=E2=86=92=2049?= =?UTF-8?q?.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/48.1...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-sudoku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index d2fa96c74b52..b3614dede995 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-eXE62CpZkEzWlv8CJV627ZNk6I8+eDNDsfnQygnyx+M="; + hash = "sha256-geldehr6Fdc4Bc6wgeSgnC4Qn993B2+Di8gamziMXus="; }; nativeBuildInputs = [ From 11cc0e54fc4e61206c6ab8b2eac94ff02c86dc7a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:34 +0000 Subject: [PATCH 0703/2279] =?UTF-8?q?ghex:=2048.0=20=E2=86=92=2048.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/48.0...48.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gh/ghex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index a92b7a771e5b..e1aeacd674dc 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghex"; - version = "48.0"; + version = "48.1"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz"; - hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg="; + hash = "sha256-T+q4r5Z+J2Pyi8d6Tdz1SjZ6odhUlv7wUBmGvYA9ifI="; }; nativeBuildInputs = [ From 6d8e84900baf2affd06a2071c623ce1aa1f5e7a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:36 +0000 Subject: [PATCH 0704/2279] =?UTF-8?q?quadrapassel:=2040.2=20=E2=86=92=2049?= =?UTF-8?q?.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/quadrapassel/-/compare/40.2...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/qu/quadrapassel/package.nix | 45 +++++++++++------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 0efef1f7a502..04952a443542 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -3,71 +3,68 @@ lib, fetchurl, pkg-config, - gtk3, + gtk4, + libadwaita, + libgee, + pango, gnome, - adwaita-icon-theme, gdk-pixbuf, librsvg, gsound, libmanette, - gettext, itstool, - libxml2, - clutter, - clutter-gtk, - wrapGAppsHook3, + blueprint-compiler, + wrapGAppsHook4, meson, ninja, - python3, vala, desktop-file-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "40.2"; + version = "49.rc"; src = fetchurl { - url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz"; - hash = "sha256-C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; + url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; + hash = "sha256-Mr71UXopmxkapqwi0XMDJZBhN15MYyadMpwOVt7bEP4="; }; nativeBuildInputs = [ meson ninja - python3 vala desktop-file-utils pkg-config - adwaita-icon-theme - libxml2 itstool - gettext - wrapGAppsHook3 + blueprint-compiler + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + gtk4 + libadwaita + libgee + pango gdk-pixbuf librsvg libmanette gsound - clutter - libxml2 - clutter-gtk ]; passthru = { - updateScript = gnome.updateScript { packageName = "quadrapassel"; }; + updateScript = gnome.updateScript { + packageName = "quadrapassel"; + }; }; meta = { description = "Classic falling-block game, Tetris"; mainProgram = "quadrapassel"; homepage = "https://gitlab.gnome.org/GNOME/quadrapassel"; - changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) From f4b7184d544a8697cefa958e3870d4c0feba8c14 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:08 +0000 Subject: [PATCH 0705/2279] =?UTF-8?q?gnome-mahjongg:=2048.1=20=E2=86=92=20?= =?UTF-8?q?49.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/compare/48.1...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-mahjongg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix index ddc8b0315e7f..6fb601fa5638 100644 --- a/pkgs/by-name/gn/gnome-mahjongg/package.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-mahjongg"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major finalAttrs.version}/gnome-mahjongg-${finalAttrs.version}.tar.xz"; - hash = "sha256-3Ujg+BrKNL6tpGxdIhsyWRuO2B6dNhw6JY359rIiLIQ="; + hash = "sha256-Cv9a/PLHefyp51aXs7A4GWUdlCXLBsM6LMuMkurF5uA="; }; nativeBuildInputs = [ From 05d83c88cbbfec13b48fe41ec9e6030c17226b24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:21 +0000 Subject: [PATCH 0706/2279] =?UTF-8?q?gnome-font-viewer:=2048.0=20=E2=86=92?= =?UTF-8?q?=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/48.0...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-font-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 067bc0f82fdf..fa5d03913518 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; - hash = "sha256-cyYkIxtiT/XHrAOoznG+Ejk9qlNVHRFVCyDXsKOocqc="; + hash = "sha256-G5UajKOMXX4UHb5kL2NRikmaJgmoEIcq4QV1m9RUCdA="; }; doCheck = true; From d09057f5693c3074e4bb563ac1de13e4620cfec1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:24 +0000 Subject: [PATCH 0707/2279] =?UTF-8?q?gnome-mines:=2048.1=20=E2=86=92=2049.?= =?UTF-8?q?rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-mines/-/compare/48.1...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-mines/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix index 4ffe50195382..061b71374b7b 100644 --- a/pkgs/by-name/gn/gnome-mines/package.nix +++ b/pkgs/by-name/gn/gnome-mines/package.nix @@ -14,18 +14,17 @@ gettext, itstool, libxml2, - libgnome-games-support_2_0, libgee, desktop-file-utils, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-mines"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz"; - hash = "sha256-70stLd477GFBV+3eTZGJzGr+aSlSot1VsocOLmLtgQQ="; + hash = "sha256-mPDYj+F1MyIgEATYYRnHVZXZO6mcNYLDgoO5rw+CdKg="; }; nativeBuildInputs = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita - libgnome-games-support_2_0 librsvg libgee ]; From 2a906dc069c10945323bcf98982f8191e695d810 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:32 +0000 Subject: [PATCH 0708/2279] =?UTF-8?q?gnome-software:=2048.4=20=E2=86=92=20?= =?UTF-8?q?49.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/48.4...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-software/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index a82d9f541d8e..fcc05a6db6f7 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "48.4"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-nNEwvGLNCLY6Ii6yZmG8xxfnXVjuGzwYgMTRt2zNJjs="; + hash = "sha256-8dCgESrFUhKMR6etrMXhf0/KgEFmfgY4yVgjwKKFOLM="; }; patches = [ From 1dc9899c50cdf0c4698c9c4d4a6d4afa4a21eb56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:42 +0000 Subject: [PATCH 0709/2279] =?UTF-8?q?dconf-editor:=2045.0.1=20=E2=86=92=20?= =?UTF-8?q?49.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/45.0.1...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/dc/dconf-editor/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 49eb2b4f121c..067c231fff0e 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, desktop-file-utils, meson, ninja, @@ -23,20 +22,14 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "45.0.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; - hash = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0="; + hash = "sha256-IvI9WgT0+/3gq3nWlhrprFURX+ttoXgl/4y0tr0rbnU="; }; patches = [ - # Fix crash with GSETTINGS_SCHEMA_DIR env var. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch"; - hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ="; - }) - # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR # environment variable, to match what we patched GLib to do. ./schema-override-variable.patch From 0c5e26dbb8ecd6d9324d19b13d572eb76abd532f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:43 +0000 Subject: [PATCH 0710/2279] =?UTF-8?q?simple-scan:=2048.1=20=E2=86=92=2049.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/simple-scan/-/compare/48.1...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/si/simple-scan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index da3d143821fd..c5cde96f74e9 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "48.1"; + version = "49.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "simple-scan"; tag = version; - hash = "sha256-Y+uVAW0jpXJgadP6CjG8zeLgikFY2Pm0z4TZoyYK4+g="; + hash = "sha256-CZNbw6Ve91bhF5ItsJYOhyUy4CsimXrTLIQBRDhnzFU="; }; nativeBuildInputs = [ From 8fa1c6d44d0705fb7b84a313e0fe2542baf76e0b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:46 +0000 Subject: [PATCH 0711/2279] =?UTF-8?q?gnome-session:=2048.0=20=E2=86=92=204?= =?UTF-8?q?9.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X11 support now disabled by default. https://gitlab.gnome.org/GNOME/gnome-session/-/compare/48.0...49.rc Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-session/fix-paths.patch | 35 ------------------ .../nixos_set_environment_done.patch | 14 +++++++ pkgs/by-name/gn/gnome-session/package.nix | 37 ++++++++----------- 3 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 pkgs/by-name/gn/gnome-session/fix-paths.patch create mode 100644 pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch diff --git a/pkgs/by-name/gn/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch deleted file mode 100644 index 22f06ddfd2e8..000000000000 --- a/pkgs/by-name/gn/gnome-session/fix-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index b4b1f8fa..99d52cba 100755 ---- a/gnome-session/gnome-session.in -+++ b/gnome-session/gnome-session.in -@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && - [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && - [ -n "$SHELL" ]; then - if [ "$1" != '-l' ]; then -- exec bash -c "exec -l '$SHELL' -c 'exec $0 -l $*'" -+ # Make sure the shell actually sets up the environment. -+ unset __NIXOS_SET_ENVIRONMENT_DONE -+ exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'" - else - shift - fi - fi - --SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region) -+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region) - REGION=${SETTING#\'} - REGION=${REGION%\'} - -diff --git a/gnome-session/main.c b/gnome-session/main.c -index a460a849..9d07898f 100644 ---- a/gnome-session/main.c -+++ b/gnome-session/main.c -@@ -215,7 +215,7 @@ require_dbus_session (int argc, - } - new_argv[i + 2] = NULL; - -- if (!execvp ("dbus-launch", new_argv)) { -+ if (!execvp ("@dbusLaunch@", new_argv)) { - g_set_error (error, - G_SPAWN_ERROR, - G_SPAWN_ERROR_FAILED, diff --git a/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch new file mode 100644 index 000000000000..50101ca681c1 --- /dev/null +++ b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch @@ -0,0 +1,14 @@ +diff --git a/gnome-session/leader-main.c b/gnome-session/leader-main.c +index 511166d6..8bac2912 100644 +--- a/gnome-session/leader-main.c ++++ b/gnome-session/leader-main.c +@@ -92,6 +92,9 @@ maybe_reexec_with_login_shell (GStrv argv) + + g_debug ("Relaunching with login shell %s (%s)", login_shell, shell); + ++ /* Make sure the shell actually sets up the environment */ ++ g_unsetenv ("__NIXOS_SET_ENVIRONMENT_DONE"); ++ + /* First, we construct the command executed by the login shell */ + builder = g_strv_builder_new (); + g_strv_builder_add (builder, "exec"); diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index d60b3ca2d110..4823b4cc4b8b 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -7,9 +7,10 @@ ninja, pkg-config, gnome, + gobject-introspection, adwaita-icon-theme, glib, - gtk3, + gtk4, gsettings-desktop-schemas, gnome-desktop, gnome-settings-daemon, @@ -19,22 +20,21 @@ libICE, xmlto, docbook_xsl, - docbook_xml_dtd_412, + docbook_xml_dtd_45, python3, libxslt, gettext, - makeWrapper, systemd, xorg, libepoxy, - bash, gnome-session-ctl, + wrapGAppsHook4, }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "48.0"; + version = "49.rc"; outputs = [ "out" @@ -43,34 +43,32 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc="; + hash = "sha256-xr7cRcosGWvLsSV5rgazg2o+7U2E4DxSIEN2Qc5f+Ic="; }; patches = [ - (replaceVars ./fix-paths.patch { - gsettings = "${glib.bin}/bin/gsettings"; - dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - bash = "${bash}/bin/bash"; - }) + # https://github.com/NixOS/nixpkgs/pull/48517 + ./nixos_set_environment_done.patch ]; nativeBuildInputs = [ + gobject-introspection.setupHook meson ninja pkg-config gettext - makeWrapper xmlto libxslt docbook_xsl - docbook_xml_dtd_412 + docbook_xml_dtd_45 python3 dbus # for DTD + wrapGAppsHook4 ]; buildInputs = [ glib - gtk3 + gtk4 libICE gnome-desktop json-glib @@ -107,15 +105,11 @@ stdenv.mkDerivation (finalAttrs: { rm -rf $out/libexec/gnome-session-ctl ''; - # `bin/gnome-session` will reset the environment when run in wayland, we - # therefor wrap `libexec/gnome-session-binary` instead which is the actual - # binary needing wrapping preFixup = '' - wrapProgram "$out/libexec/gnome-session-binary" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \ + gappsWrapperArgs+=( + --suffix XDG_DATA_DIRS : "${gnome-shell}/share" --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" + ) ''; separateDebugInfo = true; @@ -126,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: { }; providedSessions = [ "gnome" - "gnome-xorg" ]; }; From c99ac71470bf75c75298e33fc23dba8a5f5e6356 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:10:24 +0000 Subject: [PATCH 0712/2279] =?UTF-8?q?gnome-initial-setup:=2048.1=20?= =?UTF-8?q?=E2=86=92=2049.beta.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/48.1...49.beta.1 Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch | 9 --------- pkgs/by-name/gn/gnome-initial-setup/package.nix | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch index f3cd9f6f0427..f429b4830144 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch +++ b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch @@ -25,15 +25,6 @@ index 196abf6..613d0e5 100644 g_spawn_command_line_async (commandline, NULL); g_free (commandline); -@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass) - g_param_spec_string ("showing-extra", "", "", "", - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - -- signals[CHANGED] = -+ signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST, diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h index a2376f8..5cb7bc9 100644 --- a/gnome-initial-setup/pages/timezone/tz.h diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index bc0f06ce9ef8..2da96c9dd740 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-initial-setup"; - version = "48.1"; + version = "49.beta.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-s9q/fnm2Zf8SJB+9umFUiVE9iGIkdZmGr49IZXWSMV4="; + hash = "sha256-XfzEnnXQHV243xLRV7c8IE5ppsJ+agDjtUxyzD9lMmc="; }; patches = [ From b2bad07144f7efc01d3b06724d98bf5257cd8ba8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:50 +0000 Subject: [PATCH 0713/2279] =?UTF-8?q?metacity:=203.56.0=20=E2=86=92=203.57?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/metacity/-/compare/3.56.0...3.57.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/me/metacity/package.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index f1406de7b9cc..63441282bb52 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -13,26 +13,18 @@ libstartup_notification, libxml2, pkg-config, - replaceVars, wrapGAppsHook3, - zenity, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "metacity"; - version = "3.56.0"; + version = "3.57.1"; src = fetchurl { - url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz"; - hash = "sha256-dVSZcQSyb/DnmgKzeiuhib3058zVQibw+vSxpZAGyQE="; + url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor finalAttrs.version}/metacity-${finalAttrs.version}.tar.xz"; + hash = "sha256-EpOibk3t/UvyALW7eIZzAIl5rjrG0wU/fbSBuHrMfN4="; }; - patches = [ - (replaceVars ./fix-paths.patch { - inherit zenity; - }) - ]; - nativeBuildInputs = [ gettext libxml2 @@ -44,13 +36,13 @@ stdenv.mkDerivation rec { xorg.libXres xorg.libXpresent xorg.libXdamage + xorg.libX11 glib gsettings-desktop-schemas gtk3 libcanberra-gtk3 libgtop libstartup_notification - zenity ]; enableParallelBuilding = true; @@ -67,9 +59,9 @@ stdenv.mkDerivation rec { meta = { description = "Window manager used in Gnome Flashback"; homepage = "https://gitlab.gnome.org/GNOME/metacity"; - changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.gpl2; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; }; -} +}) From 2f83aaf8edaf72041c201f480d5590b101d180b8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:56 +0000 Subject: [PATCH 0714/2279] =?UTF-8?q?gnome-system-monitor:=2048.1=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/48.1...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-system-monitor/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index fa8aae787c36..6c916060a014 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -5,7 +5,6 @@ fetchurl, pkg-config, gtkmm4, - libxml2, bash, catch2_3, gtk4, @@ -26,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-system-monitor"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ezw6bihjZuZZ/S2AWCQJp71e2uRW5jxPacz2btb8Zjg="; + hash = "sha256-1bYnt/NM+OSCCmx9rKWtIy3HxOQMLBU/KHa0NWO75zA="; }; patches = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita glib - libxml2 gtkmm4 libgtop gdk-pixbuf @@ -64,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: { systemd ]; + mesonFlags = [ + # :(.text.startup+0x56): undefined reference to `GsmApplication::get()' + "-Db_lto=false" + ]; + doCheck = true; passthru = { From 6c262db7994da28e00d5c516dbf25a0637928964 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:04 +0000 Subject: [PATCH 0715/2279] =?UTF-8?q?gnome-maps:=2048.6=20=E2=86=92=2049.r?= =?UTF-8?q?c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/48.6...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-maps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index a4cf70cbdf19..10da5d27fb00 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "48.6"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-OtqaMVUXWlGdQV8Ll9D+129PS+uLYCEqAXaXoyy+gaY="; + hash = "sha256-J9sX7hVDZkGdrXhUVjMptZNaDFhaPuRyZXdnjkN1qHM="; }; doCheck = !stdenv.hostPlatform.isDarwin; From 1ff5c18e24d4323d5b06af251b885c1310bdb6a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:07 +0000 Subject: [PATCH 0716/2279] =?UTF-8?q?gnome-calculator:=2048.1=20=E2=86=92?= =?UTF-8?q?=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/48.1...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-calculator/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index f0e5454cd4dc..2c9a96e7199d 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -2,6 +2,7 @@ stdenv, lib, appstream, + blueprint-compiler, meson, ninja, vala, @@ -26,15 +27,16 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; - hash = "sha256-vEvUGpuhkPRcvuDYxnUs3F0osM7xxr0MAeLa4fPBkWI="; + hash = "sha256-C6zLYVCfc/Kp+MiUUNzywyAdcvXWjWk77lGZRdgeo4A="; }; nativeBuildInputs = [ appstream + blueprint-compiler meson ninja pkg-config From 5a13683af3ad6be67582941314d90548ab038c5d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:10 +0000 Subject: [PATCH 0717/2279] =?UTF-8?q?gnome-nibbles:=204.2.2=20=E2=86=92=20?= =?UTF-8?q?4.4.rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-nibbles/-/compare/4.2.2...4.4.rc2 Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-nibbles/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index b82651f75462..4b03ef123bf7 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -14,7 +14,6 @@ libxml2, libadwaita, libgee, - libgnome-games-support_2_0, meson, ninja, desktop-file-utils, @@ -22,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.2.2"; + version = "4.4.rc2"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-Pkofm68cV7joNd7fCGnjJy5lNKHdacTib64QxCAKrwA="; + hash = "sha256-WPPpaRsSZAiR/ORYtl1GpEXaLrhcctwTeXLDKviPg7Q="; }; nativeBuildInputs = [ @@ -47,16 +46,8 @@ stdenv.mkDerivation (finalAttrs: { librsvg libadwaita libgee - libgnome-games-support_2_0 ]; - # The "we can link with libadwaita?" valac.links() check fails otherwise. - # Command line: `valac testfile.vala --pkg=libadwaita-1 --Xcc=-w --Xcc=-DVALA_STRICT_C` -> 1 - # testfile.vala.c:50:46: error: passing argument 2 of 'adw_about_dialog_set_developers' - # from incompatible pointer type [-Wincompatible-pointer-types] - # 50 | adw_about_dialog_set_developers (ad, s); - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-nibbles"; }; }; From edcd5f8af80fd6c9c9c378bc57b321a767672d43 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:43 +0000 Subject: [PATCH 0718/2279] =?UTF-8?q?gnome-weather:=2048.0=20=E2=86=92=204?= =?UTF-8?q?9.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/48.0...49.rc Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-weather/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix index aecb98b3d246..28cda25d8406 100644 --- a/pkgs/by-name/gn/gnome-weather/package.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -17,15 +17,16 @@ geoclue2, python3, gsettings-desktop-schemas, + typescript, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-weather"; - version = "48.0"; + version = "49.rc"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz"; - hash = "sha256-TAVps9gVri+UFtRxNMvTBWNAZA/xhtMalMhlgTtL27U="; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz"; + hash = "sha256-gFwVmU12o1ap5+95AgCNnM2vNsqmpxD5PwuQWLHlgaw="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { python3 gobject-introspection gjs + typescript ]; buildInputs = [ @@ -62,7 +64,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { packageName = "gnome-weather"; }; + updateScript = gnome.updateScript { + packageName = "gnome-weather"; + }; }; meta = with lib; { @@ -73,4 +77,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; }; -} +}) From 3a8591fadc9d7c63bf268bcedfc88d5c37e47315 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:44 +0000 Subject: [PATCH 0719/2279] =?UTF-8?q?gnome-music:=2048.1=20=E2=86=92=2049.?= =?UTF-8?q?rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/48.1...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-music/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 50cb9d4058a7..89921c9ee44d 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "48.1"; + version = "49.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; - hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4="; + hash = "sha256-Zy77vtztuK8rTrDPpUxIzNmyhldbq9ull03kBT3A/Sc="; }; nativeBuildInputs = [ From e8650ebbef79194aafa3acacfd71b0d72aaef29f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:45 +0000 Subject: [PATCH 0720/2279] =?UTF-8?q?gnome-characters:=2048.0=20=E2=86=92?= =?UTF-8?q?=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/48.0...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-characters/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index 73d26f0c44cc..e1ed63613791 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; - hash = "sha256-osMspU2RHbJARCA1DTRC5pGi3Oiw9dAImfZs/4w8jXE="; + hash = "sha256-hPOWE1KkI0DlZ4oQig8D6Fs7YQRA5dVCL8WNucKPwEM="; }; nativeBuildInputs = [ From 8077c2f3bc6541c4e6ce4a18fab17ef4c14229fe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:48 +0000 Subject: [PATCH 0721/2279] =?UTF-8?q?gnome-console:=2048.0.1=20=E2=86=92?= =?UTF-8?q?=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/48.0.1...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-console/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index ead44457a72e..54c1887035a9 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + appstream, gettext, gnome, libgtop, @@ -20,14 +21,15 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "48.0.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-AY6Qjk2uvPyxUNTxuyjZgnKqnRTWgV6vjaRfiJ2wXEk="; + hash = "sha256-+TP+13m/fP2HPZ93NfZwSdXyEhWlRGiMGuO+ULGQZsk="; }; nativeBuildInputs = [ + appstream desktop-file-utils gettext meson From c129840e65183b3376987b3bc8ab716f799e81cf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:00 +0000 Subject: [PATCH 0722/2279] =?UTF-8?q?gnome-tweaks:=2046.1=20=E2=86=92=2049?= =?UTF-8?q?.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tweaks/-/compare/46.1...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-tweaks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 7bdf8bcf9f2a..fc9b15f063aa 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "46.1"; + version = "49.rc"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-LxkqcIX71oQ+z4JXFtnaIeyScgKRSeo18+FZ4Kwwm4A="; + hash = "sha256-NON85In7878A8EIlO2wDW1/K5ZyVuOVSuKBgT+TpKfQ="; }; nativeBuildInputs = [ @@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-tweaks"; }; }; From fbd0a3e16056df829f526e2a1f251343f2b74d6a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:05 +0000 Subject: [PATCH 0723/2279] =?UTF-8?q?orca:=2048.6=20=E2=86=92=2049.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/48.6...49.beta Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- nixos/modules/services/accessibility/orca.nix | 1 + pkgs/by-name/or/orca/fix-paths.patch | 26 +++++++++---------- pkgs/by-name/or/orca/package.nix | 5 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index 3fe205498bfe..8f6420ab1f92 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -20,6 +20,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; systemd.services.display-manager = lib.mkIf config.services.displayManager.enable { path = [ cfg.package ]; }; diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 49b5cc34ac89..49142eed47d9 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -1,18 +1,18 @@ diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py -index 60c172f78..e8dadf76d 100644 +index dbaca2e48..80f2640d4 100644 --- a/src/orca/ax_utilities_application.py +++ b/src/orca/ax_utilities_application.py -@@ -189,7 +189,7 @@ class AXUtilitiesApplication: +@@ -188,7 +188,7 @@ class AXUtilitiesApplication: pid = AXUtilitiesApplication.get_process_id(app) try: - state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State") + state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State") state = state.split()[1] - except Exception as error: + except (GLib.GError, IndexError) as error: tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"] diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py -index 740f1a690..85f74d2dc 100644 +index b4abce719..cff5a78a6 100644 --- a/src/orca/debugging_tools_manager.py +++ b/src/orca/debugging_tools_manager.py @@ -243,7 +243,7 @@ class DebuggingToolsManager: @@ -21,22 +21,22 @@ index 740f1a690..85f74d2dc 100644 try: - cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline") + cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline") - except Exception as error: + except subprocess.SubprocessError as error: cmdline = f"EXCEPTION: {error}" else: diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index 6cb4c7772..903b344f0 100755 +index 3fc845dc3..a82947911 100755 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -186,7 +186,7 @@ def inGraphicalDesktop(): - def otherOrcas(): +@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool: + def other_orcas() -> list[int]: """Returns the pid of any other instances of Orca owned by this user.""" -- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), - shell=True, - stdout=subprocess.PIPE).stdout - pids = openFile.read() +- with subprocess.Popen(f"pgrep -u {os.getuid()} -x orca", ++ with subprocess.Popen(f"@pgrep@ -u {os.getuid()} -x orca", + shell=True, + stdout=subprocess.PIPE) as proc: + pids = proc.stdout.read() if proc.stdout else b"" diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py index 3407be009..452297a3f 100644 --- a/src/orca/orca_modifier_manager.py diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 34a51734082a..850e9e846637 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "48.6"; + version = "49.beta"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-7cUDRODf1yR2tcFLOqclyiaHGOpt2JvE7ib0ULM51pY="; + hash = "sha256-uS+iewqn7yqZYRo6SWLfIXToV/3MKrH8mHTHX3BSPw8="; }; patches = [ @@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonPath = with python3.pkgs; [ + dasbus pygobject3 dbus-python pyxdg From 2b5028e89dfae670639fc11afcd07ad9450d31f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:13 +0000 Subject: [PATCH 0724/2279] =?UTF-8?q?gnome-contacts:=2048.0=20=E2=86=92=20?= =?UTF-8?q?49.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/48.0...49.beta Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-contacts/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index 6addc8e84af3..2e5347038a74 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -3,6 +3,7 @@ stdenv, gettext, fetchurl, + blueprint-compiler, evolution-data-server-gtk4, pkg-config, libxslt, @@ -29,14 +30,15 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "48.0"; + version = "49.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; - hash = "sha256-onYplbWUJ+w/GF8otVlONwd7cqcM18GSF+1jRjfswbU="; + hash = "sha256-miIJ8lAH3GpJ2IbcFkCJhgjynaWY1SOgC0zfjbP5dNY="; }; nativeBuildInputs = [ + blueprint-compiler meson ninja pkg-config From 8061cdd1467f916040e1f831d76f54fa79df9cfb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:14 +0000 Subject: [PATCH 0725/2279] =?UTF-8?q?yelp:=2042.3=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/42.3...49.rc Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/ye/yelp/package.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix index ca376a4359f5..4e87d6b382fc 100644 --- a/pkgs/by-name/ye/yelp/package.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -2,20 +2,21 @@ stdenv, lib, fetchurl, + desktop-file-utils, gettext, itstool, meson, ninja, pkg-config, - wrapGAppsHook3, + wrapGAppsHook4, bzip2, glib, - gtk3, - libhandy, + gtk4, + libadwaita, libxml2, libxslt, sqlite, - webkitgtk_4_1, + webkitgtk_6_0, xz, yelp-xsl, gnome, @@ -23,31 +24,32 @@ stdenv.mkDerivation (finalAttrs: { pname = "yelp"; - version = "42.3"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz"; - hash = "sha256-JszEImeanmp6OqCD2Q/Ns0f18jAL4+AUMaMNDN0qiaM="; + hash = "sha256-C0j4gV1tYn4oR0hooW4SLEqNjoi8IP++yEJ2bFqQYsg="; }; nativeBuildInputs = [ + desktop-file-utils gettext itstool meson ninja pkg-config - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ bzip2 glib - gtk3 - libhandy + gtk4 + libadwaita libxml2 libxslt sqlite - webkitgtk_4_1 + webkitgtk_6_0 xz yelp-xsl ]; From 2d4ade3e0f5861cae159d30f66157417d6f336a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:21 +0000 Subject: [PATCH 0726/2279] =?UTF-8?q?gnome-boxes:=2048.0=20=E2=86=92=2049.?= =?UTF-8?q?rc.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/48.0...49.rc.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-boxes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index a5bc86e04ea0..1ab7e42b5733 100644 --- a/pkgs/by-name/gn/gnome-boxes/package.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "48.0"; + version = "49.rc.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; - hash = "sha256-0F9fQlaPr79tiHcRYbBu1fc51DEhJ41BjK6VxW5RPq0="; + hash = "sha256-/cqOCR8CtSC+R7Y7kVhFV/GCWWb2jjnqTqsl6FxET8U="; }; patches = [ From 5314d696a077a830c7937fd6677bc9ac14ad6c81 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:26 +0000 Subject: [PATCH 0727/2279] =?UTF-8?q?gnome-text-editor:=2048.3=20=E2=86=92?= =?UTF-8?q?=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/48.3...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-text-editor/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 753f4b247b07..064ffc44ec94 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -12,7 +12,6 @@ wrapGAppsHook4, ninja, gnome, - cairo, icu, itstool, libadwaita, @@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "48.3"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro="; + hash = "sha256-WpKly7oFXBLj2pV/FxIjvmibaoDnglcBSEc582Q0tDE="; }; nativeBuildInputs = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cairo icu glib gsettings-desktop-schemas From 9d52ff238900cda3366d14966edbd4e09c828d4b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:14:47 +0000 Subject: [PATCH 0728/2279] =?UTF-8?q?gnome-calendar:=2048.1=20=E2=86=92=20?= =?UTF-8?q?49.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/48.1...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/gn/gnome-calendar/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index b457a6c1b67d..c071e94830cc 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + blueprint-compiler, meson, ninja, pkg-config, @@ -22,14 +23,15 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; - hash = "sha256-Bs6t1cAL6ONYGB1CHs8mgs4K6i/LEtkDsw0pyjMonwI="; + hash = "sha256-gOLNpazuDytcfiFmY0+1nv5zTtmD375cU/AbEIiAHzI="; }; nativeBuildInputs = [ + blueprint-compiler meson ninja pkg-config From 0271b6284b858f161b54909fc32db720dae8264d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:03 +0000 Subject: [PATCH 0729/2279] =?UTF-8?q?gnome-backgrounds:=2048.2.1=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/48.2.1...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-backgrounds/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 849131c3ee53..46aff72db6c6 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "48.2.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; - hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk="; + hash = "sha256-UkrZIO0U1sQs9h7LcyLg+RMoMMy5+F0jgGjzntIewaA="; }; patches = [ From 26d77b2df8f8ca5fafd89c9540de018c11c86b86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:05 +0000 Subject: [PATCH 0730/2279] =?UTF-8?q?adwaita-fonts:=2048.2=20=E2=86=92=204?= =?UTF-8?q?9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-fonts/-/compare/48.2...49.0 Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- pkgs/by-name/ad/adwaita-fonts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix index b47d77a85334..1512f1b9ba5f 100644 --- a/pkgs/by-name/ad/adwaita-fonts/package.nix +++ b/pkgs/by-name/ad/adwaita-fonts/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "adwaita-fonts"; - version = "48.2"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz"; - hash = "sha256-FW9+kvL4LlJ/xzwwnbsjfApKXDqVvF7pSl77aUfFU+A="; + hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter"; homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.ofl; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.qxrein ]; teams = [ lib.teams.gnome ]; From 2afe167af5fc046593fa6c32758c329591b8fd7f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:19 +0000 Subject: [PATCH 0731/2279] =?UTF-8?q?gtk-frdp:=200-unstable-2025-03-14=20?= =?UTF-8?q?=E2=86=92=200-unstable-2025-08-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk-frdp/-/compare/a0187fa02e1ff249e9583e8c09a2c2f5915ce2a3...b59dc88624511311576dca607d3cb9317569de34 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gt/gtk-frdp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix index 9196214e4616..1a4c228b398d 100644 --- a/pkgs/by-name/gt/gtk-frdp/package.nix +++ b/pkgs/by-name/gt/gtk-frdp/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation { pname = "gtk-frdp"; - version = "0-unstable-2025-03-14"; + version = "0-unstable-2025-08-15"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gtk-frdp"; - rev = "a0187fa02e1ff249e9583e8c09a2c2f5915ce2a3"; - hash = "sha256-oi4Iwi9/elfUDKK0IhoNgtS8ORIzVUBagqBVdNRxGjI="; + rev = "b59dc88624511311576dca607d3cb9317569de34"; + hash = "sha256-6zCaegBshOLQWeHtUYOaofbUVK797vyn5bdpwHD0Z/s="; }; nativeBuildInputs = [ From dd229d70a24da826ec3e0611a072bd610a9ca092 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:31 +0000 Subject: [PATCH 0732/2279] =?UTF-8?q?libpeas2:=202.0.7=20=E2=86=92=202.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpeas/-/compare/2.0.7...2.1.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/libpeas/2.x.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index 5ea842c86ce1..c34508bf8080 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -15,7 +15,7 @@ glib, lua5_1, python3, - spidermonkey_128, + spidermonkey_140, gnome, }: @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.7"; + version = "2.1.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-HpqdaXYdIQnv9bfBHYyWtIZ8z6yiuSHt7UlAEZJ2nsk="; + hash = "sha256-DcWB9P4pdU+xFK3G9GoEIyAMER4IweWtCHGeVcQY3pc="; }; patches = [ @@ -65,12 +65,12 @@ stdenv.mkDerivation rec { luaEnv python3 python3.pkgs.pygobject3 - spidermonkey_128 + spidermonkey_140 ]; propagatedBuildInputs = [ # Required by libpeas-2.pc - gobject-introspection + glib ]; mesonFlags = [ From 18d54daf2f3826260394122017f64803346fcc86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:32 +0000 Subject: [PATCH 0733/2279] =?UTF-8?q?template-glib:=203.36.3=20=E2=86=92?= =?UTF-8?q?=203.37.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/template-glib/-/compare/3.36.3...3.37.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/te/template-glib/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix index e4a1a4034d25..78181dd9347a 100644 --- a/pkgs/by-name/te/template-glib/package.nix +++ b/pkgs/by-name/te/template-glib/package.nix @@ -13,13 +13,13 @@ gettext, gnome, gtk-doc, - docbook_xsl, + docbook-xsl-nons, docbook_xml_dtd_43, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "template-glib"; - version = "3.36.3"; + version = "3.37.1"; outputs = [ "out" @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor version}/template-glib-${version}.tar.xz"; - hash = "sha256-1SizWyz5Dgfa5Q4l4S+62w6wSPV/1RUc+fbpjM4d8g4="; + url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz"; + hash = "sha256-16xEMdWUe6KSCGx+R7iK6Kzb7A+PjTiyvbiIoL3MBhw="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { vala glib gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; @@ -71,4 +71,4 @@ stdenv.mkDerivation rec { teams = [ teams.gnome ]; platforms = platforms.unix; }; -} +}) From a2a804aaba72eb74ffcd762190a351183c72115d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Sep 2025 21:09:09 +0000 Subject: [PATCH 0734/2279] =?UTF-8?q?libglycin:=201.2.3=20=E2=86=92=202.0.?= =?UTF-8?q?rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New ABI version. https://gitlab.gnome.org/GNOME/glycin/-/compare/1.2.3...2.0.rc Keep the old patch for programs that still depend on glycin 2.0 crate. Co-authored-by: Bobby Rong --- .../li/libglycin/fix-glycin-3-paths.patch | 13 ++++++++++ pkgs/by-name/li/libglycin/package.nix | 24 +++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch diff --git a/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch new file mode 100644 index 000000000000..35b22f06fa36 --- /dev/null +++ b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs +index 90cd5f6..17a6469 100644 +--- a/vendor/glycin/src/sandbox.rs ++++ b/vendor/glycin/src/sandbox.rs +@@ -251,7 +251,7 @@ impl Sandbox { + } + + async fn bwrap_command(&self, seccomp_memfd: &Memfd) -> Result { +- let mut command = Command::new("bwrap"); ++ let mut command = Command::new("@bwrap@"); + + command.args([ + "--unshare-all", diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 74f78c18fa7a..490421355192 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -7,13 +7,14 @@ pkg-config, rustc, cargo, + python3, rustPlatform, vala, gi-docgen, + gobject-introspection, libseccomp, lcms2, gtk4, - gobject-introspection, gnome, replaceVars, bubblewrap, @@ -26,14 +27,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "1.2.3"; + version = "2.0.rc"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "glycin"; tag = finalAttrs.version; - hash = "sha256-O7Z7kzC0BU7FAF1UZC6LbXVIXPDertsAUNYwHAjkzPI="; + hash = "sha256-eFWHYDWaC8kMYeJZZcoUYyF/TvEqY2iVyjvfMVSRQvA="; }; nativeBuildInputs = [ @@ -42,24 +43,25 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustc cargo + python3 rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ vala gi-docgen + gobject-introspection ]; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-g2tsQ6q+sUxn3itu3IgZ5EGtDorPzhaO5B1hlEW5xzs="; + hash = "sha256-i7vuLpAzDp9mPTb3XwiZq70T744m/VVp5he7Cgf1leY="; }; buildInputs = [ libseccomp lcms2 gtk4 - ] - ++ lib.optionals withIntrospection [ gobject-introspection ]; + ]; propagatedBuildInputs = [ libseccomp @@ -68,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "glycin-loaders" false) + (lib.mesonBool "glycin-thumbnailer" false) (lib.mesonBool "libglycin" true) (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "vapi" withIntrospection) @@ -75,7 +78,10 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - patch -p2 < ${finalAttrs.passthru.glycinPathsPatch} + patch -p2 < ${finalAttrs.passthru.glycin3PathsPatch} + + patchShebangs \ + build-aux/crates-version.py ''; passthru = { @@ -110,6 +116,10 @@ stdenv.mkDerivation (finalAttrs: { glycinPathsPatch = replaceVars ./fix-glycin-paths.patch { bwrap = "${bubblewrap}/bin/bwrap"; }; + + glycin3PathsPatch = replaceVars ./fix-glycin-3-paths.patch { + bwrap = "${bubblewrap}/bin/bwrap"; + }; }; meta = { From 1d2b6ef5c8f01c3d8da5a89f228b21ad7485790e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:35 +0000 Subject: [PATCH 0735/2279] =?UTF-8?q?glycin-loaders:=201.2.3=20=E2=86=92?= =?UTF-8?q?=202.0.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New ABI version. https://gitlab.gnome.org/GNOME/glycin/-/compare/1.2.3...2.0.rc Co-authored-by: Bobby Rong --- pkgs/by-name/gl/glycin-loaders/package.nix | 48 ++++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index b8df7fcaba32..3a925abb5437 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -19,18 +19,25 @@ pkg-config, rustc, rustPlatform, + common-updater-scripts, + _experimental-update-script-combinators, }: stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "1.2.3"; + version = "2.0.rc"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw="; + hash = "sha256-mkREIVtD1b2YUyW0CK4lC0S4Arb/SeGvCCXXAAi5Zz8="; }; - cargoVendorDir = "vendor"; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + name = "glycin-loaders-deps-${finalAttrs.version}"; + hash = "sha256-omxOAZggqBzMKKg6NP8BnjnGwqIkn0fbOI3Vfwa+j1A="; + dontConfigure = true; + }; nativeBuildInputs = [ cargo @@ -56,24 +63,49 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dglycin-loaders=true" + "-Dglycin-thumbnailer=false" "-Dlibglycin=false" + "-Dlibglycin-gtk4=false" "-Dvapi=false" ]; strictDeps = true; postPatch = '' - substituteInPlace loaders/meson.build \ + substituteInPlace glycin-loaders/meson.build \ --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader," ''; env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; passthru = { - updateScript = gnome.updateScript { - attrPath = "glycin-loaders"; - packageName = "glycin"; - }; + updateScript = + let + updateSource = gnome.updateScript { + attrPath = "glycin-loaders"; + packageName = "glycin"; + }; + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version glycin-loaders --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; }; meta = with lib; { From b5c9c430033c77cadd279cfb48f6180990242c67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:11:54 +0000 Subject: [PATCH 0736/2279] =?UTF-8?q?loupe:=2048.1=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/loupe/-/compare/48.1...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/lo/loupe/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index a43aae827f4a..4fa09136796e 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-EHE9PpZ4nQd659M4lFKl9sOX3fQ6UMBxy/4tEnJZcN4="; + hash = "sha256-7HSVdZH8tA9cTL9IoZJWLgMCw0OuHusF0DsmDYKIJdQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "loupe-deps-${finalAttrs.version}"; - hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg="; + hash = "sha256-IywuPEFyLOwjIwK/P/z7Z6yami8nq7usLE1W23ElIjU="; }; postPatch = '' @@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = '' # Dirty approach to add patches after cargoSetupPostUnpackHook # We should eventually use a cargo vendor patch hook instead - pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${libglycin.passthru.glycinPathsPatch} + pushd ../$(stripHash $cargoDeps)/glycin-3.* + patch -p3 < ${libglycin.passthru.glycin3PathsPatch} popd ''; From b77684107818084e7e409ac4591ad0172d43a6f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:46 +0000 Subject: [PATCH 0737/2279] =?UTF-8?q?libshumate:=201.4.0=20=E2=86=92=201.5?= =?UTF-8?q?.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.4.0...1.5.beta Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/li/libshumate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index 6e9cbb678d06..c97f72876422 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.4.0"; + version = "1.5.beta"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-OYQ2jgJZhis4ENHdyG0trdbTcqKzI3bM9K/3wuSMbTA="; + hash = "sha256-xub0mAP1CKDJQatwz8VRjcroN9acjNW0LKO6Dj4r/2Q="; }; depsBuildBuild = [ From 185fd1ea81764f80c6dbdcfc2f000aee7ec028cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:54 +0000 Subject: [PATCH 0738/2279] =?UTF-8?q?nautilus:=2048.3=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/48.3...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/na/nautilus/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index 0fad8a9d816d..fa08be3c841a 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -18,6 +18,7 @@ adwaita-icon-theme, gnome-autoar, glib-networking, + icu, shared-mime-info, libnotify, libexif, @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "48.3"; + version = "49.rc"; outputs = [ "out" @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-IaKuoAUWDbCDx6HU0sCYm4RcxyLATvnrtgElp+xbOT0="; + hash = "sha256-hN7XI8Z4l/qBskma1aKH03/OFiQd73+PcgkEcGP62Kw="; }; patches = [ @@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gexiv2 glib-networking + icu gnome-desktop adwaita-icon-theme gsettings-desktop-schemas From ba57d7c3b4f0e3577497f4e64926e4aef539e12e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:56 +0000 Subject: [PATCH 0739/2279] =?UTF-8?q?gnome-remote-desktop:=2048.1=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/48.1...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-remote-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 7c2c8b80db4f..8e3482e4158b 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-vPN3D8oPrtovrjsaP/by6QoCd492pC6P0QPK4YYo9PI="; + hash = "sha256-4CXGbr1Ju5VJFDbzexcg48bLMfl8VFaWaoWxPo4GxyY="; }; nativeBuildInputs = [ From 9bed27f76ab34144566d537fa6302ba5a652c2c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:16:07 +0000 Subject: [PATCH 0740/2279] =?UTF-8?q?gnome-shell-extensions:=2048.3=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/48.3...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-shell-extensions/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index d190a459755f..5ce8845c6d01 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "48.3"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ="; + hash = "sha256-5FYi5PgASfK1wS++DWvF1YrTIH7W0QVdJBp/qtYpAB0="; }; patches = [ From bf0078925ea43fc255f178e941564dec9d813135 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:16:08 +0000 Subject: [PATCH 0741/2279] =?UTF-8?q?gnome-shell:=2048.4=20=E2=86=92=2049.?= =?UTF-8?q?rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/48.4...49.rc Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-shell/package.nix | 25 ++++++++++++++----- .../gn/gnome-shell/shew-gir-path.patch | 4 +-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index caba99c11260..b45fa934fe62 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -51,16 +51,20 @@ pipewire, gst_all_1, adwaita-icon-theme, + glycin-loaders, gnome-bluetooth, gnome-clocks, gnome-settings-daemon, gnome-autoar, gnome-tecla, bash-completion, + lcms2, libgbm, libGL, libXi, libX11, + libxkbcommon, + libsoup_3, libxml2, }: @@ -69,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "48.4"; + version = "49.rc"; outputs = [ "out" @@ -78,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-QOLtdLRTZ/DKOPv6oKtHCGjSNZHQPcQNCr1v930jtwc="; + hash = "sha256-Hv8ooNfiUECI8ISa/zHxwMhw2WJwA56G5W13+OEHrkE="; }; patches = [ @@ -152,10 +156,13 @@ stdenv.mkDerivation (finalAttrs: { ibus gnome-desktop gnome-settings-daemon + lcms2 # required by mutter-clutter libgbm libGL # for egl, required by mutter-clutter libXi # required by libmutter libX11 + libxkbcommon + libsoup_3 libxml2 # recording @@ -185,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ src/data-to-c.py \ - meson/generate-app-list.py + build-aux/generate-app-list.py # We can generate it ourselves. rm -f man/gnome-shell.1 @@ -215,9 +222,15 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - # Until glib’s xdgmime is patched - # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + --prefix XDG_DATA_DIRS : ${ + lib.makeSearchPath "share" [ + # Until glib’s xdgmime is patched + # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format” + shared-mime-info + # For background images https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4554 + glycin-loaders + ] + } ) ''; diff --git a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch index 6d888725b5d2..b3a55bcc291e 100644 --- a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch +++ b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch @@ -1,5 +1,5 @@ ---- a/subprojects/shew/src/meson.build -+++ b/subprojects/shew/src/meson.build +--- a/subprojects/libshew/src/meson.build ++++ b/subprojects/libshew/src/meson.build @@ -13,7 +13,7 @@ shew_sources = [ libshew = library(full_name, sources: shew_sources, From 7a24e8bdb6258cb7d69470cc92ad1adf001d2f3a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:16:40 +0000 Subject: [PATCH 0742/2279] =?UTF-8?q?vte:=200.80.3=20=E2=86=92=200.81.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.80.3...0.81.90 Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- nixos/modules/config/vte.nix | 2 +- pkgs/by-name/vt/vte/package.nix | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index f7c639b627a0..75ac3bae4be3 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -9,7 +9,7 @@ let vteInitSnippet = '' # Show current working directory in VTE terminals window title. # Supports both bash and zsh, requires interactive shell. - . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh + . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh ''; in diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index c873530f2037..9edb648d1690 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -23,9 +23,11 @@ pango, pcre2, cairo, + fmt_11, fribidi, lz4, icu, + simdutf, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, fast-float, @@ -36,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.80.3"; + version = "0.81.90"; outputs = [ "out" @@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-Lllv0/vqu3FTFmIiTnH2osN/aEQmE21ihUYnJ2709pk="; + hash = "sha256-kLJhqwJZf+6UH3GmV+v50OMDqsN3tIXERNhUQ1oJEyE="; }; patches = [ @@ -58,6 +60,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) + + # Fix compilation with gcc 14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/-/commit/e297ba0507d0e7863edd411dfc5264bbc490e4f6.patch"; + hash = "sha256-uTaeb7bLUBefgF5Uxl7Qxlcp5Uj7pqW8XiR/5rsjuTI="; + }) ]; nativeBuildInputs = [ @@ -76,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + fmt_11 fribidi gnutls pango # duplicated with propagatedBuildInputs to support gtkVersion == null @@ -83,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 icu fast-float + simdutf ] ++ lib.optionals systemdSupport [ systemd From 23a2bfcf8a4bc47d53273163cba84afa4f5f08f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:16:53 +0000 Subject: [PATCH 0743/2279] =?UTF-8?q?gdm:=2048.0=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/48.0...49.rc Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- .../modules/services/display-managers/gdm.nix | 42 +++++++++++-- pkgs/by-name/gd/gdm/fix-paths.patch | 63 ++++++++++--------- pkgs/by-name/gd/gdm/package.nix | 8 ++- 3 files changed, 77 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index bdf1822c4816..cd8a168c7347 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -183,10 +183,44 @@ in name = "gdm"; uid = config.ids.uids.gdm; group = "gdm"; - home = "/run/gdm"; description = "GDM user"; }; + users.users.gdm-greeter = { + isSystemUser = true; + uid = 60578; + group = "gdm"; + home = "/run/gdm"; + }; + + users.users.gdm-greeter-1 = { + isSystemUser = true; + uid = 60579; + group = "gdm"; + home = "/run/gdm-1"; + }; + + users.users.gdm-greeter-2 = { + isSystemUser = true; + uid = 60580; + group = "gdm"; + home = "/run/gdm-2"; + }; + + users.users.gdm-greeter-3 = { + isSystemUser = true; + uid = 60581; + group = "gdm"; + home = "/run/gdm-3"; + }; + + users.users.gdm-greeter-4 = { + isSystemUser = true; + uid = 60582; + group = "gdm"; + home = "/run/gdm-4"; + }; + users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. @@ -348,15 +382,15 @@ in # GDM LFS PAM modules, adapted somehow to NixOS security.pam.services = { gdm-launch-environment.text = '' - auth required pam_succeed_if.so audit quiet_success user = gdm + auth required pam_succeed_if.so audit quiet_success user ingroup gdm auth optional pam_permit.so - account required pam_succeed_if.so audit quiet_success user = gdm + account required pam_succeed_if.so audit quiet_success user ingroup gdm account sufficient pam_unix.so password required pam_deny.so - session required pam_succeed_if.so audit quiet_success user = gdm + session required pam_succeed_if.so audit quiet_success user ingroup gdm session required pam_env.so conffile=/etc/pam/environment readenv=0 session optional ${config.systemd.package}/lib/security/pam_systemd.so session optional pam_keyinit.so force revoke diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch index 93763ce5ff09..bd4e92e4aadb 100644 --- a/pkgs/by-name/gd/gdm/fix-paths.patch +++ b/pkgs/by-name/gd/gdm/fix-paths.patch @@ -1,7 +1,8 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c +index 513b9733d..0c1c8007f 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration { +@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration { const char *session_type; } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT @@ -15,10 +16,10 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-facto { NULL, NULL, NULL }, }; diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index fc5aef6ac..c61e0046b 100644 +index 9568e963f..b1bc8800a 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -151,7 +151,7 @@ plymouth_is_running (void) +@@ -154,7 +154,7 @@ plymouth_is_running (void) GError *error; error = NULL; @@ -27,7 +28,7 @@ index fc5aef6ac..c61e0046b 100644 NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void) +@@ -172,7 +172,7 @@ plymouth_prepare_for_transition (void) GError *error; error = NULL; @@ -36,7 +37,7 @@ index fc5aef6ac..c61e0046b 100644 NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void) +@@ -187,7 +187,7 @@ plymouth_quit_with_transition (void) GError *error; error = NULL; @@ -45,7 +46,7 @@ index fc5aef6ac..c61e0046b 100644 if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void) +@@ -203,7 +203,7 @@ plymouth_quit_without_transition (void) GError *error; error = NULL; @@ -54,30 +55,32 @@ index fc5aef6ac..c61e0046b 100644 if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index a4c4b2dcf..67416b204 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self, - */ - if (run_launcher) { - if (is_x11) { -- program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", - register_session ? "--register-session " : "", - self->selected_program); - } else { -- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"", -+ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"", - register_session ? "--register-session " : "", - self->selected_program); - } - } else { -- program = g_strdup_printf ("dbus-run-session -- %s", -+ program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s", - self->selected_program); - } - } +diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c +index d0404d2c1..e916c2723 100644 +--- a/daemon/gdm-wayland-session.c ++++ b/daemon/gdm-wayland-session.c +@@ -136,7 +136,7 @@ spawn_bus (State *state, + + bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO); + +- g_ptr_array_add (arguments, "dbus-daemon"); ++ g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon"); + + g_ptr_array_add (arguments, "--print-address"); + g_ptr_array_add (arguments, bus_address_fd_string); +diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c +index a998d1555..4fe50a2d0 100644 +--- a/daemon/gdm-x-session.c ++++ b/daemon/gdm-x-session.c +@@ -463,7 +463,7 @@ spawn_bus (State *state, + + bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO); + +- g_ptr_array_add (arguments, "dbus-daemon"); ++ g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon"); + + g_ptr_array_add (arguments, "--print-address"); + g_ptr_array_add (arguments, bus_address_fd_string); diff --git a/data/gdm.service.in b/data/gdm.service.in index 17e8a8de8..afc709778 100644 --- a/data/gdm.service.in diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 9145153e384a..33ed32667c38 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "48.0"; + version = "49.rc"; outputs = [ "out" @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-G8Btr/CT7HteN+y0+S5do0dKGxugdu25FR7pZ9HDCt8="; + hash = "sha256-vQdduV2RbiXRhk/n0RSY8YpSiiMYDU4jotXwukRgyBY="; }; mesonFlags = [ @@ -145,6 +145,10 @@ stdenv.mkDerivation (finalAttrs: { # installed (mostly just because .passthru.tests can make use of it). substituteInPlace meson.build \ --replace-fail "dconf_prefix = dconf_dep.get_variable(pkgconfig: 'prefix')" "dconf_prefix = gdm_prefix" + + # Disable userdb dynamic users for now + substituteInPlace meson.build \ + --replace-fail 'have_userdb = libsystemd_dep' 'have_userdb = false #' ''; doInstallCheck = true; From 937e889759e0255776f4a6fd48fe46e7a7b8d01a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:06 +0000 Subject: [PATCH 0744/2279] =?UTF-8?q?gnome-tecla:=2048.0.2=20=E2=86=92=204?= =?UTF-8?q?9.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tecla/-/compare/48.0.2...49.rc Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-tecla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix index e08ec43dd48f..b4276de4ff80 100644 --- a/pkgs/by-name/gn/gnome-tecla/package.nix +++ b/pkgs/by-name/gn/gnome-tecla/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecla"; - version = "48.0.2"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-eD00ZNKiz36xUHZJ29n/Cc4khSwqbJoNNl24QGPT1AE="; + hash = "sha256-XRLIDoZUnVDwmRgSdZ9PU/QgiNDq60KN0RSA5grl12o="; }; nativeBuildInputs = [ From e32629d8ba722060711edbac2860f9f1e3cfc189 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:16 +0000 Subject: [PATCH 0745/2279] =?UTF-8?q?localsearch:=203.9.0=20=E2=86=92=203.?= =?UTF-8?q?10.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/localsearch/-/compare/3.9.0...3.10.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/lo/localsearch/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index 361545417bf8..403efcce05aa 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -38,6 +38,7 @@ libseccomp, libtiff, libuuid, + libwebp, libxml2, poppler, systemd, @@ -49,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "localsearch"; - version = "3.9.0"; + version = "3.10.rc"; src = fetchurl { url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; - hash = "sha256-1C9AjcP7KP5U9amrv18d7PWBjbnC6exRwJRkvf0MFLk="; + hash = "sha256-EeihW7QeFzynGqL0lHnKUIwmleWmB/BA1AMvjbyNaFU="; }; patches = [ @@ -102,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { libpng libtiff libuuid + libwebp libxml2 poppler taglib From 9c8a45887c65e4f9c3b2f69dd24e927301d2d6c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:17 +0000 Subject: [PATCH 0746/2279] =?UTF-8?q?gom:=200.5.3=20=E2=86=92=200.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gom/-/compare/0.5.3...0.5.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/go/gom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 465f8aa0933e..68bd96cde8cf 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gom"; - version = "0.5.3"; + version = "0.5.4"; outputs = [ "out" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz"; - sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc="; + sha256 = "V7qAb+CAqTfVZkF40hutdlOyxWHqEoGHp7ELwXYrf2U="; }; patches = [ From 5dbe92a04760b9c8e57bfaf08fb50aa2d39b33ce Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:25 +0000 Subject: [PATCH 0747/2279] =?UTF-8?q?evolution-data-server:=203.56.2=20?= =?UTF-8?q?=E2=86=92=203.57.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.56.2...3.57.3 Changelog-Reviewed-By: Jan Tojnar --- .../hardcode-gsettings.patch | 62 +++++++++---------- .../ev/evolution-data-server/package.nix | 16 ++--- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 62eae627efd7..27111ebdde55 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c -index 5e65ec8..2cae29d 100644 +index c31f3ef..9ebb5f2 100644 --- a/src/addressbook/libebook/e-book-client.c +++ b/src/addressbook/libebook/e-book-client.c -@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry, +@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry, *out_client = book_client; @@ -22,7 +22,7 @@ index 5e65ec8..2cae29d 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client, +@@ -1994,7 +2005,18 @@ e_book_client_set_self (EBookClient *client, g_return_val_if_fail ( e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE); @@ -42,7 +42,7 @@ index 5e65ec8..2cae29d 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact) +@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact) * unfortunately the API doesn't allow that. */ g_mutex_lock (&mutex); @@ -66,10 +66,10 @@ index 5e65ec8..2cae29d 100644 g_mutex_unlock (&mutex); diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c -index a9b68e3..6a13b1b 100644 +index 9d986d2..d63902a 100644 --- a/src/addressbook/libebook/e-book.c +++ b/src/addressbook/libebook/e-book.c -@@ -2586,7 +2586,18 @@ e_book_get_self (ESourceRegistry *registry, +@@ -2593,7 +2593,18 @@ e_book_get_self (ESourceRegistry *registry, return FALSE; } @@ -89,7 +89,7 @@ index a9b68e3..6a13b1b 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); -@@ -2641,7 +2652,18 @@ e_book_set_self (EBook *book, +@@ -2648,7 +2659,18 @@ e_book_set_self (EBook *book, g_return_val_if_fail (E_IS_BOOK (book), FALSE); g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -109,7 +109,7 @@ index a9b68e3..6a13b1b 100644 g_settings_set_string ( settings, SELF_UID_KEY, e_contact_get_const (contact, E_CONTACT_UID)); -@@ -2669,7 +2691,18 @@ e_book_is_self (EContact *contact) +@@ -2676,7 +2698,18 @@ e_book_is_self (EContact *contact) g_return_val_if_fail (E_IS_CONTACT (contact), FALSE); @@ -130,10 +130,10 @@ index a9b68e3..6a13b1b 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 752f83f..eaa3dad 100644 +index 2a95a75..950f430 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c -@@ -145,7 +145,18 @@ ebmb_is_power_saver_enabled (void) +@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -178,10 +178,10 @@ index 9f8646a..079aba9 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c -index 2525856..7ecc1a8 100644 +index 6318854..6b7a88c 100644 --- a/src/calendar/backends/file/e-cal-backend-file.c +++ b/src/calendar/backends/file/e-cal-backend-file.c -@@ -3682,7 +3682,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, +@@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, if (is_declined) { GSettings *settings; @@ -204,10 +204,10 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 026ae80..e3003c2 100644 +index 92d68e2..d1e1fa4 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2844,8 +2844,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2882,8 +2882,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -244,10 +244,10 @@ index 026ae80..e3003c2 100644 g_signal_connect_object ( watcher->priv->desktop_settings, diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c -index 84ccbb0..9010429 100644 +index df89788..4a1ebd0 100644 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c -@@ -157,7 +157,18 @@ ecmb_is_power_saver_enabled (void) +@@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void) GSettings *settings; gboolean enabled = FALSE; @@ -267,7 +267,7 @@ index 84ccbb0..9010429 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; -@@ -2628,7 +2639,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, +@@ -2654,7 +2665,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend, if (is_declined) { GSettings *settings; @@ -290,10 +290,10 @@ index 84ccbb0..9010429 100644 g_clear_object (&settings); } diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c -index d00fbd5..0f67653 100644 +index 03b5129..3f4256a 100644 --- a/src/camel/camel-cipher-context.c +++ b/src/camel/camel-cipher-context.c -@@ -1630,7 +1630,18 @@ camel_cipher_can_load_photos (void) +@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void) GSettings *settings; gboolean load_photos; @@ -314,10 +314,10 @@ index d00fbd5..0f67653 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 4594ab1..e71ce05 100644 +index c5ac40f..fb8ae19 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -745,7 +745,18 @@ gpg_ctx_get_executable_name (void) +@@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -338,10 +338,10 @@ index 4594ab1..e71ce05 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index 0c1c7dd..4188934 100644 +index 2c0b6ef..b354332 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c -@@ -361,7 +361,19 @@ void +@@ -363,7 +363,19 @@ void _camel_utils_initialize (void) { G_LOCK (mi_user_headers); @@ -363,10 +363,10 @@ index 0c1c7dd..4188934 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index 8cf56f0..f4355d5 100644 +index d567e04..6b929b7 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5681,7 +5681,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -411,10 +411,10 @@ index f7c5d3c..67732c3 100644 g_clear_object (&settings); diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c -index 188f276..939f89b 100644 +index e9cb145..8fc30d5 100644 --- a/src/libedataserver/e-network-monitor.c +++ b/src/libedataserver/e-network-monitor.c -@@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object) +@@ -260,7 +260,18 @@ e_network_monitor_constructed (GObject *object) /* Chain up to parent's method. */ G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object); @@ -531,10 +531,10 @@ index db775f9..fb524db 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 1539f8b..77cf123 100644 +index bd9822d..3e021dd 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); @@ -556,10 +556,10 @@ index 1539f8b..77cf123 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index b47a374..e812fbe 100644 +index 02dcd6e..5dfa7ac 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1985,7 +1985,19 @@ static void +@@ -2132,7 +2132,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 3a29f92c0c2a..843e20bfd440 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -48,9 +48,9 @@ makeHardcodeGsettingsPatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.56.2"; + version = "3.57.3"; outputs = [ "out" @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; - hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw="; + url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; + hash = "sha256-FkMu42rxildzbAfT/uwhi7peVUSk3EN/yhHiMQhsjLc="; }; patches = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \ + --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${finalAttrs.version}"} \ --subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { "org.gnome.evolution-data-server" = "EDS"; "org.gnome.desktop.interface" = "GDS"; }; - inherit src patches; + inherit (finalAttrs) src patches; }; updateScript = let @@ -198,9 +198,9 @@ stdenv.mkDerivation rec { meta = { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server"; - changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; + changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; license = lib.licenses.lgpl2Plus; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; # requires libuuid }; -} +}) From 22dd471007a8593df1f6eee5fe88e2561f395c7b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:19 +0000 Subject: [PATCH 0748/2279] =?UTF-8?q?evolution:=203.56.2=20=E2=86=92=203.5?= =?UTF-8?q?7.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.56.2...3.57.3 Changelog-Reviewed-By: Jan Tojnar --- .../mailreaders/evolution/evolution/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index f02a9d700bf0..8d47ad48b593 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, cmake, ninja, intltool, @@ -47,23 +46,13 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.56.2"; + version = "3.57.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys="; + hash = "sha256-OY+r52ym2qkAT5I8KfGpdGldHcTvcpPfefefsXNOIrk="; }; - patches = [ - # fix crash when opening attachment with recent webkitgtk versions - # https://gitlab.gnome.org/GNOME/evolution/-/issues/3124 - # remove when updating to 3.58.0 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/evolution/-/commit/811a6df1f990855e49ecc0ba7b1a7f7a5ec251e6.patch"; - hash = "sha256-Aj8H7PnAblInX2zRPQH7n0HOdLNuhITNHunWRYCPBsI="; - }) - ]; - nativeBuildInputs = [ cmake intltool From 13e494975c6751017563cf3a7b429bc35a45e786 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:30 +0000 Subject: [PATCH 0749/2279] =?UTF-8?q?gtksourceview5:=205.16.0=20=E2=86=92?= =?UTF-8?q?=205.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.16.0...5.17.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 433dca535864..9cd5ccca89cc 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.16.0"; + version = "5.17.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz"; - hash = "sha256-qzXUIBAvPosFXdO4ZC06SCCfiIGJ5iVND/tLan6MNWY="; + hash = "sha256-dA3pr74iuzHb2FMrizMeeVPOY5YcCuEtEvrkLVAQFgc="; }; patches = [ From 293e1df6991346070c92fd9e227ace795020ca69 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:42 +0000 Subject: [PATCH 0750/2279] =?UTF-8?q?gnome-online-accounts:=203.54.5=20?= =?UTF-8?q?=E2=86=92=203.55.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.54.5...3.55.2 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-online-accounts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 8b4093837284..647806b0c82a 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.54.5"; + version = "3.55.2"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-6PEntTIpWimRLRwAc0kx35r/pOv8RK0N5cKWw9J9LJU="; + hash = "sha256-kdAkhWw4AEwrL+b9rVoBh+aoBv8+HtIAILk0Dg1ICu8="; }; mesonFlags = [ From 7326976b447875ae66960a36c39a8d9d2656655b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:43 +0000 Subject: [PATCH 0751/2279] =?UTF-8?q?yelp-xsl:=2042.4=20=E2=86=92=2049.bet?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-xsl/-/compare/42.4...49.beta Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/ye/yelp-xsl/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix index 4004318a7ce1..9f5698e88bd0 100644 --- a/pkgs/by-name/ye/yelp-xsl/package.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -7,18 +7,17 @@ fetchurl, pkg-config, itstool, - libxml2, libxslt, gnome, }: stdenv.mkDerivation (finalAttrs: { pname = "yelp-xsl"; - version = "42.4"; + version = "49.beta"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz"; - hash = "sha256-/euwfrLman+3oNzmrYJIrSmku7E0uoKRKMoQT1ir19E="; + hash = "sha256-yhvk5jrMXx15oVFCeHn7DAALLKHTJygU4LJPe8B9mT0="; }; nativeBuildInputs = [ @@ -27,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { ninja gettext itstool - libxml2 libxslt ]; From 9c96adcca613ec9423e4b8ba0b9c697ad405cad4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:44 +0000 Subject: [PATCH 0752/2279] =?UTF-8?q?glibmm=5F2=5F68:=202.84.0=20=E2=86=92?= =?UTF-8?q?=202.85.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.84.0...2.85.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 3211986f87c1..db84397b684b 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.84.0"; + version = "2.85.0"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor version}/glibmm-${version}.tar.xz"; - hash = "sha256-Vu5fUcis/Ar99GlZMW5MhVTLUO0ra8XOOJ2XnLtkJQk="; + hash = "sha256-B3EwZxEpn79i5Tx1LVPtWBY1EnFnpsx5rgXyuEIdKdc="; }; nativeBuildInputs = [ From b06c4116252308bba7d079cac622c5e2e534eec6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:49 +0000 Subject: [PATCH 0753/2279] =?UTF-8?q?sysprof:=2048.0=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/48.0...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/tools/profiling/sysprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 1b3d449a3d20..d6b5719a6d8f 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sysprof"; - version = "48.0"; + version = "49.rc"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/sysprof/${lib.versions.major finalAttrs.version}/sysprof-${finalAttrs.version}.tar.xz"; - hash = "sha256-Gw8DgPLzBwi6h4KTIaBv7h2zbfqHeXu/B/CnrPRJjRg="; + hash = "sha256-Y4ZkKMR7rSOlCTowWq85bFpPgqDtSz5RWPZYCalx1JA="; }; nativeBuildInputs = [ From c2a2645ab053329dad39a705f1627a63148b0313 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:17:56 +0000 Subject: [PATCH 0754/2279] =?UTF-8?q?gnome-settings-daemon:=2048.1=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/48.1...49.rc Changelog-Reviewed-By: Jan Tojnar --- .../gn/gnome-settings-daemon/package.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 11d273c81492..3dcb8a7abb95 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -10,13 +10,12 @@ gnome, perl, gettext, - gtk3, glib, libnotify, libgnomekbd, libpulseaudio, alsa-lib, - libcanberra-gtk3, + libcanberra, upower, colord, libgweather, @@ -25,15 +24,14 @@ geoclue2, systemd, libgudev, - libwacom, libxslt, libxml2, modemmanager, networkmanager, gnome-desktop, geocode-glib_2, - docbook_xsl, - wrapGAppsHook3, + docbook-xsl-nons, + wrapGAppsNoGuiHook, python3, tzdata, gcr_4, @@ -44,11 +42,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "48.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4="; + hash = "sha256-p/eJy5lZZfamZBKrUTkGTuRblwHTpCNQ/i5amP9oPAI="; }; patches = [ @@ -74,14 +72,13 @@ stdenv.mkDerivation (finalAttrs: { glib libxml2 libxslt - docbook_xsl - wrapGAppsHook3 + docbook-xsl-nons + wrapGAppsNoGuiHook python3 udevCheckHook ]; buildInputs = [ - gtk3 glib gsettings-desktop-schemas modemmanager @@ -91,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop libpulseaudio alsa-lib - libcanberra-gtk3 + libcanberra upower colord libgweather @@ -99,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { geocode-glib_2 geoclue2 libgudev - libwacom gcr_4 ] ++ lib.optionals withSystemd [ From 88aa1cce92917f788e50f542bf11dd0ddff9c174 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:03 +0000 Subject: [PATCH 0755/2279] =?UTF-8?q?zenity:=204.1.90=20=E2=86=92=204.1.99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/zenity/-/compare/4.1.90...4.1.99 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/ze/zenity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 72ee2d493225..251da2da8fe1 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "4.1.90"; + version = "4.1.99"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - hash = "sha256-vzZ5xiBf9I3OvR4d/zo6SmoLOlPhy8OwmKnsC2K9cjY="; + hash = "sha256-b+KqMTxx6R/6VbEdvseQTzGkAwPgo/YBaCD/be4ynuI="; }; nativeBuildInputs = [ From ae2487fa4916b5512726229d3eca1b83985abccc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:17 +0000 Subject: [PATCH 0756/2279] =?UTF-8?q?libpanel:=201.10.0=20=E2=86=92=201.10?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.10.0...1.10.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/li/libpanel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix index b577910323a3..c06f04a2136a 100644 --- a/pkgs/by-name/li/libpanel/package.nix +++ b/pkgs/by-name/li/libpanel/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpanel"; - version = "1.10.0"; + version = "1.10.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz"; - hash = "sha256-V4zlEieP8rte7rtVCZOSxSU3pavZvQYpVn8QJTKziyU="; + hash = "sha256-k2u+lt+zg1VkghIP3dRTOlLS9JMDMoy2lIYWBkkkRes="; }; strictDeps = true; From ef4d610a41f2bb1fb696c1e9ca4adc96d15c60a3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:23 +0000 Subject: [PATCH 0757/2279] =?UTF-8?q?libdex:=200.10.1=20=E2=86=92=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libdex/-/compare/0.10.1...1.0.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/li/libdex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix index 34078fc48c3c..f9901e8b3ae3 100644 --- a/pkgs/by-name/li/libdex/package.nix +++ b/pkgs/by-name/li/libdex/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "0.10.1"; + version = "1.0.0"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; - hash = "sha256-dHLogJDbKyKDB1Be3rpEg+hyaBNAywQErmSsPaW+0KY="; + hash = "sha256-e49cXbN5bhThLhBCLiNWdmuoMLkoFf7nC7yGe1sgf10="; }; nativeBuildInputs = [ From 30d63f2a2c2a4362bb711f57efeddae3268a95d4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:30 +0000 Subject: [PATCH 0758/2279] =?UTF-8?q?gnome-desktop:=2044.3=20=E2=86=92=204?= =?UTF-8?q?4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop/-/compare/44.3...44.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index 567f272183f1..722d0e70886f 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-desktop"; - version = "44.3"; + version = "44.4"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40="; + sha256 = "sha256-HYy5xqMo62ibDBJpz1ODTMhNhR1+cZcM2ruoJwa0SYQ="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ From acd46cf683dcdd82541f96e8e5cfa30122794f42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:55 +0000 Subject: [PATCH 0759/2279] =?UTF-8?q?gjs:=201.84.2=20=E2=86=92=201.85.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.84.2...1.85.90 Co-authored-by: dish Changelog-Reviewed-By: Jan Tojnar --- .../gj/gjs/disable-introspection-test.patch | 2 +- pkgs/by-name/gj/gjs/fix-paths.patch | 2 +- .../by-name/gj/gjs/installed-tests-path.patch | 24 +++++++++---------- pkgs/by-name/gj/gjs/package.nix | 23 ++++++++++++++---- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/gj/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch index 1c438dd6b401..d597f99b02d8 100644 --- a/pkgs/by-name/gj/gjs/disable-introspection-test.patch +++ b/pkgs/by-name/gj/gjs/disable-introspection-test.patch @@ -2,7 +2,7 @@ diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build index 07759690..43c87c59 100644 --- a/installed-tests/js/meson.build +++ b/installed-tests/js/meson.build -@@ -123,7 +123,6 @@ jasmine_tests = [ +@@ -34,7 +34,6 @@ jasmine_tests = [ 'GTypeClass', 'Importer', 'Importer2', diff --git a/pkgs/by-name/gj/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch index 5ca5372ea947..99e82c9be3dc 100644 --- a/pkgs/by-name/gj/gjs/fix-paths.patch +++ b/pkgs/by-name/gj/gjs/fix-paths.patch @@ -2,7 +2,7 @@ diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh index 0d118490..54c5507e 100755 --- a/installed-tests/debugger-test.sh +++ b/installed-tests/debugger-test.sh -@@ -3,7 +3,7 @@ +@@ -6,7 +6,7 @@ if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then gjs="$TOP_BUILDDIR/gjs-console" else diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch index aa1510f5807b..403a9c372d4e 100644 --- a/pkgs/by-name/gj/gjs/installed-tests-path.patch +++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch @@ -11,7 +11,7 @@ index 98475f7d..942d9eca 100644 ], include_directories: top_include, install: get_option('installed_tests'), install_dir: installed_tests_execdir) -@@ -82,7 +82,7 @@ foreach test : jasmine_tests +@@ -90,7 +90,7 @@ foreach test : jasmine_tests test_description_subst = { 'name': 'test@0@.js'.format(test), @@ -20,16 +20,16 @@ index 98475f7d..942d9eca 100644 } configure_file(configuration: test_description_subst, input: '../minijasmine.test.in', -@@ -125,7 +125,7 @@ foreach test : dbus_tests +@@ -122,7 +122,7 @@ foreach test : dbus_tests - dbus_test_description_subst = { - 'name': 'test@0@.js'.format(test), -- 'installed_tests_execdir': prefix / installed_tests_execdir, -+ 'installed_tests_execdir': installed_tests_execdir, - } - configure_file( - configuration: dbus_test_description_subst, -@@ -163,7 +163,7 @@ foreach test : modules_tests + dbus_test_description_subst = { + 'name': 'testGDBus.js', +- 'installed_tests_execdir': prefix / installed_tests_execdir, ++ 'installed_tests_execdir': installed_tests_execdir, + } + configure_file( + configuration: dbus_test_description_subst, +@@ -159,7 +159,7 @@ foreach test : modules_tests esm_test_description_subst = { 'name': 'test@0@.js'.format(test), @@ -42,7 +42,7 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build index 7a7c48ab..52508c2c 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build -@@ -30,7 +30,7 @@ foreach test : simple_tests +@@ -34,7 +34,7 @@ foreach test : simple_tests test_description_subst = { 'name': 'test@0@.sh'.format(test), @@ -51,7 +51,7 @@ index 7a7c48ab..52508c2c 100644 } configure_file(configuration: test_description_subst, input: 'script.test.in', output: 'test@0@.sh.test'.format(test), -@@ -85,7 +85,7 @@ foreach test : debugger_tests +@@ -123,7 +123,7 @@ foreach test : debugger_tests test_description_subst = { 'name': '@0@.debugger'.format(test), diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index f9b1f3c1ffa3..069a547b60ef 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -1,5 +1,6 @@ { fetchurl, + fetchpatch, lib, stdenv, meson, @@ -11,7 +12,7 @@ gtk4, atk, gobject-introspection, - spidermonkey_128, + spidermonkey_140, pango, cairo, readline, @@ -41,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.84.2"; + version = "1.85.90"; outputs = [ "out" @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY="; + hash = "sha256-tFVADxNLEs3MtPO92yPMZOqxlY0cn0hLsKQlk/t4MmU="; }; patches = [ @@ -70,6 +71,20 @@ stdenv.mkDerivation (finalAttrs: { # not ok 796 Filename tests various types of path existing # Message: Error opening file “/build/.UGHEA3/öäü-3”: Invalid or incomplete multibyte or wide character in /build/gjs-1.84.2/build/../installed-tests/js/testGIMarshalling.js (line 2937) ./disable-umlaut-test.patch + + # Fix gjs:JS / Package test + # https://gitlab.gnome.org/GNOME/gjs/-/issues/711 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/054f78c756b631c347c6f64ab5b7349331f5f420.patch"; + hash = "sha256-gnOD+WU+JTzetnyGyGJKQZbaLX22yZuBhCmhJd2Hha8="; + }) + + # Fix gjs:Scripts / Gtk4Warnings test + # https://gitlab.gnome.org/GNOME/gjs/-/issues/712 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/48b00ae16d97ae213dbaef6dee8ffd56e1667a64.patch"; + hash = "sha256-u7P/dV9mtx3AldrnbDhGGMVQ61GmD54TXFhS4FRh4yc="; + }) ]; nativeBuildInputs = [ @@ -90,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { cairo readline libsysprof-capture - spidermonkey_128 + spidermonkey_140 ]; nativeCheckInputs = [ From 6d674616a4c9fb815c2599c6615e3c34b6027cee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:56 +0000 Subject: [PATCH 0760/2279] =?UTF-8?q?adwaita-icon-theme:=2048.0=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/48.0...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/ad/adwaita-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index c4fe4a7e27ae..6567edaa5ba4 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; - hash = "sha256-hHBoiIZQ2WcxFb5tvyv9wxpGrrxSimqdtEIOYOZWuNQ="; + hash = "sha256-brZ8IqXmAYYcwGfMBQWhvfOSm6W3Rl9Az25N2R2eTR0="; }; nativeBuildInputs = [ From 1302acdb1e9c7a6833210c15a47fbf693d18f723 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:19:07 +0000 Subject: [PATCH 0761/2279] =?UTF-8?q?gtk4:=204.18.6=20=E2=86=92=204.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.18.6...4.20.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/4.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index a9217ba92d14..eadb3936ed2d 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -28,6 +28,7 @@ libxkbcommon, libpng, libtiff, + librsvg, libjpeg, libxml2, gnome, @@ -68,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.18.6"; + version = "4.20.0"; outputs = [ "out" @@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-4YF8ZQ3cMmH5qDRbOyKial2ArxVGMN7cA8x77O//0Po="; + hash = "sha256-eeUeYvfwz/MpBFabDOvJYpfQ6/r6begXIHPGnOA5Gpg="; }; depsBuildBuild = [ @@ -119,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libpng libtiff + librsvg libjpeg (libepoxy.override { inherit x11Support; }) isocodes From de70a1a6bcde66bc81c4e8eca2d3a16682649928 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:18:45 +0000 Subject: [PATCH 0762/2279] =?UTF-8?q?libadwaita:=201.7.8=20=E2=86=92=201.8?= =?UTF-8?q?.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.7.8...1.8.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/li/libadwaita/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 629f0fa4a4a7..f5e6634d700d 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.7.8"; + version = "1.8.rc"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-KeBKrr5+PXSvdqVk74/JJL5F6U+GcDUod2rPwLQz0OY="; + hash = "sha256-wpxPYEkuRh2DaEw6tCAnQLXAwFEQ/TbJZYq15Egt9NM="; }; depsBuildBuild = [ From fb80948798d1e692b68ec822914869158e09a473 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:10:25 +0000 Subject: [PATCH 0763/2279] =?UTF-8?q?epiphany:=2048.5=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/48.5...49.rc Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/by-name/ep/epiphany/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index 2f5cbe602e99..c8267e7d9f2e 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + blueprint-compiler, meson, ninja, gettext, @@ -25,6 +26,7 @@ gcr_4, isocodes, desktop-file-utils, + docutils, nettle, gdk-pixbuf, gst_all_1, @@ -37,15 +39,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "48.5"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-D2ZVKtZZPHlSo93uW/UVZWyMQ0hxB22fGpGnr5NGsbQ="; + hash = "sha256-TnUAK4bqFGaYEBvIYgTIrSivMZ5jOKwV4m/1wznx5JQ="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils + docutils # for rst2man gettext itstool meson From 52fb49a1b042bec50446f1ee4380f64e50bff6da Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:13:34 +0000 Subject: [PATCH 0764/2279] =?UTF-8?q?gnome-control-center:=2048.4=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/48.4...49.rc Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- .../gn/gnome-control-center/package.nix | 10 +++--- .../gn/gnome-control-center/paths.patch | 33 +++++++------------ 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 2d5710716277..b89735a3fb25 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -5,6 +5,7 @@ replaceVars, accountsservice, adwaita-icon-theme, + blueprint-compiler, colord, colord-gtk4, cups, @@ -27,6 +28,7 @@ gsettings-desktop-schemas, gsound, gst_all_1, + gtk3, gtk4, ibus, json-glib, @@ -42,7 +44,6 @@ libsecret, libsoup_3, libwacom, - libXi, libxml2, libxslt, meson, @@ -75,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "48.4"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-KiDu5uBcjTrdru+lJNzh7p+Ip32Djj/R7e88DC5GetI="; + hash = "sha256-DL9Y5KD9UVdB83b0NHFd52R9mz2QrwhvksOrt4liIkI="; }; patches = [ @@ -91,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + blueprint-compiler docbook-xsl-nons gettext libxslt @@ -123,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-user-share # optional, sharing panel gsettings-desktop-schemas gsound + gtk3 # org.gtk.Settings.FileChooser schema (datetime panel sets clock-format) gtk4 ibus json-glib @@ -138,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: { libsecret libsoup_3 libwacom - libXi libxml2 modemmanager mutter # schemas for the keybindings diff --git a/pkgs/by-name/gn/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch index 41dd5979aa4b..87d8f737ba43 100644 --- a/pkgs/by-name/gn/gnome-control-center/paths.patch +++ b/pkgs/by-name/gn/gnome-control-center/paths.patch @@ -1,17 +1,8 @@ diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c -index f6c84e3d2..cd897f8f5 100644 +index dac0e51..71af3e2 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -614,7 +614,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *self) - - /* run with modal set */ - argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); -+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); - g_ptr_array_add (argv, g_strdup ("--device")); - g_ptr_array_add (argv, g_strdup (cd_device_get_id (self->current_device))); - g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -989,7 +989,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile) +@@ -973,7 +973,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); @@ -20,7 +11,7 @@ index f6c84e3d2..cd897f8f5 100644 g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1221,15 +1221,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device) +@@ -1141,15 +1141,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *self, CdProfile *profile, CdDevice *device) { @@ -38,7 +29,7 @@ index f6c84e3d2..cd897f8f5 100644 else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h -index feef16580..4b88ef7b1 100644 +index feef165..4b88ef7 100644 --- a/panels/system/datetime/tz.h +++ b/panels/system/datetime/tz.h @@ -27,11 +27,7 @@ @@ -55,10 +46,10 @@ index feef16580..4b88ef7b1 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index ec5a905a5..689fdbebe 100644 +index f1cae8d..faee22a 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) +@@ -384,7 +384,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) GPid child_pid; builder = g_strv_builder_new (); @@ -68,7 +59,7 @@ index ec5a905a5..689fdbebe 100644 if (self->is_new_connection) { g_autofree gchar *type_str = NULL; diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 166670224..36f720d36 100644 +index d0b0206..8276af0 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c @@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self) @@ -90,7 +81,7 @@ index 166670224..36f720d36 100644 } diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index a31a606e3..ed5133d29 100644 +index a31a606..ed5133d 100644 --- a/panels/printers/pp-host.c +++ b/panels/printers/pp-host.c @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, @@ -103,7 +94,7 @@ index a31a606e3..ed5133d29 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c -index edbc99830..1e1d90141 100644 +index fb9efc6..452486a 100644 --- a/panels/system/users/run-passwd.c +++ b/panels/system/users/run-passwd.c @@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) @@ -116,10 +107,10 @@ index edbc99830..1e1d90141 100644 envp = g_get_environ (); diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c -index 5b7bc1f02..13ffe6ca8 100644 +index 16dc79e..f543e7b 100644 --- a/panels/system/users/user-utils.c +++ b/panels/system/users/user-utils.c -@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, +@@ -217,7 +217,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. */ @@ -129,7 +120,7 @@ index 5b7bc1f02..13ffe6ca8 100644 argv[2] = data->username; argv[3] = "--"; diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c -index 9cb92007a..84d2f0fa3 100644 +index 9cb9200..84d2f0f 100644 --- a/tests/datetime/test-endianess.c +++ b/tests/datetime/test-endianess.c @@ -26,7 +26,7 @@ test_endianess (void) From 24b0e245309c2ed89015182362175d8cb13c6ccc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:37 +0000 Subject: [PATCH 0765/2279] =?UTF-8?q?snapshot:=2048.0.1=20=E2=86=92=2049.r?= =?UTF-8?q?c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/snapshot/-/compare/48.0.1...49.rc Changelog-Reviewed-By: Jan Tojnar Co-authored-by: Bobby Rong --- pkgs/by-name/sn/snapshot/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index 9bc4466f3252..8fd1f8bc095f 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -19,6 +19,7 @@ gtk4, libadwaita, libcamera, + lcms2, libseccomp, pipewire, gnome, @@ -26,16 +27,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "48.0.1"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-OTF2hZogt9I138MDAxuiDGhkQRBpiNyRHdkbe21m4f0="; + hash = "sha256-S7ivkP/sn/MmIS8ElqA336J3/v6fj5sPAWYpQQ3hK0M="; }; patches = [ # Fix paths in glycin library - libglycin.passthru.glycinPathsPatch + libglycin.passthru.glycin3PathsPatch ]; cargoVendorDir = "vendor"; @@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 libadwaita libcamera # for the gstreamer plugin + lcms2 libseccomp pipewire # for device provider ]; From e85cf1677eb6de0d61b31550f016dcef9f94adb7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:15:45 +0000 Subject: [PATCH 0766/2279] =?UTF-8?q?gtkmm4:=204.18.0=20=E2=86=92=204.19.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.18.0...4.19.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtkmm/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 69db33598e17..3c8cce02a639 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.18.0"; + version = "4.19.1"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; - hash = "sha256-LuMcFUefxNjpWLA8i1+7yOF7wSLCovVESXtOBWGeM+w="; + hash = "sha256-K0Q9378M8oxL7ORHpbumICjEnfRcyxs/Q4o6PgvKMao="; }; nativeBuildInputs = [ From 6f09e697b3e80b538004ac098804685e35b70fd3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:19:21 +0000 Subject: [PATCH 0767/2279] =?UTF-8?q?gtk3:=203.24.49=20=E2=86=92=203.24.50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.49...3.24.50 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 00d85ff5d1a5..b26c5f98cb25 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.49"; + version = "3.24.50"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-XqUsaijw5ezy6aPC+suzDQQLc4cfzV8zzRMX6QGKFG4="; + hash = "sha256-OZEYpWmTFGIhZaEbdp6ptu1o4De21G1Xz89IUd7AdSk="; }; patches = [ From eecd2dcc9fdefaae5bbfaec6b66c33ed4e3a73a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:19:50 +0000 Subject: [PATCH 0768/2279] =?UTF-8?q?at-spi2-core:=202.56.2=20=E2=86=92=20?= =?UTF-8?q?2.57.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/2.56.2...2.57.2 Co-authored-by: Bobby Rong --- pkgs/by-name/at/at-spi2-core/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 97efa5cc60e4..8929f1ce43c7 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -12,6 +12,7 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, gsettings-desktop-schemas, makeWrapper, + python3, dbus, glib, dconf, @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.56.2"; + version = "2.57.2"; outputs = [ "out" @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs="; + hash = "sha256-o4aSqsF09zt3SsYLp5XAwMYLpW1BNLag7APmSBZ0xgo="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { ninja pkg-config makeWrapper + python3 ] ++ lib.optionals withIntrospection [ gobject-introspection From 402d836002df20d4d22f140928e0d17ae68a7450 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:20:03 +0000 Subject: [PATCH 0769/2279] =?UTF-8?q?gsettings-desktop-schemas:=2048.0=20?= =?UTF-8?q?=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/48.0...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gs/gsettings-desktop-schemas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix index cb40b950a43e..8a434e4d7fa9 100644 --- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix +++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "48.0"; + version = "49.rc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-5o8VWBO/GPhlqLLI6dRzWItsytyvu2Zqt4iFfGwtG9M="; + hash = "sha256-YTbBW/NtbW+6Dd78Wx3G0HlERKPh9FE0zvlnVgxmIq0="; }; strictDeps = true; From 1a021c25101ef302ef14daca8b1c1364e16fc53f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:20:04 +0000 Subject: [PATCH 0770/2279] =?UTF-8?q?gdk-pixbuf:=202.42.12=20=E2=86=92=202?= =?UTF-8?q?.43.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/compare/2.42.12...2.43.5 Changelog-Reviewed-By: Jan Tojnar --- .../libraries/gdk-pixbuf/default.nix | 14 ++++----- .../libraries/gdk-pixbuf/static-deps.patch | 31 ------------------- 2 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/gdk-pixbuf/static-deps.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d1bebbdbbb3c..f7b613582cfb 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.42.12"; + version = "2.43.5"; outputs = [ "out" @@ -44,14 +44,12 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c="; + hash = "sha256-pyPsJChCf4V7hyffu+nat3FCoT+20MR/lSIiUa42/xU="; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch - - ./static-deps.patch ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work @@ -90,7 +88,9 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgio_sniffing=false" - (lib.mesonBool "gtk_doc" withIntrospection) + "-Dandroid=disabled" + "-Dglycin=disabled" + (lib.mesonBool "documentation" withIntrospection) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "others" true) ] @@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { # it should be a build-time dep for build # TODO: send upstream substituteInPlace docs/meson.build \ - --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \ - --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + --replace-fail "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \ + --replace-fail "'gi-docgen', req" "'gi-docgen', native:true, req" # Remove 'ani' loader until proper fix for CVE-2022-48622 substituteInPlace meson.build --replace-fail "'ani'," "" diff --git a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch deleted file mode 100644 index da52e432b4e7..000000000000 --- a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Wed, 31 Jan 2024 15:33:02 +0100 -Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep - -This should match the dependencies passed to the library() call that -creates gdkpixbuf. Otherwise, linking the gdkpixbuf_bin executables -will fail if -Ddefault_library=static, because static libraries don't -carry dependency information themselves. ---- -Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161 - - gdk-pixbuf/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index a11926eee..450484d68 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -269,7 +269,7 @@ endif - gdkpixbuf_dep = declare_dependency( - link_with: gdkpixbuf, - include_directories: root_inc, -- dependencies: gdk_pixbuf_deps, -+ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ], - sources: [ gdkpixbuf_enum_h, built_girs ], - ) - meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep) --- -GitLab - From 5efb7209b78c8651f9565036bc592e0e7ee4ce79 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:20:04 +0000 Subject: [PATCH 0771/2279] =?UTF-8?q?pango:=201.56.4=20=E2=86=92=201.57.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pango/-/compare/1.56.4...1.57.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/pa/pango/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix index aa2a81bfe635..42227dd4fc38 100644 --- a/pkgs/by-name/pa/pango/package.nix +++ b/pkgs/by-name/pa/pango/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.56.4"; + version = "1.57.0"; outputs = [ "bin" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz"; - hash = "sha256-FwZeL8xfWlvb/8iEyVa/x8RRqW6MT7L4rYN8ZBPLWgE="; + hash = "sha256-iQZAyEHa530649j+iVN4S5MPokGxdCPmEgx7/fi4kec="; }; depsBuildBuild = [ From 69bc1493bc2fa6b4f1c60d42186d7a9c80fef2eb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:20:25 +0000 Subject: [PATCH 0772/2279] =?UTF-8?q?glib:=202.84.4=20=E2=86=92=202.86.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.84.4...2.86.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gl/glib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 99e289918ecd..91ef5d200fc9 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.84.4"; + version = "2.86.0"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-ip6hCUPDb8EX4lP4DJHkd7ZzUlrkV2KUKFiu9XYxu5A="; + hash = "sha256-tXOZctc3z7DW/R5/Fj3+ZQ4uA3QLs7jUCOTR+upYDW0="; }; patches = From a29c6ae404bc71ed81156493a47fe0fa9633c8dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:12:22 +0000 Subject: [PATCH 0773/2279] =?UTF-8?q?gnome-builder:=2048.2=20=E2=86=92=204?= =?UTF-8?q?9.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/48.2...49.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-builder/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index d8b3287f780a..0aff4c67bf56 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -24,6 +24,7 @@ libspelling, libsysprof-capture, libxml2, + libyaml, meson, ninja, ostree, @@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "48.2"; + version = "49.rc"; outputs = [ "out" @@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-7BKA1H6BSjE7dMuSfVoFk4BUSqD1bodVKXg5fWx0zGM="; + hash = "sha256-sCw6Y5wRcvnAR1qZE8STqEvqmowcW44krHa5pfQKYa8="; }; patches = [ @@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { libspelling libsysprof-capture libxml2 + libyaml ostree pcre2 python3 From 3268e58f2e9b574246f1e85084fcc1d9875fa96f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:20:35 +0000 Subject: [PATCH 0774/2279] =?UTF-8?q?gi-docgen:=202025.3=20=E2=86=92=20202?= =?UTF-8?q?5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gi-docgen/-/compare/2025.3...2025.4 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gi/gi-docgen/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix index b1e6d687cd78..1ff554f2f4a5 100644 --- a/pkgs/by-name/gi/gi-docgen/package.nix +++ b/pkgs/by-name/gi/gi-docgen/package.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2025.3"; + version = "2025.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg="; + hash = "sha256-Zshl1Fn+vfteQHiojfBhg2IMPpH3JtHcYI2I7jYFUm4="; }; depsBuildBuild = [ From 813af585cfe13bb3d56c659be5e60f122afc4b4f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 7 Sep 2025 11:56:41 +0200 Subject: [PATCH 0775/2279] =?UTF-8?q?rygel:=200.44.2=20=E2=86=92=2045.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/rygel-0.44.2...45.rc Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/ry/rygel/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index ee3bb60d9310..efabb63ef3eb 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -11,7 +11,7 @@ libxml2, libxslt, gobject-introspection, - wrapGAppsHook3, + wrapGAppsHook4, wrapGAppsNoGuiHook, python3, gdk-pixbuf, @@ -25,7 +25,7 @@ libsoup_3, libX11, withGtk ? true, - gtk3, + gtk4, libmediaart, pipewire, sqlite, @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rygel"; - version = "0.44.2"; + version = "45.rc"; # TODO: split out lib outputs = [ @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchurl { - url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - hash = "sha256-eW7uSUzfYNwr+CsAuPmaFLocfPQNKUSBf/DBqmBz1aA="; + url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; + hash = "sha256-9quoTAm+RdiGcR/5I5tQ4k6T+ulI+nWScD0pfbNDzus="; }; patches = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 libxslt # for xsltproc gobject-introspection - (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook) + (if withGtk then wrapGAppsHook4 else wrapGAppsNoGuiHook) python3 ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { tinysparql shared-mime-info ] - ++ lib.optionals withGtk [ gtk3 ] + ++ lib.optionals withGtk [ gtk4 ] ++ (with gst_all_1; [ gstreamer gst-editing-services From d515e4400a306868677a8c050a28431f10c09f77 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Sep 2025 17:16:54 +0000 Subject: [PATCH 0776/2279] =?UTF-8?q?mutter:=2048.4=20=E2=86=92=2049.rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/48.4...49.rc Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/mu/mutter/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 840ed7f1d55e..01d48528b4b5 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -19,7 +19,6 @@ libadwaita, libxcvt, libGL, - libICE, libX11, libXcomposite, libXcursor, @@ -27,8 +26,6 @@ libXext, libXfixes, libXi, - libXtst, - libxkbfile, xkeyboard_config, libxkbcommon, libxcb, @@ -39,9 +36,11 @@ libdrm, libgbm, libei, + libepoxy, libdisplay-info, gsettings-desktop-schemas, glib, + libglycin, atk, gtk4, fribidi, @@ -72,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "48.4"; + version = "49.rc"; outputs = [ "out" @@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-EYnPfmPMh8/dHzqG6PFNl8M9ap2iVPI+gWVVSbbFDZM="; + hash = "sha256-nwBnr8bHV2kwNloLpW1zb6rVsqbejsmQiby2vPYpIVA="; }; mesonFlags = [ @@ -131,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { cairo egl-wayland glib + libglycin gnome-desktop gnome-settings-daemon gsettings-desktop-schemas @@ -139,8 +139,10 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz libcanberra libdrm + libadwaita libgbm libei + libepoxy libdisplay-info libGL libgudev @@ -159,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols # X11 client gtk4 - libICE libX11 libXcomposite libXcursor @@ -167,8 +168,6 @@ stdenv.mkDerivation (finalAttrs: { libXext libXfixes libXi - libXtst - libxkbfile xkeyboard_config libxkbcommon libxcb @@ -176,8 +175,9 @@ stdenv.mkDerivation (finalAttrs: { libXinerama libXau - # for gdctl shebang + # for gdctl and gnome-service-client shebangs (python3.withPackages (pp: [ + pp.dbus-python pp.pygobject3 pp.argcomplete ])) @@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; passthru = { - libmutter_api_version = "16"; # bumped each dev cycle + libmutter_api_version = "17"; # bumped each dev cycle libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}"; tests = { From b60193f10737017fe5a8f83f8ee9edb744de191d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 13 Sep 2025 22:22:34 +0800 Subject: [PATCH 0777/2279] =?UTF-8?q?nixos/tests:=20gnome-session-binary?= =?UTF-8?q?=20=E2=86=92=20gnome-session-service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/GNOME/gnome-session/commit/cb85168d2694e9c36d00ce1407882c88fadd4f59 --- nixos/tests/gnome-flashback.nix | 2 +- nixos/tests/pantheon.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 46cb6402bbb1..970842907a12 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -40,7 +40,7 @@ '' with subtest("Login to GNOME Flashback with GDM"): machine.wait_for_x() - machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') + machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"') # Wait for alice to be logged in" machine.wait_for_unit("default.target", "${user.name}") machine.wait_for_file("${xauthority}") diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 3e24bff88527..5ba36442274b 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -66,7 +66,7 @@ with subtest("Login with elementary-greeter"): machine.send_chars("${user.password}\n") - machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') + machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"') with subtest("Wait for wayland server"): machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") From 684b47132614d87b708b3261cf949fd5d83dc02f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Sep 2025 07:37:47 +0800 Subject: [PATCH 0778/2279] =?UTF-8?q?gnome-session-ctl:=2047.0.1=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/nix-community/gnome-session-ctl/compare/47.0.1...49.0 --- pkgs/by-name/gn/gnome-session/ctl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index 5aecef4ce161..47282b471728 100644 --- a/pkgs/by-name/gn/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "47.0.1"; + version = "49.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "gnome-session-ctl"; rev = version; - hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ="; + hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y="; }; nativeBuildInputs = [ From 82f1535e945216792bd54a41abe07f8f6656415f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Sep 2025 23:54:19 +0800 Subject: [PATCH 0779/2279] =?UTF-8?q?budgie-control-center:=201.4.0=20?= =?UTF-8?q?=E2=86=92=201.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/BuddiesOfBudgie/budgie-control-center/compare/v1.4.0...v1.4.1 Adjusted to GSD 49. Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/bu/budgie-control-center/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index b638f9246ba0..72e426f90db8 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -70,14 +70,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-control-center"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-control-center"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; + hash = "sha256-Je3X1V4U2t0LMxWwtoYZKEI56IS4zK/w6OL615tqKkk="; }; patches = [ From 37057183dda01af71df085b250685101284ae0af Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Sep 2025 23:54:44 +0800 Subject: [PATCH 0780/2279] =?UTF-8?q?budgie-desktop:=2010.9.2=20=E2=86=92?= =?UTF-8?q?=2010.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/BuddiesOfBudgie/budgie-desktop/compare/v10.9.2...v10.9.3 Adjusted to GSD 49. Changelog-Reviewed-By: Bobby Rong --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/by-name/bu/budgie-desktop/package.nix | 38 ++++++++-------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 86a73b8f2d6e..628ab26e4494 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -168,6 +168,8 @@ - `meilisearch_1_11` has been removed, as it is no longer supported. +- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`. + - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. - `carla` no longer support `gtk2` override. diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 71957c7f352a..78ab0acaa191 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, accountsservice, alsa-lib, budgie-screensaver, @@ -19,10 +18,12 @@ libcanberra-gtk3, libgee, libGL, + libgudev, libnotify, libpeas, libpulseaudio, libuuid, + libwacom, libwnck, magpie, libgbm, @@ -35,6 +36,7 @@ polkit, sassc, testers, + udev, upower, vala, validatePkgConfig, @@ -45,14 +47,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.9.2"; + version = "10.9.3"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo="; + hash = "sha256-hiDEsDV/meYMORZ4aSPD7UP28SQVcv6cM7N89fOZeT8="; }; outputs = [ @@ -63,27 +65,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./plugins.patch - - # Adapt to libxfce4windowing v4.19.8 - # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/627 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch"; - hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE="; - }) - - # Resolve vala 0.56.18 compact class inheritance removal - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/679 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch"; - hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws="; - }) - - # Add override for overlay-key to prevent crash with mutter-common v48-rc - # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683 - (fetchpatch { - url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch"; - hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0="; - }) ]; nativeBuildInputs = [ @@ -115,14 +96,17 @@ stdenv.mkDerivation (finalAttrs: { libcanberra-gtk3 libgee libGL + libgudev libnotify libpulseaudio libuuid + libwacom libwnck magpie libgbm polkit sassc + udev upower xfce.libxfce4windowing ]; @@ -132,6 +116,12 @@ stdenv.mkDerivation (finalAttrs: { libpeas ]; + mesonFlags = [ + # FIXME: The meson option name is confusing + # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/739#discussion_r2359421711 + "-Dbsd-libexecdir=${gnome-settings-daemon}/libexec" + ]; + passthru = { providedSessions = [ "budgie-desktop" ]; From 99f1e097ed110d51be4ffec2932d0ea5c3c3e4eb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 18 Sep 2025 00:59:29 +0800 Subject: [PATCH 0781/2279] nixos/tests/budgie: Adjust to Budgie 10.9.3 Restore the wait_for_x test since our XDG_CURRENT_DESKTOP changed. See the `session_is_systemd_aware` part in nixos/modules/services/x11/display-managers/default.nix. --- nixos/tests/budgie.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index b003e1c65240..6fbf13ca9111 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -42,13 +42,7 @@ in '' with subtest("Wait for login"): - # wait_for_x() checks graphical-session.target, which is expected to be - # inactive on Budgie before Budgie manages user session with systemd. - # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16 - # - # Previously this was unconditionally touched by xsessionWrapper but was - # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP). - # machine.wait_for_x() + machine.wait_for_x() machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"') machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") @@ -58,8 +52,9 @@ machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if Budgie session components actually start"): - for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]: - machine.wait_until_succeeds(f"pgrep -f {i}") + for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "bsd-media-keys", "gsd-xsettings"]: + machine.wait_until_succeeds(f"pgrep {i}") + machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/org.buddiesofbudgie.budgie-desktop-view") # We don't check xwininfo for budgie-wm. # See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754 machine.wait_for_window("budgie-daemon") @@ -67,7 +62,7 @@ with subtest("Check if various environment variables are set"): cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ" - machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'") + machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie'") machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'") # From the nixos/budgie module machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'") From 1ce3226d1579a8d5143664f96e519d29ed1498fb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Oct 2025 16:43:41 +0200 Subject: [PATCH 0782/2279] nixos/gnome-initial-setup: Create group User is now created dynamically by GDM (though we did not create it ourselves previously): https://github.com/GNOME/gnome-initial-setup/commit/3ced516c03c5267d0b11dc8649e837f05fc8bfa3 --- .../modules/services/desktops/gnome/gnome-initial-setup.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index e0241f02b969..81779c282db2 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -89,6 +89,11 @@ in programs.dconf.profiles.gnome-initial-setup.databases = [ "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults" ]; + + users = { + # TODO: switch to using provided gnome-initial-setup sysusers.d + groups.gnome-initial-setup = { }; + }; }; } From 1ab8a3e101a3b4b7e2497e02fd75ddb0bc55ea70 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Oct 2025 16:45:36 +0200 Subject: [PATCH 0783/2279] nixos/gnome-initial-setup: Remove gnome-welcome-tour service dependency This has been dropped in GNOME 40: https://github.com/GNOME/gnome-initial-setup/commit/2bf1bcaa81c8733665cc33be78652969dd07cd9e --- nixos/modules/services/desktops/gnome/gnome-initial-setup.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index 81779c282db2..cf22fc7e5ce6 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -79,7 +79,6 @@ in systemd.user.targets."gnome-session".wants = [ "gnome-initial-setup-copy-worker.service" "gnome-initial-setup-first-login.service" - "gnome-welcome-tour.service" ]; systemd.user.targets."gnome-session@gnome-initial-setup".wants = [ From cf7ed31fe1bc9f2f4b8d1e563bd824f64dbbad47 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Oct 2025 16:58:54 +0200 Subject: [PATCH 0784/2279] nixos/gnome-initial-setup: Adjust service dependencies `gnome-initial-setup-copy-worker.service` was moved from `gnome-session.target.wants` to `basic.target.wants/` in GNOME 46.1: https://github.com/GNOME/gnome-initial-setup/commit/34680e68e049c83eda8ea4dbd0ea3f2fbbf00c89 And now GNOME 49 moved it again to `graphical-session-pre.target.wants/`: https://github.com/GNOME/gnome-initial-setup/commit/40c3de824c13f240e27567307b0ebaf4363e4f42 --- nixos/modules/services/desktops/gnome/gnome-initial-setup.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index cf22fc7e5ce6..f12113251d6a 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -78,6 +78,9 @@ in systemd.user.targets."gnome-session".wants = [ "gnome-initial-setup-copy-worker.service" + ]; + + systemd.user.targets."graphical-session-pre".wants = [ "gnome-initial-setup-first-login.service" ]; From 9890d02c0a28e3284c939f28131d9591308dd0af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Oct 2025 17:56:12 +0200 Subject: [PATCH 0785/2279] nixos/gnome: Install GNOME Software using module gnome-software now uses systemd instead of autostart so we need to add it to `systemd.packages`: https://github.com/GNOME/gnome-software/commit/08805775079ef6190792f254b799cd920f248d7c --- nixos/modules/module-list.nix | 1 + .../services/desktop-managers/gnome.nix | 63 +++++++++---------- .../desktops/gnome/gnome-software.nix | 28 +++++++++ 3 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 nixos/modules/services/desktops/gnome/gnome-software.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b7c5b0d507f9..eb1edd1d698f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -569,6 +569,7 @@ ./services/desktops/gnome/gnome-online-miners.nix ./services/desktops/gnome/gnome-remote-desktop.nix ./services/desktops/gnome/gnome-settings-daemon.nix + ./services/desktops/gnome/gnome-software.nix ./services/desktops/gnome/gnome-user-share.nix ./services/desktops/gnome/localsearch.nix ./services/desktops/gnome/rygel.nix diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 91f4002e59d7..3c91a9f30c2a 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -444,38 +444,31 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst (lib.mkIf serviceCfg.core-apps.enable { - environment.systemPackages = utils.removePackagesByName ( - [ - pkgs.baobab - pkgs.decibels - pkgs.epiphany - pkgs.gnome-text-editor - pkgs.gnome-calculator - pkgs.gnome-calendar - pkgs.gnome-characters - pkgs.gnome-clocks - pkgs.gnome-console - pkgs.gnome-contacts - pkgs.gnome-font-viewer - pkgs.gnome-logs - pkgs.gnome-maps - pkgs.gnome-music - pkgs.gnome-system-monitor - pkgs.gnome-weather - pkgs.loupe - pkgs.nautilus - pkgs.gnome-connections - pkgs.simple-scan - pkgs.snapshot - pkgs.totem - pkgs.yelp - ] - ++ lib.optionals config.services.flatpak.enable [ - # Since PackageKit Nix support is not there yet, - # only install gnome-software if flatpak is enabled. - pkgs.gnome-software - ] - ) config.environment.gnome.excludePackages; + environment.systemPackages = utils.removePackagesByName [ + pkgs.baobab + pkgs.decibels + pkgs.epiphany + pkgs.gnome-text-editor + pkgs.gnome-calculator + pkgs.gnome-calendar + pkgs.gnome-characters + pkgs.gnome-clocks + pkgs.gnome-console + pkgs.gnome-contacts + pkgs.gnome-font-viewer + pkgs.gnome-logs + pkgs.gnome-maps + pkgs.gnome-music + pkgs.gnome-system-monitor + pkgs.gnome-weather + pkgs.loupe + pkgs.nautilus + pkgs.gnome-connections + pkgs.simple-scan + pkgs.snapshot + pkgs.totem + pkgs.yelp + ] config.environment.gnome.excludePackages; # Enable default program modules # Since some of these have a corresponding package, we only @@ -488,6 +481,12 @@ in programs.seahorse.enable = notExcluded pkgs.seahorse; services.gnome.sushi.enable = notExcluded pkgs.sushi; + # Since PackageKit Nix support is not there yet, + # only install gnome-software if flatpak is enabled. + services.gnome.gnome-software.enable = lib.mkIf config.services.flatpak.enable ( + notExcluded pkgs.gnome-software + ); + # VTE shell integration for gnome-console programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix new file mode 100644 index 000000000000..ced2549a9e21 --- /dev/null +++ b/nixos/modules/services/desktops/gnome/gnome-software.nix @@ -0,0 +1,28 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + meta = { + maintainers = lib.teams.gnome.members; + }; + + options = { + services.gnome.gnome-software = { + enable = lib.mkEnableOption "GNOME Software, package manager for GNOME"; + }; + }; + + config = lib.mkIf config.services.gnome.gnome-software.enable { + environment.systemPackages = [ + pkgs.gnome-software + ]; + + systemd.packages = [ + pkgs.gnome-software + ]; + }; +} From f78aead5196395822ba545ad4de8789524c7ed26 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 5 Oct 2025 01:21:32 +0200 Subject: [PATCH 0786/2279] nixos/orca: Remove from display-manager path GDM no longer includes `orca-autostart.desktop`: https://github.com/GNOME/gdm/commit/cb0a3d4deb0ba01cf4277621f2b8ccfa527b4af3 --- nixos/modules/services/accessibility/orca.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix index 8f6420ab1f92..2ae7c4514edd 100644 --- a/nixos/modules/services/accessibility/orca.nix +++ b/nixos/modules/services/accessibility/orca.nix @@ -21,9 +21,6 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; - systemd.services.display-manager = lib.mkIf config.services.displayManager.enable { - path = [ cfg.package ]; - }; services.speechd.enable = true; }; } From b0bede13931316d81cb5752ace18de8f89f32e77 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:03 +0000 Subject: [PATCH 0787/2279] =?UTF-8?q?gnome-characters:=2049.rc=20=E2=86=92?= =?UTF-8?q?=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-characters/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index e1ed63613791..a619b7aa49eb 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; - hash = "sha256-hPOWE1KkI0DlZ4oQig8D6Fs7YQRA5dVCL8WNucKPwEM="; + hash = "sha256-G25UioLiaqTsmv5AnWmiVwk2LAN/pcUzGG1qHbKa9uM="; }; nativeBuildInputs = [ From b6951ffeb4b5e0714b053dea7e6fffac3dad8bbe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:03 +0000 Subject: [PATCH 0788/2279] =?UTF-8?q?gnome-terminal:=203.56.2=20=E2=86=92?= =?UTF-8?q?=203.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-terminal/-/compare/3.56.2...3.58.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-terminal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index 2bae985a569d..3569ddfa5543 100644 --- a/pkgs/by-name/gn/gnome-terminal/package.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-terminal"; - version = "3.56.2"; + version = "3.58.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz"; - hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg="; + hash = "sha256-B+vHrxNRa+Wzd3f1INJkCzMSBiDpm7sF3upfgoD9ac4="; }; nativeBuildInputs = [ From c0b22e08d49059effbe0a7b25f8d36f28cf548c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:08 +0000 Subject: [PATCH 0789/2279] =?UTF-8?q?gnome-initial-setup:=2049.beta.1=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/49.beta.1...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-initial-setup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index 2da96c9dd740..7ac614841bc4 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-initial-setup"; - version = "49.beta.1"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz"; - hash = "sha256-XfzEnnXQHV243xLRV7c8IE5ppsJ+agDjtUxyzD9lMmc="; + hash = "sha256-KiixpAugiYaRiTBY9hggfemykj17pXpUeQ5aztztzPg="; }; patches = [ From 914a4a9f3795619537d24479783440bd3323e161 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:09 +0000 Subject: [PATCH 0790/2279] =?UTF-8?q?gnome-mahjongg:=2049.rc=20=E2=86=92?= =?UTF-8?q?=2049.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/compare/49.rc...49.0.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-mahjongg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix index 6fb601fa5638..87afee2674f3 100644 --- a/pkgs/by-name/gn/gnome-mahjongg/package.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-mahjongg"; - version = "49.rc"; + version = "49.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major finalAttrs.version}/gnome-mahjongg-${finalAttrs.version}.tar.xz"; - hash = "sha256-Cv9a/PLHefyp51aXs7A4GWUdlCXLBsM6LMuMkurF5uA="; + hash = "sha256-RbOkjcse1hiaY7a/VVCOizjrWpVmV6f+KlIlzC+LwTI="; }; nativeBuildInputs = [ From e2a8f13f04d3d4ec98d598757db3dbc54c276416 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:15 +0000 Subject: [PATCH 0791/2279] =?UTF-8?q?d-spy:=2048.0=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/d-spy/-/compare/48.0...49.1 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/d-/d-spy/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix index 36ecd9d1a4d4..449742760ca2 100644 --- a/pkgs/by-name/d-/d-spy/package.nix +++ b/pkgs/by-name/d-/d-spy/package.nix @@ -7,6 +7,7 @@ gettext, gtk4, libadwaita, + libdex, meson, ninja, pkg-config, @@ -16,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "d-spy"; - version = "48.0"; + version = "49.1"; outputs = [ "out" @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz"; - hash = "sha256-D3oJAZBGGU2X/Dw0KzhOocOA4Qqc/IAlv83lfVlcODA="; + hash = "sha256-4m4YEg5k1FG2HyAs+qORNienAxwqlUrs85HIPYPQnYo="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita + libdex ]; passthru = { From a2ded1d74261541c7a0ad4696c6f29ee94ce8493 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:20 +0000 Subject: [PATCH 0792/2279] =?UTF-8?q?gnome-font-viewer:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-font-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index fa5d03913518..95c425477b6e 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; - hash = "sha256-G5UajKOMXX4UHb5kL2NRikmaJgmoEIcq4QV1m9RUCdA="; + hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ="; }; doCheck = true; From df99cd602128ec196f4447fd4c5a51d55e6fa93d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:20 +0000 Subject: [PATCH 0793/2279] =?UTF-8?q?gnome-calendar:=2049.rc=20=E2=86=92?= =?UTF-8?q?=2049.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/49.rc...49.0.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-calendar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index c071e94830cc..37bc7f32d6a8 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "49.rc"; + version = "49.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; - hash = "sha256-gOLNpazuDytcfiFmY0+1nv5zTtmD375cU/AbEIiAHzI="; + hash = "sha256-4L/k6hCUItraB0Xdj4wOAjCriCB3ENHAfiRTIs+RP/I="; }; nativeBuildInputs = [ From d01e7ad6fcd71cd76b9b7b7bee01ac00d1edc61c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:26 +0000 Subject: [PATCH 0794/2279] =?UTF-8?q?gnome-console:=2049.rc=20=E2=86=92=20?= =?UTF-8?q?49.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-console/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index 54c1887035a9..e6c37c1433de 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-+TP+13m/fP2HPZ93NfZwSdXyEhWlRGiMGuO+ULGQZsk="; + hash = "sha256-no6WRvRz0B9LSnvOLEetImtK6D+r8ky7tKyU9qxdXMI="; }; nativeBuildInputs = [ From 35edb5e76786148f69427bd375e7cfa0706d3ade Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:30 +0000 Subject: [PATCH 0795/2279] =?UTF-8?q?xdg-desktop-portal-gnome:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix index 1a28e7908b34..ac116af4e2ff 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; - hash = "sha256-JgB422chatw3I3g2lvrtq6hxkVgdgLT0BfYkrwFqTa4="; + hash = "sha256-QB2vzfjLkR8JwI0oE/d03YZBJ6v8qT/0yvH8TJtexNI="; }; nativeBuildInputs = [ From bd31ff2e5ef013028bdee0586b1ad9c64dd81069 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:32 +0000 Subject: [PATCH 0796/2279] =?UTF-8?q?gnome-logs:=2049.rc=20=E2=86=92=2049.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-logs/-/compare/49.rc...49.0 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-logs/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix index 0decabbe7d35..bd83e74d52a4 100644 --- a/pkgs/by-name/gn/gnome-logs/package.nix +++ b/pkgs/by-name/gn/gnome-logs/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + appstream, meson, ninja, pkg-config, @@ -23,14 +24,15 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz"; - hash = "sha256-FgqCL/N2Wgl6xFsbRSyGZajMJFQF1CH5/xZMk2q3hV4="; + hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU="; }; nativeBuildInputs = [ + appstream meson ninja pkg-config From 06a3f93da7f8a5e4c11b171256d48a931fee4443 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:38 +0000 Subject: [PATCH 0797/2279] =?UTF-8?q?gnome-chess:=2049.0=20=E2=86=92=2049.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-chess/-/compare/49.0...49.2 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-chess/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix index d23311b60968..f1001c6026aa 100644 --- a/pkgs/by-name/gn/gnome-chess/package.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "49.0"; + version = "49.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; - hash = "sha256-QDST8Bbpkn1/nFR3O7ydCpNB8+751DF7Re3AqwoiyI8="; + hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA="; }; nativeBuildInputs = [ From 063f246e5c111becd6e4a0c479cddc488fb70c5c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:38 +0000 Subject: [PATCH 0798/2279] =?UTF-8?q?gnome-applets:=203.56.0=20=E2=86=92?= =?UTF-8?q?=203.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-applets/-/compare/3.56.0...3.58.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-applets/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index e5f866eac2ce..5d8b8178a4b4 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-applets"; - version = "3.56.0"; + version = "3.58.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz"; - hash = "sha256-+heu3JVa3ZgaouQ7TAcTU/aGu9HuwdcXqJCnNTIK0XE="; + hash = "sha256-5h7bcTRNzV2qbnF137snSnWL6LWEUnc1abs1ZFuFojg="; }; nativeBuildInputs = [ From d536642d484d1b82fa5811b1526f06f9c2e4f05c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:42 +0000 Subject: [PATCH 0799/2279] =?UTF-8?q?gnome-software:=2049.rc=20=E2=86=92?= =?UTF-8?q?=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-software/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index fcc05a6db6f7..780f34638a5b 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-8dCgESrFUhKMR6etrMXhf0/KgEFmfgY4yVgjwKKFOLM="; + hash = "sha256-NpzXVD8KS+mjNzPeCvFWNIJmw7XKyqTkc3lZ59FOBB8="; }; patches = [ From bcfd5e8d9cbcf024d355ee1fa30bc85c8a4f34ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:49 +0000 Subject: [PATCH 0800/2279] =?UTF-8?q?decibels:=2048.0=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/decibels/-/compare/48.0...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/de/decibels/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix index dbfb975e1530..2f629f9d17ff 100644 --- a/pkgs/by-name/de/decibels/package.nix +++ b/pkgs/by-name/de/decibels/package.nix @@ -17,11 +17,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "decibels"; - version = "48.0"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/decibels/${lib.versions.major finalAttrs.version}/decibels-${finalAttrs.version}.tar.xz"; - hash = "sha256-IpsRqSYxR7y4w+If8NSvZZ+yYmL4rs5Uetz4xl4DH3Q="; + hash = "sha256-KbebouKWfmkUHjnwrSxnfjj+P/ufug+lx1MflNP2c8o="; }; nativeBuildInputs = [ From 75f064cff1e58d92fbdd2fcced21d17bbf59be62 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:06:53 +0000 Subject: [PATCH 0801/2279] =?UTF-8?q?gnome-calculator:=2049.rc=20=E2=86=92?= =?UTF-8?q?=2049.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/49.rc...49.0.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-calculator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index 2c9a96e7199d..a46838c3c8f8 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "49.rc"; + version = "49.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; - hash = "sha256-C6zLYVCfc/Kp+MiUUNzywyAdcvXWjWk77lGZRdgeo4A="; + hash = "sha256-7L4g5jBXX7i8I3kNNfOGrBd5ADxA3FyHfTzS2g/HRT8="; }; nativeBuildInputs = [ From 6bd7a07e81c8eb562f239e060a3fee6c2df567b7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:02 +0000 Subject: [PATCH 0802/2279] =?UTF-8?q?gnome-text-editor:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-text-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 064ffc44ec94..4953f1aca8f3 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-WpKly7oFXBLj2pV/FxIjvmibaoDnglcBSEc582Q0tDE="; + hash = "sha256-jkOwz6gVLNPHYw3lZd4taTDoh88ti4RID7+FOivCyKY="; }; nativeBuildInputs = [ From 4732ae93bb4b6bc338f928e23c5b37a43fd4b3ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:03 +0000 Subject: [PATCH 0803/2279] =?UTF-8?q?simple-scan:=2049.0=20=E2=86=92=2049.?= =?UTF-8?q?0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/simple-scan/-/compare/49.0...49.0.1 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/si/simple-scan/package.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index c5cde96f74e9..9e54bf337c77 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchurl, meson, ninja, pkg-config, @@ -20,20 +20,17 @@ libxml2, sane-backends, vala, - gitUpdater, + gnome, gobject-introspection, }: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "49.0"; + version = "49.0.1"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "simple-scan"; - tag = version; - hash = "sha256-CZNbw6Ve91bhF5ItsJYOhyUy4CsimXrTLIQBRDhnzFU="; + src = fetchurl { + url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz"; + hash = "sha256-4ZdiQiZj70v1059udfTWGo3hgTcpqW5X4E6Bdk4B6uI="; }; nativeBuildInputs = [ @@ -64,9 +61,8 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gitUpdater { - # Ignore tags like 48.1-2, which actually does not introduce any changes. - ignoredVersions = "-"; + updateScript = gnome.updateScript { + packageName = "simple-scan"; }; }; From f2315ca6444afe26803eb53e684c89e470f39a09 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:08 +0000 Subject: [PATCH 0804/2279] =?UTF-8?q?orca:=2049.beta=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/49.beta...49.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/or/orca/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 850e9e846637..95c5142cb46b 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "49.beta"; + version = "49.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-uS+iewqn7yqZYRo6SWLfIXToV/3MKrH8mHTHX3BSPw8="; + hash = "sha256-ZTKWhs0V9iq05MDQDOuYTUmbKOwsURdQjDuCiQ1i5+M="; }; patches = [ From 0514c61c11081d2b6f0f865481103e3c59f761a6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:14 +0000 Subject: [PATCH 0805/2279] =?UTF-8?q?gnome-tour:=2048.1=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tour/-/compare/48.1...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-tour/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix index 17bf79a473bb..a6a415130fd1 100644 --- a/pkgs/by-name/gn/gnome-tour/package.nix +++ b/pkgs/by-name/gn/gnome-tour/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-tour"; - version = "48.1"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz"; - hash = "sha256-uKA7JXTrlWq+mvFBQWHMsX+DDVNgC5wEmc7zu29BJ8U="; + hash = "sha256-LX2KKgzRF4BjpBTaWAk9JsD7GndgjYrX+9eRGl1iZNM="; }; cargoVendorDir = "vendor"; From ff21e037785aeaa39f845b5c1937bd2c43c3c29f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:25 +0000 Subject: [PATCH 0806/2279] =?UTF-8?q?gnome-contacts:=2049.beta=20=E2=86=92?= =?UTF-8?q?=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-contacts/-/compare/49.beta...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-contacts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix index 2e5347038a74..57f1fcf4655b 100644 --- a/pkgs/by-name/gn/gnome-contacts/package.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "49.beta"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; - hash = "sha256-miIJ8lAH3GpJ2IbcFkCJhgjynaWY1SOgC0zfjbP5dNY="; + hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8="; }; nativeBuildInputs = [ From 8b93156a580d50f3c1243593231bd90800da8681 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:37 +0000 Subject: [PATCH 0807/2279] =?UTF-8?q?gnome-boxes:=2049.rc.1=20=E2=86=92=20?= =?UTF-8?q?49.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/49.rc.1...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-boxes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix index 1ab7e42b5733..a2a4547ba5ef 100644 --- a/pkgs/by-name/gn/gnome-boxes/package.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "49.rc.1"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; - hash = "sha256-/cqOCR8CtSC+R7Y7kVhFV/GCWWb2jjnqTqsl6FxET8U="; + hash = "sha256-+kcmbab173qQTFuHadTYcbzNTmtjmjY8MjVDjXsOdXo="; }; patches = [ From e7cab4934531f1af73d3785390f3c3e760e204ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:41 +0000 Subject: [PATCH 0808/2279] =?UTF-8?q?gnome-builder:=2049.rc=20=E2=86=92=20?= =?UTF-8?q?49.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-builder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index 0aff4c67bf56..fa090a43883e 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "49.rc"; + version = "49.0"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-sCw6Y5wRcvnAR1qZE8STqEvqmowcW44krHa5pfQKYa8="; + hash = "sha256-1FmQ22gfle4id75PqfKWSYJwfb3zATCgvecCNLN59WI="; }; patches = [ From f4dcdf8d9dc6647376b6f05c04d36a89270d382c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:44 +0000 Subject: [PATCH 0809/2279] =?UTF-8?q?loupe:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/loupe/-/compare/49.rc...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/lo/loupe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 4fa09136796e..852bef596c32 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-7HSVdZH8tA9cTL9IoZJWLgMCw0OuHusF0DsmDYKIJdQ="; + hash = "sha256-os5VTo5eHRa4NuRvFlJ2fbK7O9T33KqH8laa8QuGOTg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "loupe-deps-${finalAttrs.version}"; - hash = "sha256-IywuPEFyLOwjIwK/P/z7Z6yami8nq7usLE1W23ElIjU="; + hash = "sha256-56yU5h+ZMSX6PH2jkboBwV0IMlcJI9i1sJZx4nNYJe4="; }; postPatch = '' From a5333c2a267f99399f234a04dc45db0b9addd673 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:46 +0000 Subject: [PATCH 0810/2279] =?UTF-8?q?gnome-control-center:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index b89735a3fb25..4183fdc0a60c 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -76,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-DL9Y5KD9UVdB83b0NHFd52R9mz2QrwhvksOrt4liIkI="; + hash = "sha256-pdjc4qAooAR+hnQ8J3J33os1oGPUSDNgSuo+ieqFn5c="; }; patches = [ From fac92f9a8e29f1939f56c81b548378565b66b29b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:52 +0000 Subject: [PATCH 0811/2279] =?UTF-8?q?gnome-weather:=2049.rc=20=E2=86=92=20?= =?UTF-8?q?49.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-weather/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-weather/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix index 28cda25d8406..4b4ec42b2d25 100644 --- a/pkgs/by-name/gn/gnome-weather/package.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-weather"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz"; - hash = "sha256-gFwVmU12o1ap5+95AgCNnM2vNsqmpxD5PwuQWLHlgaw="; + hash = "sha256-7h92uF66nbDI1cAgQanYXs3SKrtexrs/8yIlkpwPzl8="; }; nativeBuildInputs = [ From b4cad665d313b211ea1bf70a132b38ec392644f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:56 +0000 Subject: [PATCH 0812/2279] =?UTF-8?q?gnome-connections:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-connections/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-connections/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix index 9e120fd0e682..4694bc8cab2e 100644 --- a/pkgs/by-name/gn/gnome-connections/package.nix +++ b/pkgs/by-name/gn/gnome-connections/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-connections"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz"; - hash = "sha256-Y+lApq2dV+K/vIJo0IHglrKWajGrzhAS86+S8HcrJwM="; + hash = "sha256-Oh+UZrpUkUdHI1+uIexuoybJf2+NAJDLmc+worJMc54="; }; nativeBuildInputs = [ From 24903fbacb15bdd51f69c9473d1e658c5205e67b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:07:56 +0000 Subject: [PATCH 0813/2279] =?UTF-8?q?baobab:=2048.0=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/48.0...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/ba/baobab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index d6355480fcb5..8aec38204f3c 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "48.0"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz"; - hash = "sha256-VFklBNSdgH8jWRvn5+7xDGyd/LesUnuBw6zVh4eyb9o="; + hash = "sha256-GVwBgtxNf2lN0LTuNucuD0q3V4JfwjgjNAnuwt9IP64="; }; nativeBuildInputs = [ From b6e14b9606cd987553bd9bfc6c5386ee1219074d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:04 +0000 Subject: [PATCH 0814/2279] =?UTF-8?q?gnome-tweaks:=2049.rc=20=E2=86=92=204?= =?UTF-8?q?9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tweaks/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-tweaks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index fc9b15f063aa..c01b3e3e4ffb 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "49.rc"; + version = "49.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-NON85In7878A8EIlO2wDW1/K5ZyVuOVSuKBgT+TpKfQ="; + hash = "sha256-s5Cb3LSQW2hCfWq1geAfQ23/jlwKOJseCxRQDxiAbrs="; }; nativeBuildInputs = [ From da4ba69aad3abe22933c584869a53774505b2ea6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:09 +0000 Subject: [PATCH 0815/2279] =?UTF-8?q?gnome-system-monitor:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-system-monitor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index 6c916060a014..4bb82e4f716b 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-system-monitor"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz"; - hash = "sha256-1bYnt/NM+OSCCmx9rKWtIy3HxOQMLBU/KHa0NWO75zA="; + hash = "sha256-3MhE3XDkoHfwZlJNvRT5z+BLCYMdcLfWmlGBZyPNSqA="; }; patches = [ From 3d97a7fc1f0e7b215e3a0a247720c176329702c5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:15 +0000 Subject: [PATCH 0816/2279] =?UTF-8?q?rygel:=2045.rc=20=E2=86=92=2045.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/45.rc...45.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/ry/rygel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index efabb63ef3eb..d1b8b42e588e 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rygel"; - version = "45.rc"; + version = "45.0"; # TODO: split out lib outputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - hash = "sha256-9quoTAm+RdiGcR/5I5tQ4k6T+ulI+nWScD0pfbNDzus="; + hash = "sha256-gmZ7kC/AZy5kz5HrcnpwE3qP3+ej2aTBWLD0sfxwCII="; }; patches = [ From 2d30994dfe523482f3f7c79eceed223f6982d3b4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:21 +0000 Subject: [PATCH 0817/2279] =?UTF-8?q?snapshot:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/snapshot/-/compare/49.rc...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/sn/snapshot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix index 8fd1f8bc095f..8c8a480bfeb1 100644 --- a/pkgs/by-name/sn/snapshot/package.nix +++ b/pkgs/by-name/sn/snapshot/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-S7ivkP/sn/MmIS8ElqA336J3/v6fj5sPAWYpQQ3hK0M="; + hash = "sha256-X5YZPSkZxzVXRdJqGwHyPDyzCpPHQtWD7EKSfEpFrhg="; }; patches = [ From 5fdcabd7accf6866789f454fe3532366addb4e01 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:26 +0000 Subject: [PATCH 0818/2279] =?UTF-8?q?gnome-mines:=2049.rc=20=E2=86=92=2049?= =?UTF-8?q?.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-mines/-/compare/49.rc...49.0.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-mines/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix index 061b71374b7b..d33b2108f958 100644 --- a/pkgs/by-name/gn/gnome-mines/package.nix +++ b/pkgs/by-name/gn/gnome-mines/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-mines"; - version = "49.rc"; + version = "49.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz"; - hash = "sha256-mPDYj+F1MyIgEATYYRnHVZXZO6mcNYLDgoO5rw+CdKg="; + hash = "sha256-iwygXAM7PCWZyZL4jr2UyysMjjiOoMAq5x2yb0P1bIQ="; }; nativeBuildInputs = [ From c5f13e8f00c33ca1f329adedafac7dcf39b47e3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:32 +0000 Subject: [PATCH 0819/2279] =?UTF-8?q?nautilus-python:=204.0.1=20=E2=86=92?= =?UTF-8?q?=204.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus-python/-/compare/4.0.1...4.1.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/na/nautilus-python/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix index decd2c848b6e..e9a76b856ad9 100644 --- a/pkgs/by-name/na/nautilus-python/package.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus-python"; - version = "4.0.1"; + version = "4.1.0"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor finalAttrs.version}/nautilus-python-${finalAttrs.version}.tar.xz"; - hash = "sha256-/EnBBPsyoK0ZWmawE2eEzRnRDYs+jVnV7n9z6PlOko8="; + hash = "sha256-/EpEi8yxoJtohlQJueKu0XHSii1ayA975E9fzKhO4ME="; }; patches = [ From e98ff8b8ae67492a76b0f5c9932329d4b245f3e6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:36 +0000 Subject: [PATCH 0820/2279] =?UTF-8?q?gnome-firmware:=2047.0=20=E2=86=92=20?= =?UTF-8?q?49.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gnome-firmware/-/compare/47.0...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-firmware/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix index 2821adcbff51..5684b2c931fa 100644 --- a/pkgs/by-name/gn/gnome-firmware/package.nix +++ b/pkgs/by-name/gn/gnome-firmware/package.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-firmware"; - version = "47.0"; + version = "49.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = finalAttrs.version; - sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ="; + sha256 = "sha256-3uU0N40O1eoK5JHWMwacSrBzOTq/c+qYwoH9kBOsqrM="; }; nativeBuildInputs = [ From eb0d37ff8c2b00823188a877149d3f9eabe930a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:45 +0000 Subject: [PATCH 0821/2279] =?UTF-8?q?gnome-maps:=2049.rc=20=E2=86=92=2049.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/49.rc...49.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-maps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 10da5d27fb00..df2278c38256 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "49.rc"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-J9sX7hVDZkGdrXhUVjMptZNaDFhaPuRyZXdnjkN1qHM="; + hash = "sha256-QG+qUc5zo/iWpKFTBX+gLqp4y4LUjxHbRECDCUl1a+w="; }; doCheck = !stdenv.hostPlatform.isDarwin; From a2d817bcceaa8a56f8c89b76fb2fb05ab7d0c52d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:08:48 +0000 Subject: [PATCH 0822/2279] =?UTF-8?q?yelp:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/ye/yelp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix index 4e87d6b382fc..197b9a79dff1 100644 --- a/pkgs/by-name/ye/yelp/package.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yelp"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz"; - hash = "sha256-C0j4gV1tYn4oR0hooW4SLEqNjoi8IP++yEJ2bFqQYsg="; + hash = "sha256-5mFOCx9Lpf57jRSb3UJnPwMGVvvc1zaumGBxkZfGNFc="; }; nativeBuildInputs = [ From d6d1c392fcd154bd11d1173e7b6b7e8aef154d92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:02 +0000 Subject: [PATCH 0823/2279] =?UTF-8?q?metacity:=203.57.1=20=E2=86=92=203.58?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/metacity/-/compare/3.57.1...3.58.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/me/metacity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index 63441282bb52..74bc821b8073 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "metacity"; - version = "3.57.1"; + version = "3.58.1"; src = fetchurl { url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor finalAttrs.version}/metacity-${finalAttrs.version}.tar.xz"; - hash = "sha256-EpOibk3t/UvyALW7eIZzAIl5rjrG0wU/fbSBuHrMfN4="; + hash = "sha256-5DDIqSQJ7y+RpNq9UKcePTu8xHSj3sHK7DgTs4HX0bA="; }; nativeBuildInputs = [ From 342dc216a5b75993e8f228358642d238a6e0f987 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:09 +0000 Subject: [PATCH 0824/2279] =?UTF-8?q?gnome-session:=2049.rc=20=E2=86=92=20?= =?UTF-8?q?49.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/49.rc...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-session/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 4823b4cc4b8b..7bc805c8bc09 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "49.rc"; + version = "49.0"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-xr7cRcosGWvLsSV5rgazg2o+7U2E4DxSIEN2Qc5f+Ic="; + hash = "sha256-WnViLmPRt1FFyevmfoKDZ6dfWs5LYjf2TlRmHmpUXvM="; }; patches = [ From 18368dd851bf4a63d36f212523fc1061066f7ce1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:10 +0000 Subject: [PATCH 0825/2279] =?UTF-8?q?gnome-music:=2049.rc=20=E2=86=92=2049?= =?UTF-8?q?.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/49.rc...49.0.2 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-music/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 89921c9ee44d..6ccdb0a3ebce 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "49.rc"; + version = "49.0.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; - hash = "sha256-Zy77vtztuK8rTrDPpUxIzNmyhldbq9ull03kBT3A/Sc="; + hash = "sha256-m5dJQgC7qoew7YhJJVQw1WwVjVG03qe+aIn3dWGpVKc="; }; nativeBuildInputs = [ From 218a6d93cb88eb5c9519af2d73651ae1d934b690 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:20 +0000 Subject: [PATCH 0826/2279] =?UTF-8?q?epiphany:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/ep/epiphany/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index c8267e7d9f2e..30eedb952f62 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-TnUAK4bqFGaYEBvIYgTIrSivMZ5jOKwV4m/1wznx5JQ="; + hash = "sha256-Jx7HNbmDa5dEnjJ5PTVKivtrn40tPXWCGIXV4VVweSk="; }; nativeBuildInputs = [ From c1c43db26dcbce7674fe96ae6a57d03eebd3a1cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:20 +0000 Subject: [PATCH 0827/2279] =?UTF-8?q?quadrapassel:=2049.rc=20=E2=86=92=204?= =?UTF-8?q?9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/quadrapassel/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/qu/quadrapassel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 04952a443542..87259d17b568 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; - hash = "sha256-Mr71UXopmxkapqwi0XMDJZBhN15MYyadMpwOVt7bEP4="; + hash = "sha256-VFMe3w+apmk2qjQHmvzCpcAAJfQBaMr7frsduPJC7uE="; }; nativeBuildInputs = [ From 5c4e280cb4cef8ebab6fe46f70f463406f046f2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:27 +0000 Subject: [PATCH 0828/2279] =?UTF-8?q?gnome-sudoku:=2049.rc=20=E2=86=92=204?= =?UTF-8?q?9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-sudoku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index b3614dede995..8ad06d26f85a 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-geldehr6Fdc4Bc6wgeSgnC4Qn993B2+Di8gamziMXus="; + hash = "sha256-CzfN4geSLJpKiiIV4s3+nzL0AWHSi2An+aaRMCW1CrU="; }; nativeBuildInputs = [ From 2a6f67290d1e4cdda3ebf7421a01324c507298c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:33 +0000 Subject: [PATCH 0829/2279] =?UTF-8?q?gnome-flashback:=203.56.0=20=E2=86=92?= =?UTF-8?q?=203.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-flashback/-/compare/3.56.0...3.58.0 Changelog-Reviewed-By: Bobby Rong Co-authored-by: Bobby Rong --- .../services/desktop-managers/gnome.nix | 10 ++- nixos/tests/gnome-flashback.nix | 13 +++- pkgs/by-name/gn/gnome-flashback/package.nix | 73 ++++++++----------- 3 files changed, 47 insertions(+), 49 deletions(-) diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 3c91a9f30c2a..62b6df1ed4e4 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -297,8 +297,12 @@ in systemd.packages = [ pkgs.gnome-flashback + pkgs.metacity + (pkgs.gnome-panel-with-modules.override { + panelModulePackages = cfg.flashback.panelModulePackages; + }) ] - ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms; + ++ map pkgs.gnome-flashback.mkSystemdTargetForWm cfg.flashback.customSessions; environment.systemPackages = [ pkgs.gnome-flashback @@ -311,9 +315,7 @@ in wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; } ) flashbackWms) # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session - ++ (map ( - wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; } - ) flashbackWms); + ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel; }) flashbackWms); }) (lib.mkIf serviceCfg.core-os-services.enable { diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 970842907a12..4f2c889eba88 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -26,8 +26,17 @@ services.desktopManager.gnome.enable = true; services.desktopManager.gnome.debug = true; - services.desktopManager.gnome.flashback.enableMetacity = true; - services.displayManager.defaultSession = "gnome-flashback-metacity"; + + services.desktopManager.gnome.flashback.customSessions = [ + { + # Intentionally a different name to test mkSystemdTargetForWm. + wmName = "metacitytest"; + wmLabel = "Metacity"; + wmCommand = "${pkgs.metacity}/bin/metacity"; + enableGnomePanel = true; + } + ]; + services.displayManager.defaultSession = "gnome-flashback-metacitytest"; }; testScript = diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index 6d64cd8f16cb..d8b98b99b117 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -17,6 +17,7 @@ libpulseaudio, libxkbfile, libxml2, + metacity, pkg-config, polkit, gdm, @@ -34,43 +35,13 @@ buildEnv, }: -let - # From data/sessions/Makefile.am - requiredComponentsCommon = - enableGnomePanel: [ "gnome-flashback" ] ++ lib.optional enableGnomePanel "gnome-panel"; - requiredComponentsGsd = [ - "org.gnome.SettingsDaemon.A11ySettings" - "org.gnome.SettingsDaemon.Color" - "org.gnome.SettingsDaemon.Datetime" - "org.gnome.SettingsDaemon.Housekeeping" - "org.gnome.SettingsDaemon.Keyboard" - "org.gnome.SettingsDaemon.MediaKeys" - "org.gnome.SettingsDaemon.Power" - "org.gnome.SettingsDaemon.PrintNotifications" - "org.gnome.SettingsDaemon.Rfkill" - "org.gnome.SettingsDaemon.ScreensaverProxy" - "org.gnome.SettingsDaemon.Sharing" - "org.gnome.SettingsDaemon.Smartcard" - "org.gnome.SettingsDaemon.Sound" - "org.gnome.SettingsDaemon.UsbProtection" - "org.gnome.SettingsDaemon.Wacom" - "org.gnome.SettingsDaemon.XSettings" - ]; - requiredComponents = - wmName: enableGnomePanel: - "RequiredComponents=${ - lib.concatStringsSep ";" ( - [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd - ) - };"; -in stdenv.mkDerivation (finalAttrs: { pname = "gnome-flashback"; - version = "3.56.0"; + version = "3.58.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz"; - hash = "sha256-LQ+iLzc9sIDq7w5Wk7lijN6ETyVjPVqQMTsEndlSkmA="; + hash = "sha256-qqI+cEJHfnQfJCebRoudIK9OwZXuQ7PTEs2q+E2YwyE="; }; patches = [ @@ -90,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' - # Check that our expected RequiredComponents match the stock session files, but then don't install them. - # They can be installed using mkSessionForWm. - grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false) - rm -r $out/share/gnome-session rm -r $out/share/xsessions rm $out/libexec/gnome-flashback-metacity @@ -167,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: { { wmName, wmLabel, - enableGnomePanel, }: writeTextFile { name = "gnome-flashback-${wmName}-gnome-session"; @@ -175,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: { text = '' [GNOME Session] Name=GNOME Flashback (${wmLabel}) - ${requiredComponents wmName enableGnomePanel} ''; }; @@ -209,11 +174,33 @@ stdenv.mkDerivation (finalAttrs: { wmCommand, enableGnomePanel, }: - runCommand "gnome-flashback-${wmName}.target" { } '' - mkdir -p $out/lib/systemd/user - cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \ - "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d" - ''; + runCommand "gnome-flashback-${wmName}.target" { } ( + '' + if [ "${wmName}" = "metacity" ]; then + echo "Use `services.xserver.windowManager.metacity.enable` instead." + exit 1 + fi + + mkdir -p $out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d + cp "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d/session.conf" \ + "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf" + + substitute ${finalAttrs.finalPackage}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target \ + "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target" \ + --replace-fail "(Metacity)" "(${wmLabel})" + + echo -e "[Unit]\nWants=${wmName}.service" >> "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/${wmName}.conf" + + substitute ${metacity}/lib/systemd/user/metacity.service \ + "$out/lib/systemd/user/${wmName}.service" \ + --replace-fail "Description=Metacity" "Description=${wmLabel}" \ + --replace-fail "ExecStart=${metacity}/bin/metacity" "ExecStart=${wmCommand}" + '' + + lib.optionalString (!enableGnomePanel) '' + substituteInPlace "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf" \ + --replace-fail "Wants=gnome-panel.service" "" + '' + ); tests = { inherit (nixosTests) gnome-flashback; From 890648e2c9f966f6fba48584cfd0437b28dcbf75 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:38 +0000 Subject: [PATCH 0830/2279] =?UTF-8?q?gnome-nibbles:=204.4.rc2=20=E2=86=92?= =?UTF-8?q?=204.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-nibbles/-/compare/4.4.rc2...4.4.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-nibbles/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index 4b03ef123bf7..63fa0ce5c04b 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.4.rc2"; + version = "4.4.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-WPPpaRsSZAiR/ORYtl1GpEXaLrhcctwTeXLDKviPg7Q="; + hash = "sha256-uIK4n2v9bRX96yr5edkYui8cHMjto5yviCe1Z9N/r5U="; }; nativeBuildInputs = [ From e811f1b8c0436f507eef47bb13b58d7b6eee557b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:38 +0000 Subject: [PATCH 0831/2279] =?UTF-8?q?dconf-editor:=2049.rc=20=E2=86=92=204?= =?UTF-8?q?9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/dc/dconf-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 067c231fff0e..f44dd682222f 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; - hash = "sha256-IvI9WgT0+/3gq3nWlhrprFURX+ttoXgl/4y0tr0rbnU="; + hash = "sha256-kKjM+t9R3/MeACgyT7mjWLLSbFroYaccfb+fTdm905k="; }; patches = [ From be65c1b6ae8ae96da90cf114635d80dc95a2bcd1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:44 +0000 Subject: [PATCH 0832/2279] =?UTF-8?q?gnome-tetravex:=203.38.2=20=E2=86=92?= =?UTF-8?q?=203.38.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-tetravex/-/compare/3.38.2...3.38.3 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-tetravex/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gn/gnome-tetravex/package.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix index 95282a3fa14f..9a88b11305a5 100644 --- a/pkgs/by-name/gn/gnome-tetravex/package.nix +++ b/pkgs/by-name/gn/gnome-tetravex/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch, pkg-config, gnome, adwaita-icon-theme, @@ -20,24 +19,13 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz"; - hash = "sha256-H83xCXm5o1JgCdeDociKOJkY82DaTttE+6JccfGGkRs="; + hash = "sha256-g4SawGTUVuHdRrbiAcaGFSYkw9HsS5mTWYWkmqeRcss="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:37:0: ERROR: Function does not take positional arguments. - # data/meson.build:59:0: ERROR: Function does not take positional arguments. - # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch"; - hash = "sha256-2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; - }) - ]; - nativeBuildInputs = [ wrapGAppsHook3 itstool @@ -68,7 +56,7 @@ stdenv.mkDerivation rec { description = "Complete the puzzle by matching numbered tiles"; mainProgram = "gnome-tetravex"; teams = [ teams.gnome ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } From 80c7af37f7b9a425e3f16cf842ea0f89d00fe6a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:09:58 +0000 Subject: [PATCH 0833/2279] =?UTF-8?q?gnome-backgrounds:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-backgrounds/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix index 46aff72db6c6..08dd14cf8c41 100644 --- a/pkgs/by-name/gn/gnome-backgrounds/package.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; - hash = "sha256-UkrZIO0U1sQs9h7LcyLg+RMoMMy5+F0jgGjzntIewaA="; + hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU="; }; patches = [ From f5d5af772e3bf8e1b5bf0c31eff66a8e0aea34c2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:01 +0000 Subject: [PATCH 0834/2279] =?UTF-8?q?gnome-user-docs:=2048.2=20=E2=86=92?= =?UTF-8?q?=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/48.2...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-user-docs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index 92f83a105f28..bbaac9a44a11 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "48.2"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk="; + hash = "sha256-7BGNRNoYZuQXONoZz128PZpCklovO/SO5sN+bj5G3fM="; }; nativeBuildInputs = [ From 8ecc6adf748fb1b71e712bd206f7d00d2e9e843b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:12 +0000 Subject: [PATCH 0835/2279] =?UTF-8?q?gucharmap:=2016.0.2=20=E2=86=92=2017.?= =?UTF-8?q?0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gucharmap/-/compare/16.0.2...17.0.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gu/gucharmap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix index 9eec9079f8e2..e84aea3306d3 100644 --- a/pkgs/by-name/gu/gucharmap/package.nix +++ b/pkgs/by-name/gu/gucharmap/package.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gucharmap"; - version = "16.0.2"; + version = "17.0.0"; outputs = [ "out" @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "gucharmap"; rev = finalAttrs.version; - hash = "sha256-UaXgQIhAoI27iYWgZuZeO7Lv6J9pj06HPp0SZs/5abM="; + hash = "sha256-BYplW+gVTgWdXYW+h2g4xwxmFSl+WoygZfw8dug4qkw="; }; strictDeps = true; From c0137a2ce4025f75162ff62a936af362b8a80054 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:17 +0000 Subject: [PATCH 0836/2279] =?UTF-8?q?template-glib:=203.37.1=20=E2=86=92?= =?UTF-8?q?=203.38.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/template-glib/-/compare/3.37.1...3.38.0 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/te/template-glib/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix index 78181dd9347a..454149b612f8 100644 --- a/pkgs/by-name/te/template-glib/package.nix +++ b/pkgs/by-name/te/template-glib/package.nix @@ -5,6 +5,7 @@ meson, ninja, pkg-config, + gi-docgen, glib, gobject-introspection, flex, @@ -12,14 +13,11 @@ vala, gettext, gnome, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_43, }: stdenv.mkDerivation (finalAttrs: { pname = "template-glib"; - version = "3.37.1"; + version = "3.38.0"; outputs = [ "out" @@ -29,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-16xEMdWUe6KSCGx+R7iK6Kzb7A+PjTiyvbiIoL3MBhw="; + hash = "sha256-QNANwiPc8ut/LsQi997FpnNzoMoRAavKD0nGLwUMsxI="; }; nativeBuildInputs = [ @@ -40,10 +38,8 @@ stdenv.mkDerivation (finalAttrs: { flex bison vala + gi-docgen glib - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 gobject-introspection ]; @@ -52,11 +48,16 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Ddocs=true" ]; doCheck = true; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/template-glib-1.0 "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "template-glib"; From 1541b67c638e58d30383e66152953c39e4e5781c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:17 +0000 Subject: [PATCH 0837/2279] =?UTF-8?q?libpeas2:=202.1.0=20=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpeas/-/compare/2.1.0...2.2.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/libpeas/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index c34508bf8080..2fc9b559723d 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.1.0"; + version = "2.2.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-DcWB9P4pdU+xFK3G9GoEIyAMER4IweWtCHGeVcQY3pc="; + hash = "sha256-wohyM/CEpp+r/H+gFA1BBJGGPXBQr7KGd/mlU7JYCtk="; }; patches = [ From 9c53d27a22f55615023a3f318c62008cad7ae4f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:23 +0000 Subject: [PATCH 0838/2279] =?UTF-8?q?gnome-remote-desktop:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-remote-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index 8e3482e4158b..c8d154bf25af 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-4CXGbr1Ju5VJFDbzexcg48bLMfl8VFaWaoWxPo4GxyY="; + hash = "sha256-1HrdnZcPIkrMd+/lohZIbUBFHivCG4W/7FOX1CD9oYo="; }; nativeBuildInputs = [ From d991906b914b96a758899ed4b391cfaaacabef16 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:34 +0000 Subject: [PATCH 0839/2279] =?UTF-8?q?gnome-shell-extensions:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-shell-extensions/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index 5ce8845c6d01..0bc2e8667c20 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-5FYi5PgASfK1wS++DWvF1YrTIH7W0QVdJBp/qtYpAB0="; + hash = "sha256-FXDgZHhstDiXWeBIPzob29W5s48GJG600dUJKSqcamI="; }; patches = [ From 719b06476190e7e2b447dd3eafc442d348568e3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:55 +0000 Subject: [PATCH 0840/2279] =?UTF-8?q?glycin-loaders:=202.0.rc=20=E2=86=92?= =?UTF-8?q?=202.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.rc...2.0.2 Co-authored-by: Bobby Rong --- pkgs/by-name/gl/glycin-loaders/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 3a925abb5437..3c6ff4114f26 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "2.0.rc"; + version = "2.0.2"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-mkREIVtD1b2YUyW0CK4lC0S4Arb/SeGvCCXXAAi5Zz8="; + hash = "sha256-ZYAOhWs37byNXDM1rVNBUFgc4/LwhFTdAwKiZHC9nRM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "glycin-loaders-deps-${finalAttrs.version}"; - hash = "sha256-omxOAZggqBzMKKg6NP8BnjnGwqIkn0fbOI3Vfwa+j1A="; + hash = "sha256-9cpvRNqymxkOi6L5oZDGyvB68rzEt97qB8uqzhUYsao="; dontConfigure = true; }; From 4e62c5fb9423fdbbb4c889e82a047036495cf0a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:10:57 +0000 Subject: [PATCH 0841/2279] =?UTF-8?q?gtkmm4:=204.19.1=20=E2=86=92=204.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtkmm/-/compare/4.19.1...4.20.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gtkmm/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 3c8cce02a639..4025bee7d92b 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.19.1"; + version = "4.20.0"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; - hash = "sha256-K0Q9378M8oxL7ORHpbumICjEnfRcyxs/Q4o6PgvKMao="; + hash = "sha256-2q2b+bcPkJdfkXgfx6ZWySOpE3QmH1dsiDzTrr1ZyDM="; }; nativeBuildInputs = [ From 47b40afa652dc10be5d76ceea7cf0ca354959d32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:11:09 +0000 Subject: [PATCH 0842/2279] =?UTF-8?q?libshumate:=201.5.beta=20=E2=86=92=20?= =?UTF-8?q?1.5.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.5.beta...1.5.0.1 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/li/libshumate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index c97f72876422..995772bcd923 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.5.beta"; + version = "1.5.0.1"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-xub0mAP1CKDJQatwz8VRjcroN9acjNW0LKO6Dj4r/2Q="; + hash = "sha256-qW/nqWN86BnaEh6D4m61M83HjBRvpRqWC73K1VdAnlg="; }; depsBuildBuild = [ From ec93a000e7400c95a6d1210012c3f0e481ecacac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:11:18 +0000 Subject: [PATCH 0843/2279] =?UTF-8?q?evolution:=203.57.3=20=E2=86=92=203.5?= =?UTF-8?q?8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.57.3...3.58.0 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 8d47ad48b593..98adbb9c6a3b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.57.3"; + version = "3.58.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-OY+r52ym2qkAT5I8KfGpdGldHcTvcpPfefefsXNOIrk="; + hash = "sha256-Nz/hdFow9x8RN1XvKvwwp6F2imA2GVpk2wUplacaGr8="; }; nativeBuildInputs = [ From 19a4ce6f57a1d4d4b07500eed36ae0113e928c0a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:11:26 +0000 Subject: [PATCH 0844/2279] =?UTF-8?q?gnome-shell:=2049.rc=20=E2=86=92=2049?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/49.rc...49.0 --- pkgs/by-name/gn/gnome-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index b45fa934fe62..bccf4720c97a 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "49.rc"; + version = "49.0"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-Hv8ooNfiUECI8ISa/zHxwMhw2WJwA56G5W13+OEHrkE="; + hash = "sha256-/whrnDIYCZQw2RhSQ7Z3ajaiy3vLcFqYxhLyz0dCcIo="; }; patches = [ From a39a89687c8f102d527bf75c590fd4cb3851babb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:11:29 +0000 Subject: [PATCH 0845/2279] =?UTF-8?q?nautilus:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/49.rc...49.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/na/nautilus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index fa08be3c841a..e969fca3aaf2 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "49.rc"; + version = "49.0"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-hN7XI8Z4l/qBskma1aKH03/OFiQd73+PcgkEcGP62Kw="; + hash = "sha256-sxKScENPx8Uz+X7X+MRCcE8AoC0nopCALY0Wq0Kha/g="; }; patches = [ From 86000dd704416d43c06feb11e61e82063b58f8bc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:11:45 +0000 Subject: [PATCH 0846/2279] =?UTF-8?q?gnome-panel:=203.56.0=20=E2=86=92=203?= =?UTF-8?q?.58.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-panel/-/compare/3.56.0...3.58.1 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-panel/package.nix | 4 ++-- pkgs/by-name/gn/gnome-panel/wrapper.nix | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix index 4ab8da344c09..2eb9c202360f 100644 --- a/pkgs/by-name/gn/gnome-panel/package.nix +++ b/pkgs/by-name/gn/gnome-panel/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-panel"; - version = "3.56.0"; + version = "3.58.1"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz"; - hash = "sha256-UoptZ92E7a5sgKXuZW+E+9lC87Nx1g+XottgZc9P0XA="; + hash = "sha256-fovKQ6gaE0xmazp4uvKv+wxdMO+xvKZTiH/EGzHdXmQ="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix index 30f9c1823857..0d7fb34e4772 100644 --- a/pkgs/by-name/gn/gnome-panel/wrapper.nix +++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { dontUnpack = true; dontConfigure = true; dontBuild = true; + # $output/lib/systemd/user is already a symlink + dontMoveSystemdUserUnits = true; preferLocalBuild = true; allowSubstitutes = false; @@ -52,10 +54,10 @@ stdenv.mkDerivation { rm -r $out/lib/gnome-panel/modules ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out - rm $out/share/applications/gnome-panel.desktop - - ln -s ${gnome-panel}/share/applications/gnome-panel.desktop \ - $out/share/applications/gnome-panel.desktop + rm $out/share/systemd/user/gnome-panel.service + substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \ + $out/share/systemd/user/gnome-panel.service \ + --replace-fail "ExecStart=${gnome-panel}/bin/gnome-panel" "ExecStart=$out/bin/gnome-panel" runHook postInstall ''; From 3e03c298ba952cafec9bf79a1d19420659795180 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:16:45 +0000 Subject: [PATCH 0847/2279] =?UTF-8?q?gtksourceview5:=205.17.1=20=E2=86=92?= =?UTF-8?q?=205.18.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.17.1...5.18.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 9cd5ccca89cc..986a9d6ab7b3 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.17.1"; + version = "5.18.0"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz"; - hash = "sha256-dA3pr74iuzHb2FMrizMeeVPOY5YcCuEtEvrkLVAQFgc="; + hash = "sha256-BRp4/jj3kzKAR+W81thVxkJcC0gMINlDIXnjVnQsasA="; }; patches = [ From 2cfc93c884cb5f072913ca869d3dd07717439e26 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:16:46 +0000 Subject: [PATCH 0848/2279] =?UTF-8?q?vte:=200.81.90=20=E2=86=92=200.82.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.81.90...0.82.0 Co-authored-by: Bobby Rong Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/vt/vte/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 9edb648d1690..87e264851ba7 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.81.90"; + version = "0.82.0"; outputs = [ "out" @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-kLJhqwJZf+6UH3GmV+v50OMDqsN3tIXERNhUQ1oJEyE="; + hash = "sha256-sHGNsyVHMHAbQ79eETy/jNssFHFdMu4einB9xutwU18="; }; patches = [ @@ -60,12 +60,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) - - # Fix compilation with gcc 14 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/e297ba0507d0e7863edd411dfc5264bbc490e4f6.patch"; - hash = "sha256-uTaeb7bLUBefgF5Uxl7Qxlcp5Uj7pqW8XiR/5rsjuTI="; - }) ]; nativeBuildInputs = [ From 302f49d8d8d56942ab44e790971d7566490d5fc9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:17:02 +0000 Subject: [PATCH 0849/2279] =?UTF-8?q?gnome-clocks:=2048.0=20=E2=86=92=2049?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/compare/48.0...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-clocks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix index 15c66b54168f..ed0b223c66dd 100644 --- a/pkgs/by-name/gn/gnome-clocks/package.nix +++ b/pkgs/by-name/gn/gnome-clocks/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-clocks"; - version = "48.0"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz"; - hash = "sha256-YW7h+3UwCx8muXZiGelUdRNgyg+g9JExG8+DvzgIfGI="; + hash = "sha256-v3aRXypJLooFkv5As1NGWTqjnk5ogdYXbg79h3HU5vo="; }; nativeBuildInputs = [ From 3bb29c9473d773d50ccfc8ecee58fe19770cc3af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:17:03 +0000 Subject: [PATCH 0850/2279] =?UTF-8?q?gnome-tecla:=2049.rc=20=E2=86=92=2049?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tecla/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-tecla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix index b4276de4ff80..ebc0df1577c6 100644 --- a/pkgs/by-name/gn/gnome-tecla/package.nix +++ b/pkgs/by-name/gn/gnome-tecla/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tecla"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz"; - hash = "sha256-XRLIDoZUnVDwmRgSdZ9PU/QgiNDq60KN0RSA5grl12o="; + hash = "sha256-LKQk5AK69gzWsTd3cDtwHrsfr489Dy+XEUTYI/ZRJJ8="; }; nativeBuildInputs = [ From 2fe0862847e6945e4550b7e821f6b0445b919998 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:17:08 +0000 Subject: [PATCH 0851/2279] =?UTF-8?q?mutter:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/49.rc...49.0 --- pkgs/by-name/mu/mutter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 01d48528b4b5..af9e46e70de3 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "49.rc"; + version = "49.0"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-nwBnr8bHV2kwNloLpW1zb6rVsqbejsmQiby2vPYpIVA="; + hash = "sha256-8Q727SA2ZzcwRhQz4R4L46vHRg0yOz6HCTtsOXLBYzU="; }; mesonFlags = [ From 1fa2fb20a8eeef1e338e5b151ddc34a75f89af94 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:17:15 +0000 Subject: [PATCH 0852/2279] =?UTF-8?q?localsearch:=203.10.rc=20=E2=86=92=20?= =?UTF-8?q?3.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/localsearch/-/compare/3.10.rc...3.10.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/lo/localsearch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index 403efcce05aa..4366c8073d33 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "localsearch"; - version = "3.10.rc"; + version = "3.10.0"; src = fetchurl { url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; - hash = "sha256-EeihW7QeFzynGqL0lHnKUIwmleWmB/BA1AMvjbyNaFU="; + hash = "sha256-WNZupEruFknI2YH5NDc7g+GrSkoahLoDBPWvOR5+AIA="; }; patches = [ From 01a5afab481c73353316e77b6258074b540094c4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:17:23 +0000 Subject: [PATCH 0853/2279] =?UTF-8?q?gdm:=2049.rc=20=E2=86=92=2049.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/49.rc...49.0.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gd/gdm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 33ed32667c38..128d00c7bec8 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "49.rc"; + version = "49.0.1"; outputs = [ "out" @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-vQdduV2RbiXRhk/n0RSY8YpSiiMYDU4jotXwukRgyBY="; + hash = "sha256-GbpC+GkqC/OlK9WX4amrKMnGpRiWpQgjBOX6GlGE2Bo="; }; mesonFlags = [ From d4790c248e58cab8c720e6e9e56751e2de789882 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:20 +0000 Subject: [PATCH 0854/2279] =?UTF-8?q?evolution-data-server:=203.57.3=20?= =?UTF-8?q?=E2=86=92=203.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.57.3...3.58.0 Changelog-Reviewed-By: Jan Tojnar --- .../by-name/ev/evolution-data-server/hardcode-gsettings.patch | 4 ++-- pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 27111ebdde55..e875418bc9cb 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -363,10 +363,10 @@ index 2c0b6ef..b354332 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index d567e04..6b929b7 100644 +index c3c2d7d..e1370db 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5671,7 +5671,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 843e20bfd440..eed95cc14c07 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.57.3"; + version = "3.58.0"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-FkMu42rxildzbAfT/uwhi7peVUSk3EN/yhHiMQhsjLc="; + hash = "sha256-orWguNsRtyjtwdbxwincJxGWK3qHwDhCIdrI2WAAzvc="; }; patches = [ From a8a6d8d9a9c5e1d8181d50224f742c4cefb01d71 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:29 +0000 Subject: [PATCH 0855/2279] =?UTF-8?q?gnome-online-accounts:=203.55.2=20?= =?UTF-8?q?=E2=86=92=203.56.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.55.2...3.56.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/by-name/gn/gnome-online-accounts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index 647806b0c82a..ced147c71e03 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.55.2"; + version = "3.56.0"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-kdAkhWw4AEwrL+b9rVoBh+aoBv8+HtIAILk0Dg1ICu8="; + hash = "sha256-MdagF9Fxsn/5NkeP2weSogDIFC6vwYslUHPOnftBdXI="; }; mesonFlags = [ From 1db567be24430ad6d0ddb4c78fda80d3ec8d4d42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:31 +0000 Subject: [PATCH 0856/2279] =?UTF-8?q?glibmm=5F2=5F68:=202.85.0=20=E2=86=92?= =?UTF-8?q?=202.86.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glibmm/-/compare/2.85.0...2.86.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/glibmm/2.68.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index db84397b684b..955a946cdf2f 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.85.0"; + version = "2.86.0"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor version}/glibmm-${version}.tar.xz"; - hash = "sha256-B3EwZxEpn79i5Tx1LVPtWBY1EnFnpsx5rgXyuEIdKdc="; + hash = "sha256-OcDp9toEbWeTkHdO/bmtVkQ2I2c23C94JeYUstQIeCY="; }; nativeBuildInputs = [ From 1050d83847160fc4a3d3be7dd1eff642b90cffc3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:32 +0000 Subject: [PATCH 0857/2279] =?UTF-8?q?yelp-xsl:=2049.beta=20=E2=86=92=2049.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/yelp-xsl/-/compare/49.beta...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/ye/yelp-xsl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix index 9f5698e88bd0..a908a60c0449 100644 --- a/pkgs/by-name/ye/yelp-xsl/package.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "yelp-xsl"; - version = "49.beta"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz"; - hash = "sha256-yhvk5jrMXx15oVFCeHn7DAALLKHTJygU4LJPe8B9mT0="; + hash = "sha256-WdQ6j4/me3hPFPmgTdSnoJKn9KZKZecbkP4CpHpQ++w="; }; nativeBuildInputs = [ From 749abee3390faeddd9f334b7f541d288aeeed95f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:50 +0000 Subject: [PATCH 0858/2279] =?UTF-8?q?sysprof:=2049.rc=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/sysprof/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/development/tools/profiling/sysprof/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index d6b5719a6d8f..0aae2741885f 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sysprof"; - version = "49.rc"; + version = "49.0"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/sysprof/${lib.versions.major finalAttrs.version}/sysprof-${finalAttrs.version}.tar.xz"; - hash = "sha256-Y4ZkKMR7rSOlCTowWq85bFpPgqDtSz5RWPZYCalx1JA="; + hash = "sha256-/wQTljd4XIQZSIYgh6QyO5gWgNlCKWQJMhtXT8soKHg="; }; nativeBuildInputs = [ From 1d8073affd4753a18ee8530b81880f2fde351aef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:50 +0000 Subject: [PATCH 0859/2279] =?UTF-8?q?gnome-settings-daemon:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/gn/gnome-settings-daemon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 3dcb8a7abb95..0a00160237ac 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-p/eJy5lZZfamZBKrUTkGTuRblwHTpCNQ/i5amP9oPAI="; + hash = "sha256-IBvUrAxHFHkYLvN15ZneYApRo8CwSehXFaIkRx5bMiY="; }; patches = [ From fb3efc45e81dfdc313968c540e2f651330f726eb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:53:51 +0000 Subject: [PATCH 0860/2279] =?UTF-8?q?zenity:=204.1.99=20=E2=86=92=204.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/zenity/-/compare/4.1.99...4.2.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/ze/zenity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 251da2da8fe1..0f612d9468e1 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "4.1.99"; + version = "4.2.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - hash = "sha256-b+KqMTxx6R/6VbEdvseQTzGkAwPgo/YBaCD/be4ynuI="; + hash = "sha256-X5gzQMb6VfT6tal2nQdxss3xNl4sFYrBHMFv/Ykva80="; }; nativeBuildInputs = [ From e1198001f19485c8823ede2508ef10d9b530b8c3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:05 +0000 Subject: [PATCH 0861/2279] =?UTF-8?q?libglycin:=202.0.rc=20=E2=86=92=202.0?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.rc...2.0.2 --- pkgs/by-name/li/libglycin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 490421355192..0d99435f4056 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -27,14 +27,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "2.0.rc"; + version = "2.0.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "glycin"; tag = finalAttrs.version; - hash = "sha256-eFWHYDWaC8kMYeJZZcoUYyF/TvEqY2iVyjvfMVSRQvA="; + hash = "sha256-HLvdDQ1rXm2JTUwot07qOIzNaK/sK6zLswips8oIp9c="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-i7vuLpAzDp9mPTb3XwiZq70T744m/VVp5he7Cgf1leY="; + hash = "sha256-IaiQ1OdmlBcIYyruG6p/rrOxq7x8csF/W3ONerh2lAA="; }; buildInputs = [ From bffd175c5c7a4dde229b118cb6c3a1021812ad6c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:14 +0000 Subject: [PATCH 0862/2279] =?UTF-8?q?gvfs:=201.57.2=20=E2=86=92=201.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.57.2...1.58.0 --- pkgs/by-name/gv/gvfs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index e1d23355789c..1d90aeb26396 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -49,11 +49,11 @@ assert googleSupport -> gnomeSupport; stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.57.2"; + version = "1.58.0"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-8Wvvjsof1sEX6F2wEdIekVZpeQ1VhnNJxfGykSmelYU="; + hash = "sha256-3ZvjaHPQ/LMJ64mo0nR3DOV2KHYoos8RG9OH4cNPGC8="; }; patches = [ From 1dbe284772f36b3f926f3237194691ea2864d406 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:26 +0000 Subject: [PATCH 0863/2279] =?UTF-8?q?libpanel:=201.10.1=20=E2=86=92=201.10?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.10.1...1.10.2 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/li/libpanel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix index c06f04a2136a..933bdd7a3a1f 100644 --- a/pkgs/by-name/li/libpanel/package.nix +++ b/pkgs/by-name/li/libpanel/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpanel"; - version = "1.10.1"; + version = "1.10.2"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz"; - hash = "sha256-k2u+lt+zg1VkghIP3dRTOlLS9JMDMoy2lIYWBkkkRes="; + hash = "sha256-zBLo4Q8eSXe9Eq0/+u3NUqwXY0i0r2/l2mhrljJb/gE="; }; strictDeps = true; From f84d549c039a142cd982b8e1953914eeeb74fa48 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:36 +0000 Subject: [PATCH 0864/2279] =?UTF-8?q?libadwaita:=201.8.rc=20=E2=86=92=201.?= =?UTF-8?q?8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.8.rc...1.8.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/li/libadwaita/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index f5e6634d700d..dd4ea744d0c1 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.8.rc"; + version = "1.8.0"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-wpxPYEkuRh2DaEw6tCAnQLXAwFEQ/TbJZYq15Egt9NM="; + hash = "sha256-neF7nt7x3QhSsWuWGouqniFlDHw1Soco7Dpzhy15gWE="; }; depsBuildBuild = [ From 451ff3654d7f7d1ab180e7181ed519aa17ab6d8d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:45 +0000 Subject: [PATCH 0865/2279] =?UTF-8?q?gjs:=201.85.90=20=E2=86=92=201.86.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.85.90...1.86.0 --- pkgs/by-name/gj/gjs/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix index 069a547b60ef..0f17692a1d58 100644 --- a/pkgs/by-name/gj/gjs/package.nix +++ b/pkgs/by-name/gj/gjs/package.nix @@ -1,6 +1,5 @@ { fetchurl, - fetchpatch, lib, stdenv, meson, @@ -42,7 +41,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.85.90"; + version = "1.86.0"; outputs = [ "out" @@ -52,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-tFVADxNLEs3MtPO92yPMZOqxlY0cn0hLsKQlk/t4MmU="; + hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k="; }; patches = [ @@ -71,20 +70,6 @@ stdenv.mkDerivation (finalAttrs: { # not ok 796 Filename tests various types of path existing # Message: Error opening file “/build/.UGHEA3/öäü-3”: Invalid or incomplete multibyte or wide character in /build/gjs-1.84.2/build/../installed-tests/js/testGIMarshalling.js (line 2937) ./disable-umlaut-test.patch - - # Fix gjs:JS / Package test - # https://gitlab.gnome.org/GNOME/gjs/-/issues/711 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/054f78c756b631c347c6f64ab5b7349331f5f420.patch"; - hash = "sha256-gnOD+WU+JTzetnyGyGJKQZbaLX22yZuBhCmhJd2Hha8="; - }) - - # Fix gjs:Scripts / Gtk4Warnings test - # https://gitlab.gnome.org/GNOME/gjs/-/issues/712 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/48b00ae16d97ae213dbaef6dee8ffd56e1667a64.patch"; - hash = "sha256-u7P/dV9mtx3AldrnbDhGGMVQ61GmD54TXFhS4FRh4yc="; - }) ]; nativeBuildInputs = [ From 427d5a6866ddf68ec19b517d6d7a9108bd5bdd47 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:46 +0000 Subject: [PATCH 0866/2279] =?UTF-8?q?adwaita-icon-theme:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/compare/49.rc...49.0 Changelog-Reviewed-By: Bobby Rong --- pkgs/by-name/ad/adwaita-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 6567edaa5ba4..77383abe1725 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; - hash = "sha256-brZ8IqXmAYYcwGfMBQWhvfOSm6W3Rl9Az25N2R2eTR0="; + hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw="; }; nativeBuildInputs = [ From b0dc74cac643509650c2cdacbe7a18e2337520a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:54:58 +0000 Subject: [PATCH 0867/2279] =?UTF-8?q?gtk4:=204.20.0=20=E2=86=92=204.20.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.20.0...4.20.2 --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index eadb3936ed2d..9b5a9daaa063 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.20.0"; + version = "4.20.2"; outputs = [ "out" @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-eeUeYvfwz/MpBFabDOvJYpfQ6/r6begXIHPGnOA5Gpg="; + hash = "sha256-XoJA7eyvr/K4uvRmO9zqpmjvEKIHvuTX+Q4BDhC93Fw="; }; depsBuildBuild = [ From 6725ca2dabdd4b50c78ec0186fc7b0cd477c632d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:55:09 +0000 Subject: [PATCH 0868/2279] =?UTF-8?q?gtk3:=203.24.50=20=E2=86=92=203.24.51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.50...3.24.51 --- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index b26c5f98cb25..01c29e9da024 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.50"; + version = "3.24.51"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-OZEYpWmTFGIhZaEbdp6ptu1o4De21G1Xz89IUd7AdSk="; + hash = "sha256-ABOHfGvSPC2+Qq18cKBT0ORJvmZzZXTjeGfEnF+QWk8="; }; patches = [ From fb648391a50da2d95af109dc929de59e23cb7418 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:55:35 +0000 Subject: [PATCH 0869/2279] =?UTF-8?q?at-spi2-core:=202.57.2=20=E2=86=92=20?= =?UTF-8?q?2.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/at-spi2-core/-/compare/2.57.2...2.58.0 --- pkgs/by-name/at/at-spi2-core/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 8929f1ce43c7..2309dd97e286 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.57.2"; + version = "2.58.0"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; - hash = "sha256-o4aSqsF09zt3SsYLp5XAwMYLpW1BNLag7APmSBZ0xgo="; + hash = "sha256-390zANong6IZaf+t4oiYF/t8GQak75JJfrpllps9q1o="; }; nativeBuildInputs = [ From 8d03fa8646c684b227c10f46e2772391fb16fea5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:55:35 +0000 Subject: [PATCH 0870/2279] =?UTF-8?q?gdk-pixbuf:=202.43.5=20=E2=86=92=202.?= =?UTF-8?q?44.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/compare/2.43.5...2.44.3 --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f7b613582cfb..9ae7a4c31133 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.43.5"; + version = "2.44.3"; outputs = [ "out" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-pyPsJChCf4V7hyffu+nat3FCoT+20MR/lSIiUa42/xU="; + hash = "sha256-QKktzCN/+UtjqAwVmj9vIs1Z9vtJYfIBx4eZ+iyKwKY="; }; patches = [ From 12fd0651030a645d7c61b1b236220335251851a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:55:45 +0000 Subject: [PATCH 0871/2279] =?UTF-8?q?gsettings-desktop-schemas:=2049.rc=20?= =?UTF-8?q?=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/compare/49.rc...49.0 --- pkgs/by-name/gs/gsettings-desktop-schemas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix index 8a434e4d7fa9..cbeece5a07aa 100644 --- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix +++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "49.rc"; + version = "49.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-YTbBW/NtbW+6Dd78Wx3G0HlERKPh9FE0zvlnVgxmIq0="; + hash = "sha256-kSkFzEU4KIikdwLtEQHGsI69ASKjKmfZQKuBFqlsUg0="; }; strictDeps = true; From c918ad67456c2d82979ebcb4399157b41c9879b0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:55:54 +0000 Subject: [PATCH 0872/2279] =?UTF-8?q?gobject-introspection:=201.84.0=20?= =?UTF-8?q?=E2=86=92=201.86.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.84.0...1.86.0 --- ...nner-Prefer-some-getters-over-others.patch | 92 ------------------- .../gobject-introspection/default.nix | 8 +- 2 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch diff --git a/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch b/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch deleted file mode 100644 index 437e4cd0a7a4..000000000000 --- a/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 7b2d3699ad117199bc316c7007cc5984c3b09368 Mon Sep 17 00:00:00 2001 -From: Maximiliano Sandoval -Date: Thu, 20 Mar 2025 22:52:54 +0100 -Subject: [PATCH] scanner: Prefer some getters over others - -At the moment the current set of heuristics to determine a getter for a -property is good for finding *a* getter. However, if there are multiple -candidates we might declare the wrong method as a getter. - -We introduce a priority system to determine which getter candidate is -the most appropriate as the getter. The weight were chosen with gaps in -between so that new and better heuristics have space to thrive. - -For a property named `p`, these are the possible getter candidates: - - - A method declared via the `(getter p)` annotation - - The method `get_p` - - The method `is_p` - - The method `p` - -we declare the getter to be the first candidate in the list for which a -method of the same name is available. - -See https://gitlab.gnome.org/GNOME/gjs/-/issues/681. ---- - giscanner/maintransformer.py | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py -index a81b1777..9aaf2578 100644 ---- a/giscanner/maintransformer.py -+++ b/giscanner/maintransformer.py -@@ -1612,7 +1612,10 @@ method or constructor of some type.""" - if not prop.introspectable: - continue - setter = None -- getter = [] -+ # They keys are method names of candidates for getters. The values -+ # are priority weights that measure how tasteful was the heuristic -+ # used to propose their candidate. -+ getter = {} - if prop.setter is None: - if prop.writable and not prop.construct_only: - setter = 'set_' + normalized_name -@@ -1620,17 +1623,17 @@ method or constructor of some type.""" - setter = prop.setter - if prop.getter is None: - if prop.readable: -- getter = ['get_' + normalized_name] -+ getter[f"get_{normalized_name}"] = 50 - # Heuristic: boolean properties can have getters that are - # prefixed by is_property_name, like: gtk_window_is_maximized() - if prop.type.is_equiv(ast.TYPE_BOOLEAN) and not normalized_name.startswith("is_"): -- getter.append(f"is_{normalized_name}") -+ getter[f"is_{normalized_name}"] = 25 - # Heuristic: read-only properties can have getters that are - # just the property name, like: gtk_widget_has_focus() - if not prop.writable and prop.type.is_equiv(ast.TYPE_BOOLEAN): -- getter.append(normalized_name) -+ getter[normalized_name] = 10 - else: -- getter = [prop.getter] -+ getter[prop.getter] = 99 - for method in node.methods: - if not method.introspectable: - continue -@@ -1645,7 +1648,7 @@ method or constructor of some type.""" - method.set_property = prop.name - prop.setter = method.name - continue -- if getter is not [] and method.name in getter: -+ if getter is not {} and method.name in getter: - if method.get_property is None: - method.get_property = prop.name - elif method.get_property != prop.name: -@@ -1654,7 +1657,12 @@ method or constructor of some type.""" - "mismatched '(get-property %s)' annotation" % - (method.symbol, prop.name, method.get_property)) - method.get_property = prop.name -- prop.getter = method.name -+ # Check the priority of the last matching getter -+ current_priority = -1 -+ if current_getter := prop.getter: -+ current_priority = getter.get(current_getter, -1) -+ if getter[method.name] >= current_priority: -+ prop.getter = method.name - continue - - def _pass_member_numeric_name(self, node): --- -2.48.1 - diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index d461983e8d06..f5463c9bd8bc 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -43,7 +43,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.84.0"; + version = "1.86.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - hash = "sha256-lFtX2n7CYuXCZrieCR0UvoAMxCQnfYKgKHK315SoR3k="; + hash = "sha256-kg0aP87ercMqz/lcLiA7MZA53UtKCN0aLf0oPRnAua4="; }; patches = [ @@ -67,10 +67,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./absolute_shlib_path.patch { inherit nixStoreDir; }) - - # Fix getter heuristics regression - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/529 - ./0001-scanner-Prefer-some-getters-over-others.patch ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. From 4d767abb2a4642f562ba0e9e39749601adce71fc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 6 Oct 2025 00:56:07 +0000 Subject: [PATCH 0873/2279] =?UTF-8?q?gtk-doc:=201.34.0=20=E2=86=92=201.35.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk-doc/-/compare/1.34.0...1.35.1 --- pkgs/by-name/gt/gtk-doc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix index 716b2fa57947..50f5cdacbfc6 100644 --- a/pkgs/by-name/gt/gtk-doc/package.nix +++ b/pkgs/by-name/gt/gtk-doc/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.34.0"; + version = "1.35.1"; outputDevdoc = "out"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = "gtk-doc"; rev = version; - hash = "sha256-Jt6d5wbhAoSQ2sWyYWW68Y81duc3+QOJK/5JR/lCmnQ="; + hash = "sha256-EqU7lnBnOn3gR3hT95yjdTUb3cqX2XJK5UAKsFw2Q10="; }; patches = [ From 8d6735db2bb0cf27781006739384596bbe12dd8a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Oct 2025 09:37:56 +0800 Subject: [PATCH 0874/2279] =?UTF-8?q?python3.pkgs.pygobject3:=203.50.0=20?= =?UTF-8?q?=E2=86=92=203.54.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pygobject/-/compare/3.50.0...3.54.3 --- pkgs/development/python-modules/pygobject/3.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 18c6690e60f6..9825af96472e 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.50.0"; + version = "3.54.3"; outputs = [ "out" @@ -30,8 +30,8 @@ buildPythonPackage rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-jYNudbWogdRX7hYiyuSjK826KKC6ViGTrbO7tHJHIhI="; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; + hash = "sha256-qNoJE0oPfVZJHPJBIUXjWqdOkddg6PM3CWoc2guSuuc="; }; depsBuildBuild = [ pkg-config ]; @@ -73,7 +73,7 @@ buildPythonPackage rec { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + teams = [ teams.gnome ]; platforms = platforms.unix; }; } From 1b747fc447c5fccc37fa9c967e23eba7aa773d30 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Oct 2025 09:52:11 +0800 Subject: [PATCH 0875/2279] libpeas: Switch to girepository-2.0 https://gitlab.gnome.org/GNOME/libpeas/-/issues/58 --- pkgs/development/libraries/libpeas/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 4e83219019ba..74fc27b7d7d2 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, replaceVars, meson, ninja, @@ -39,6 +40,18 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; }) + + # girepository: port libpeas ABI to girepository + # https://gitlab.gnome.org/GNOME/libpeas/-/issues/58 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/73e25b6059d2fdc090a3feb8341ff902c3ec0d16.patch"; + hash = "sha256-xNp/DbLV2mdMiUALdEWE4ssyD3krWmzmJIwgStsNShM="; + }) + # build: handle depending on development releases of GLib + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/4613accc2e22395bb77bdf612fcdf90bf65f230f.patch"; + hash = "sha256-VGPLDswH3St/SzS19iHr5dA/ywzDsXhd7FMUg4rII9U="; + }) ]; depsBuildBuild = [ From fbe4554e23ec11e256fa05dd9d6ac33395a57278 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Oct 2025 09:56:23 +0800 Subject: [PATCH 0876/2279] gitg: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. Fix building with libpeas1 (ported to girepository-2.0). --- pkgs/by-name/gi/gitg/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix index ebf6f2f21194..60db4a99330a 100644 --- a/pkgs/by-name/gi/gitg/package.nix +++ b/pkgs/by-name/gi/gitg/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, vala, pkg-config, gtk3, @@ -38,6 +39,15 @@ stdenv.mkDerivation rec { hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA="; }; + patches = [ + # Switch to girepository-2.0 + # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/278 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gitg/raw/630cf1bdb50ad37fb20b81d76caa8622e7225c58/f/gitg-gir-2.0.patch"; + hash = "sha256-9pC7wrxWcI1C/8yB5AcaED0RyaVbQzT0Ajuz0TM4hmo="; + }) + ]; + nativeBuildInputs = [ gobject-introspection meson From 2f8e193a7470fd872c788d4c3a4579e282d71cc6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Oct 2025 10:03:43 +0800 Subject: [PATCH 0877/2279] rhythmbox: Switch to girepository-2.0 https://gitlab.gnome.org/GNOME/rhythmbox/-/issues/2113 --- pkgs/by-name/rh/rhythmbox/package.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix index 1bdd2929bb7a..7abed9274243 100644 --- a/pkgs/by-name/rh/rhythmbox/package.nix +++ b/pkgs/by-name/rh/rhythmbox/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, pkg-config, meson, ninja, @@ -46,6 +47,21 @@ stdenv.mkDerivation rec { sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI="; }; + patches = [ + # Add support for girepository 2.0 + # https://gitlab.gnome.org/GNOME/rhythmbox/-/issues/2113 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/0cc5960f8ae516967515554eaa89faa9796701c5.patch"; + hash = "sha256-IAOaQBDCyRkzzrxwdYQKm8Si8sn5yeBFWqKbe5mUU6k="; + }) + ]; + + postPatch = '' + # We backported girepository-2.0 support to libpeas 1.36 + substituteInPlace meson.build \ + --replace-fail "and libpeas.version() > '1.36'" "" + ''; + nativeBuildInputs = [ pkg-config meson From 9d225a563992deec867d9f578f4db8ae457ef4c6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 8 Oct 2025 18:16:27 +0800 Subject: [PATCH 0878/2279] python3.pkgs.gst-python: Disable TestNotInitialized test https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322 --- .../python-modules/gst-python/default.nix | 3 ++ .../skip-failing-test-not-initialized.patch | 50 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index be3bbbc83125..1ac7962800a6 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -43,6 +43,9 @@ buildPythonPackage rec { stripLen = 2; hash = "sha256-BfWPc8dsB09KiEm9bNT8e+jH76jiDefQlEhhLJoq7tI="; }) + + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322 + ./skip-failing-test-not-initialized.patch ]; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch new file mode 100644 index 000000000000..169c85a0802c --- /dev/null +++ b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch @@ -0,0 +1,50 @@ +diff --git a/testsuite/test_gst.py b/testsuite/test_gst.py +index 2111b968..fd8a4627 100644 +--- a/testsuite/test_gst.py ++++ b/testsuite/test_gst.py +@@ -38,45 +38,6 @@ class TimeArgsTest(TestCase): + self.assertEqual(Gst.TIME_ARGS(Gst.SECOND), '0:00:01.000000000') + + +-class TestNotInitialized(TestCase): +- def testNotInitialized(self): +- if sys.version_info >= (3, 0): +- assert_type = Gst.NotInitialized +- else: +- assert_type = TypeError +- +- with self.assertRaises(assert_type): +- Gst.Caps.from_string("audio/x-raw") +- +- with self.assertRaises(assert_type): +- Gst.Structure.from_string("audio/x-raw") +- +- with self.assertRaises(assert_type): +- Gst.ElementFactory.make("identity", None) +- +- def testNotDeinitialized(self): +- Gst.init(None) +- +- assert(Gst.Caps.from_string("audio/x-raw")) +- assert(Gst.Structure.from_string("audio/x-raw")) +- assert(Gst.ElementFactory.make("identity", None)) +- +- Gst.deinit() +- if sys.version_info >= (3, 0): +- assert_type = Gst.NotInitialized +- else: +- assert_type = TypeError +- +- with self.assertRaises(assert_type): +- Gst.Caps.from_string("audio/x-raw") +- +- with self.assertRaises(assert_type): +- Gst.Structure.from_string("audio/x-raw") +- +- with self.assertRaises(assert_type): +- Gst.ElementFactory.make("identity", None) +- +- + class TestStructure(TestCase): + + def test_new(self): From 0a859fa04e39b3959afcffa502132cf22d821164 Mon Sep 17 00:00:00 2001 From: lesbiannix Date: Wed, 8 Oct 2025 19:30:13 +0800 Subject: [PATCH 0879/2279] =?UTF-8?q?networkmanager:=201.52.1=20=E2=86=92?= =?UTF-8?q?=201.54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/compare/1.52.1...1.54.1 Picked from Nixpkgs pull request 446121. Fixes building with PyGObject 3.52+. Co-authored-by: Martin Weinelt --- pkgs/by-name/ne/networkmanager/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix index 51e267cb8a28..d950c7393cc3 100644 --- a/pkgs/by-name/ne/networkmanager/package.nix +++ b/pkgs/by-name/ne/networkmanager/package.nix @@ -44,6 +44,7 @@ meson, mesonEmulatorHook, ninja, + libnvme, libpsl, mobile-broadband-provider-info, runtimeShell, @@ -53,6 +54,9 @@ udev, udevCheckHook, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + # NBFT (NVMe Boot Firmware Table) support, opt-in due to closure size + # https://github.com/NixOS/nixpkgs/pull/446121#discussion_r2380598419 + withNbft ? false, }: let @@ -60,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "networkmanager"; - version = "1.52.1"; + version = "1.54.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${finalAttrs.version}/downloads/NetworkManager-${finalAttrs.version}.tar.xz"; - hash = "sha256-ixIsc0k6cvK65SfBJc69h3EWcbkDUtvisXiKupV1rG8="; + hash = "sha256-APPwvhKsTUhY6/FSQwuS3vFXSAP/YQf378dkoFbUxMc="; }; outputs = [ @@ -107,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dnmtui=true" "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" "-Dqt=false" + (lib.mesonBool "nbft" withNbft) # Handlers "-Dresolvconf=${openresolv}/bin/resolvconf" @@ -158,6 +163,9 @@ stdenv.mkDerivation (finalAttrs: { newt jansson dbus # used to get directory paths with pkg-config during configuration + ] + ++ lib.optionals withNbft [ + libnvme ]; propagatedBuildInputs = [ From c2e522e2cb275b969fab4ff4264f7435ec2b889a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 8 Oct 2025 19:49:51 +0800 Subject: [PATCH 0880/2279] totem: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/to/totem/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index c5e8d2d5c7da..5f294657bfd0 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, meson, ninja, gettext, @@ -40,6 +41,15 @@ stdenv.mkDerivation rec { hash = "sha256-CwB9MPu5O5WmBPFISKSX9X/DM6dcLmOKJJly6ZwB5qQ="; }; + patches = [ + # Use girepository-2.0 + # This will be ported to libpeas2 in https://gitlab.gnome.org/GNOME/totem/-/merge_requests/373 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/totem/raw/a213a514b7c2ac22d4e012e168e41eaf839e8112/f/girepository-2.0.patch"; + hash = "sha256-D+i45yebZMbA7Ybfog3bwtOghoIHHVMqyXiUcZTkpxk="; + }) + ]; + nativeBuildInputs = [ meson ninja From 58dce851f258381b57fe7ad37366b037f41ef63a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 8 Oct 2025 21:15:55 +0800 Subject: [PATCH 0881/2279] endeavour: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/en/endeavour/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/en/endeavour/package.nix b/pkgs/by-name/en/endeavour/package.nix index c2a09da36805..5de5fa50c8ba 100644 --- a/pkgs/by-name/en/endeavour/package.nix +++ b/pkgs/by-name/en/endeavour/package.nix @@ -57,6 +57,14 @@ stdenv.mkDerivation rec { libical ]; + postPatch = '' + # Switch to girepository-2.0 + # libpeas1 will be dropped in https://gitlab.gnome.org/World/Endeavour/-/merge_requests/153 + substituteInPlace src/gui/gtd-application.c \ + --replace-fail "#include " "#include " \ + --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group" + ''; + passthru = { updateScript = gitUpdater { }; }; From 72aba83e0f6154a784abf2aabf65ae8e9f0e972f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 8 Oct 2025 23:09:45 +0800 Subject: [PATCH 0882/2279] xed-editor: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/xe/xed-editor/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index bc87c6c0775e..a9aa21391afd 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, libxml2, libpeas, glib, @@ -34,6 +35,12 @@ stdenv.mkDerivation rec { # We patch gobject-introspection and meson to store absolute paths to libraries in typelibs # but that requires the install_dir is an absolute path. ./correct-gir-lib-path.patch + + # Switch to girepository-2.0 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/xed/raw/6c1a775158f166a3bc5759a6c7bd57bab8f2771a/f/libpeas_libgirepository2.patch"; + hash = "sha256-wGbmS33YHMiSfd3S0fQRhL6tT536kto69MSgPkY2QIs="; + }) ]; nativeBuildInputs = [ From c53e5fdeb5b3df01351fc0e9e4c717e6a5582040 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 16:52:47 +0800 Subject: [PATCH 0883/2279] xviewer: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/xv/xviewer/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix index 40f5c9275929..d4326ad4b1b0 100644 --- a/pkgs/by-name/xv/xviewer/package.nix +++ b/pkgs/by-name/xv/xviewer/package.nix @@ -65,6 +65,18 @@ stdenv.mkDerivation rec { xapp ]; + postPatch = '' + # Switch to girepository-2.0 + substituteInPlace src/main.c \ + --replace-fail "#include " "#include " \ + --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group" + + substituteInPlace src/xviewer-plugin-engine.c \ + --replace-fail "#include " "#include " \ + --replace-fail "g_irepository_get_default" "gi_repository_dup_default" \ + --replace-fail "g_irepository_require" "gi_repository_require" + ''; + meta = with lib; { description = "Generic image viewer from Linux Mint"; mainProgram = "xviewer"; From 05ad337aec64924fe2b719aed3d7735c907edb4e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 17:00:59 +0800 Subject: [PATCH 0884/2279] mate.eom: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/desktops/mate/eom/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 2d5fc1840b9b..e93b46a08ccb 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, gettext, itstool, @@ -29,6 +30,14 @@ stdenv.mkDerivation rec { sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw="; }; + patches = [ + # Switch to girepository-2.0 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/eom/raw/84b45dc6302f378926be390d39a7cca3ec4f26ea/f/libpeas1_pygobject352.patch"; + hash = "sha256-HcwWXAnVzz5uuAz8Mljci2FA72TZJTD28qLvczXVtZU="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext From 2ab9e94678c1d6727ea6661615080bca0f0e80a5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 17:03:11 +0800 Subject: [PATCH 0885/2279] mate.pluma: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/desktops/mate/pluma/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 274d01796e70..13d03f2e0212 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, gettext, perl, @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ="; }; + patches = [ + # Switch to girepository-2.0 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/pluma/raw/55b770fa4d899bd92aa5ce94f3be7e2e3523a096/f/libpeas1_pygobject352.patch"; + hash = "sha256-uNGz6LEnJU4HxU1yzcm2mmrGM6QyuRSwc3w7XDYCNaQ="; + }) + ]; + nativeBuildInputs = [ gettext isocodes From 6c36a5039f84b7c52f1cfa035be0862dfbf2bb1e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 17:05:09 +0800 Subject: [PATCH 0886/2279] eog: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/eo/eog/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 4169f140d603..6aa92c5c3492 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, gettext, @@ -51,6 +52,12 @@ stdenv.mkDerivation rec { # We patch gobject-introspection to hardcode absolute paths but # our Meson patch will only pass the info when install_dir is absolute as well. ./fix-gir-lib-path.patch + + # Switch to girepository-2.0 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/eog/raw/939eee56e5b72b02a8c0f4f867431cf6426adb9e/f/libpeas1_pygobject352.patch"; + hash = "sha256-5QIkxxUvGKzb0cMCIcfuu7FX9XuY+RrKNunSvRDEDRc="; + }) ]; nativeBuildInputs = [ From ffa116627f1f6c3340ad754158dd1d38ff2c75da Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 13 Oct 2025 22:32:20 +0800 Subject: [PATCH 0887/2279] astroid: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/applications/networking/mailreaders/astroid/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 796742c045af..ce71099f1391 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc + + # Switch to girepository-2.0 + substituteInPlace src/plugin/gir_main.c \ + --replace-fail "" "" \ + --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group" ''; nativeBuildInputs = [ From 197691f232b6785148a55ab1b23d08d0f0409536 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 15 Oct 2025 23:44:49 +0800 Subject: [PATCH 0888/2279] entangle: Switch to girepository-2.0 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. https://github.com/GNOME/glib/commit/f55b18e11e88bd58f20ce9d7f3c29ccf9e17514e --- .../en/entangle/girepository-2.0.patch | 39 +++++++++++++++++++ pkgs/by-name/en/entangle/package.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/by-name/en/entangle/girepository-2.0.patch diff --git a/pkgs/by-name/en/entangle/girepository-2.0.patch b/pkgs/by-name/en/entangle/girepository-2.0.patch new file mode 100644 index 000000000000..7454480bc3fa --- /dev/null +++ b/pkgs/by-name/en/entangle/girepository-2.0.patch @@ -0,0 +1,39 @@ +diff --git a/src/entangle-main.c b/src/entangle-main.c +index 970bfee..8bc16eb 100644 +--- a/src/entangle-main.c ++++ b/src/entangle-main.c +@@ -21,7 +21,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +@@ -80,7 +80,11 @@ main(int argc, char **argv) + gst_init(NULL, NULL); + + if (ins) { +- g_irepository_dump(ins, NULL); ++ char **ins_args; ++ ins_args = g_strsplit(ins, ",", 2); ++ if (g_strv_length(ins_args) == 2) ++ gi_repository_dump(ins_args[0], ins_args[1], NULL); ++ g_strfreev(ins_args); + return 0; + } + +diff --git a/src/frontend/entangle-application.c b/src/frontend/entangle-application.c +index 3e3e1af..f7c03d5 100644 +--- a/src/frontend/entangle-application.c ++++ b/src/frontend/entangle-application.c +@@ -470,7 +470,7 @@ entangle_application_init(EntangleApplication *app) + app->activeCameras = entangle_camera_list_new_active(); + app->supportedCameras = entangle_camera_list_new_supported(); + +- g_irepository_require(g_irepository_get_default(), "Peas", "1.0", 0, NULL); ++ gi_repository_require(gi_repository_dup_default(), "Peas", "1.0", 0, NULL); + + userdir = + g_build_filename(g_get_user_config_dir(), "entangle/plugins", NULL); diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix index bfd5c8dbae19..9ab3e2973b29 100644 --- a/pkgs/by-name/en/entangle/package.nix +++ b/pkgs/by-name/en/entangle/package.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ + # Switch to girepository-2.0 + # https://src.fedoraproject.org/rpms/libpeas1/pull-request/3 + ./girepository-2.0.patch + # Fix build with meson 0.61, can be removed on next update # https://gitlab.com/entangle/entangle/-/issues/67 (fetchpatch { From 28cbff44416df6177a4a8e07c783728966251e91 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 16 Oct 2025 21:07:56 +0800 Subject: [PATCH 0889/2279] pantheon.elementary-mail: Fix build with evolution-data-server 3.57.1 The evolution-data-server 3.57.1 release contains API changes in libcamel, which are incompatible with the previous versions. --- .../desktops/pantheon/apps/elementary-mail/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index a8b9958f4c8e..882055e26b4f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, nix-update-script, pkg-config, meson, @@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; }; + patches = [ + # Adapt to libcamel API changes in 3.57.1 + # https://github.com/elementary/mail/pull/1023 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/8cb5bb87ceca9000c2a556bafeb059b9f1cbf2f1.patch"; + hash = "sha256-NFZVvKJyPTV+lRcefTIgm2jOmCfrY+TlawDYzGTBd7Y="; + }) + ]; + nativeBuildInputs = [ libxml2 meson From bab004adb74e39b493514b2997c8e12f564825f6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Oct 2025 20:31:14 +0800 Subject: [PATCH 0890/2279] =?UTF-8?q?unihan-database:=2015.1.0=20=E2=86=92?= =?UTF-8?q?=2017.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.unicode.org/versions/Unicode17.0.0/ Updated together with gucharmap. --- pkgs/by-name/un/unihan-database/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unihan-database/package.nix b/pkgs/by-name/un/unihan-database/package.nix index e3b2d493c644..9e0a0937d10f 100644 --- a/pkgs/by-name/un/unihan-database/package.nix +++ b/pkgs/by-name/un/unihan-database/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "unihan-database"; - version = "15.1.0"; + version = "17.0.0"; src = fetchurl { - url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip"; - hash = "sha256-oCJmEOMkvPeErDgOEfTL9TPuHms9AosJkb+MDcP4WFM="; + url = "https://www.unicode.org/Public/${version}/ucd/Unihan.zip"; + hash = "sha256-96SLK1Raz6p3stYHrih0dATOArrv7hY5bF0teo7zS14="; }; nativeBuildInputs = [ From 50a9c285decbbb8ef9e542f997c62a402d6177ca Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 25 Oct 2025 20:35:18 +0800 Subject: [PATCH 0891/2279] =?UTF-8?q?unicode-character-database:=2016.0.0?= =?UTF-8?q?=20=E2=86=92=2017.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.unicode.org/versions/Unicode17.0.0/ Updated together with gucharmap. --- pkgs/by-name/un/unicode-character-database/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unicode-character-database/package.nix b/pkgs/by-name/un/unicode-character-database/package.nix index 48e17bdd6654..a2237aa121dc 100644 --- a/pkgs/by-name/un/unicode-character-database/package.nix +++ b/pkgs/by-name/un/unicode-character-database/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "unicode-character-database"; - version = "16.0.0"; + version = "17.0.0"; src = fetchurl { - url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip"; - sha256 = "sha256-yG3YHysUpDsMwGSqX4mqckE4aAHjXFnHmE5XmDJjTrI="; + url = "https://www.unicode.org/Public/${version}/ucd/UCD.zip"; + sha256 = "sha256-IGbRkJsuqTkWzgktocDuSAjqPvhAfJS08U9bfrJj0o4="; }; nativeBuildInputs = [ From e88680add207a06fec978b3a10f086862ad20197 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 22:50:16 +0800 Subject: [PATCH 0892/2279] budgie-desktop: Switch to libpeas-2 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/bu/budgie-desktop/package.nix | 12 +- pkgs/by-name/bu/budgie-desktop/plugins.patch | 198 ++++--------------- 2 files changed, 40 insertions(+), 170 deletions(-) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 78ab0acaa191..8e14de959279 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -9,6 +9,7 @@ glib, gnome-desktop, gnome-settings-daemon, + gobject-introspection, graphene, gst_all_1, gtk-doc, @@ -20,7 +21,7 @@ libGL, libgudev, libnotify, - libpeas, + libpeas2, libpulseaudio, libuuid, libwacom, @@ -47,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.9.3"; + version = "10.9.3-unstable-2025-09-13"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; - tag = "v${finalAttrs.version}"; + rev = "68d5136613fa1b15d39cc67ada3085590ec162ae"; fetchSubmodules = true; - hash = "sha256-hiDEsDV/meYMORZ4aSPD7UP28SQVcv6cM7N89fOZeT8="; + hash = "sha256-xqN06CGS4xyUwnJCsLplYzKtO/V8hDmb6UNJu/nhQHs="; }; outputs = [ @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ docbook-xsl-nons + gobject-introspection gtk-doc intltool meson @@ -113,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ # budgie-1.0.pc, budgie-raven-plugin-1.0.pc - libpeas + libpeas2 ]; mesonFlags = [ diff --git a/pkgs/by-name/bu/budgie-desktop/plugins.patch b/pkgs/by-name/bu/budgie-desktop/plugins.patch index 9fa40adaa5dc..f8d5ac40adfe 100644 --- a/pkgs/by-name/bu/budgie-desktop/plugins.patch +++ b/pkgs/by-name/bu/budgie-desktop/plugins.patch @@ -1,175 +1,45 @@ -diff --git a/meson.build b/meson.build -index 6c6e473e..9b8fb73a 100644 ---- a/meson.build -+++ b/meson.build -@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir')) - localedir = join_paths(prefix, get_option('localedir')) - podir = join_paths(meson.source_root(), 'po') +diff --git a/src/panel/plugin/plugin-manager.c b/src/panel/plugin/plugin-manager.c +index 1f0d32d60..2f46cee6e 100644 +--- a/src/panel/plugin/plugin-manager.c ++++ b/src/panel/plugin/plugin-manager.c +@@ -115,12 +115,26 @@ static void budgie_panel_plugin_manager_init(BudgiePanelPluginManager *self) { + } --cdata.set_quoted('DATADIR', datadir) --cdata.set_quoted('SYSCONFDIR', confdir) --cdata.set_quoted('LOCALEDIR', localedir) --cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org') -- - # Handle i18n on the .desktop file - # Originally stolem from TingPing: - # https://github.com/vinszent/gnome-twitch/blob/master/data/meson.build -@@ -111,23 +106,10 @@ cdata.set_quoted('MODULEDIR', plugin_libdir) - cdata.set_quoted('MODULE_DATA_DIR', plugin_datadir) - cdata.set_quoted('RAVEN_PLUGIN_LIBDIR', raven_plugin_libdir) - cdata.set_quoted('RAVEN_PLUGIN_DATADIR', raven_plugin_datadir) -- --if prefix == '/usr' or prefix == '/usr/local' -- cdata.set('HAS_SECONDARY_PLUGIN_DIRS', true) -- -- if prefix == '/usr' -- secondary_libdir_root = join_paths(prefix, 'local', get_option('libdir'), meson.project_name()) -- secondary_datadir_root = join_paths(prefix, 'local', get_option('datadir'), meson.project_name()) -- else -- secondary_libdir_root = join_paths('/usr', get_option('libdir'), meson.project_name()) -- secondary_datadir_root = join_paths('/usr', get_option('datadir'), meson.project_name()) -- endif -- -- cdata.set_quoted('MODULEDIR_SECONDARY', join_paths(secondary_libdir_root, 'plugins')) -- cdata.set_quoted('MODULE_DATA_DIR_SECONDARY', join_paths(secondary_datadir_root, 'plugins')) -- cdata.set_quoted('RAVEN_PLUGIN_LIBDIR_SECONDARY', join_paths(secondary_libdir_root, 'raven-plugins')) -- cdata.set_quoted('RAVEN_PLUGIN_DATADIR_SECONDARY', join_paths(secondary_datadir_root, 'raven-plugins')) --endif -+cdata.set_quoted('DATADIR', datadir) -+cdata.set_quoted('SYSCONFDIR', confdir) -+cdata.set_quoted('LOCALEDIR', localedir) -+cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org') + /* System path */ +- peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY, BUDGIE_MODULE_DATA_DIRECTORY); ++ const gchar* libdir = NULL; ++ const gchar* datadir = NULL; ++ libdir = g_getenv("BUDGIE_PLUGIN_LIBDIR"); ++ if (libdir != NULL) { ++ g_debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir); ++ } else { ++ g_debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", BUDGIE_MODULE_DIRECTORY); ++ libdir = BUDGIE_MODULE_DIRECTORY; ++ } - with_bluetooth = get_option('with-bluetooth') - if with_bluetooth == true -diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c -index 3ffe3632..da53e054 100644 ---- a/src/config/budgie-config.c -+++ b/src/config/budgie-config.c -@@ -11,7 +11,6 @@ +- if (BUDGIE_HAS_SECONDARY_PLUGIN_DIRS) { +- peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY_SECONDARY, BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY); ++ datadir = g_getenv("BUDGIE_PLUGIN_DATADIR"); ++ if (datadir != NULL) { ++ g_debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); ++ } else { ++ g_debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", BUDGIE_MODULE_DATA_DIRECTORY); ++ datadir = BUDGIE_MODULE_DATA_DIRECTORY; + } - #ifndef CONFIG_H_INCLUDED - #include "config.h" --#include - #include - - /** -@@ -22,20 +21,6 @@ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR; - const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR; - const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR; - --#ifdef HAS_SECONDARY_PLUGIN_DIRS --const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true; --const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY; --const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = MODULE_DATA_DIR_SECONDARY; --const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = RAVEN_PLUGIN_LIBDIR_SECONDARY; --const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = RAVEN_PLUGIN_DATADIR_SECONDARY; --#else --const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false; --const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL; --const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = NULL; --const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = NULL; --const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = NULL; --#endif -- - const char* BUDGIE_DATADIR = DATADIR; - const char* BUDGIE_VERSION = PACKAGE_VERSION; - const char* BUDGIE_WEBSITE = PACKAGE_URL; -diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h -index b7581203..11df4347 100644 ---- a/src/config/budgie-config.h -+++ b/src/config/budgie-config.h -@@ -12,7 +12,6 @@ - #ifndef _BUDGIE_CONFIG_H_ - #define _BUDGIE_CONFIG_H_ - --#include - #include - - /* i.e. /usr/lib/budgie-desktop */ -@@ -27,12 +26,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR; - /* i.e. /usr/share/budgie-desktop/raven-plugins */ - extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR; - --extern const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS; --extern const char* BUDGIE_MODULE_DIRECTORY_SECONDARY; --extern const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY; --extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY; --extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY; -- - /* i.e. /usr/share/ */ - extern const char* BUDGIE_DATADIR; - -diff --git a/src/config/budgie-config.vapi b/src/config/budgie-config.vapi -index 5eb445d1..7d27e348 100644 ---- a/src/config/budgie-config.vapi -+++ b/src/config/budgie-config.vapi -@@ -22,21 +22,6 @@ namespace Budgie { - [CCode (cheader_filename="budgie-config.h")] - public extern const string RAVEN_PLUGIN_DATADIR; - -- [CCode (cheader_filename="budgie-config.h")] -- public extern const bool HAS_SECONDARY_PLUGIN_DIRS; -- -- [CCode (cheader_filename="budgie-config.h")] -- public extern const string? MODULE_DIRECTORY_SECONDARY; -- -- [CCode (cheader_filename="budgie-config.h")] -- public extern const string? MODULE_DATA_DIRECTORY_SECONDARY; -- -- [CCode (cheader_filename="budgie-config.h")] -- public extern const string? RAVEN_PLUGIN_LIBDIR_SECONDARY; -- -- [CCode (cheader_filename="budgie-config.h")] -- public extern const string? RAVEN_PLUGIN_DATADIR_SECONDARY; -- - [CCode (cheader_filename="budgie-config.h")] - public extern const string DATADIR; - -diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala -index f4f2e4da..3dfee49a 100644 ---- a/src/panel/plugin_manager.vala -+++ b/src/panel/plugin_manager.vala -@@ -40,13 +40,26 @@ namespace Budgie { - } - - /* System path */ -- var dir = Environment.get_user_data_dir(); -- engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY); -- if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) { -- engine.add_search_path(Budgie.MODULE_DIRECTORY_SECONDARY, Budgie.MODULE_DATA_DIRECTORY_SECONDARY); -+ var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR"); -+ if (libdir != null) { -+ debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir); -+ } else { -+ debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY); -+ libdir = Budgie.MODULE_DIRECTORY; -+ } ++ peas_engine_add_search_path(self->engine, libdir, datadir); + -+ var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR"); -+ if (datadir != null) { -+ debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); -+ } else { -+ debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY); -+ datadir = Budgie.MODULE_DATA_DIRECTORY; - } - -+ engine.add_search_path(libdir, datadir); -+ - /* User path */ -+ var dir = Environment.get_user_data_dir(); - var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins"); - var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data"); - engine.add_search_path(user_mod, hdata); + /* User path */ + user_data_dir = g_get_user_data_dir(); + user_mod_dir = g_build_path(G_DIR_SEPARATOR_S, user_data_dir, "budgie-desktop", "plugins", NULL); diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala -index 01f32553..2826b7e5 100644 +index 1ff139c9a..809b9b82a 100644 --- a/src/raven/plugin_manager.vala +++ b/src/raven/plugin_manager.vala -@@ -51,13 +51,26 @@ namespace Budgie { - } +@@ -51,11 +51,24 @@ namespace Budgie { /* System path */ -- var dir = Environment.get_user_data_dir(); + var dir = Environment.get_user_data_dir(); - engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR); - if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) { - engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR_SECONDARY, Budgie.RAVEN_PLUGIN_DATADIR_SECONDARY); @@ -192,7 +62,5 @@ index 01f32553..2826b7e5 100644 + engine.add_search_path(libdir, datadir); + /* User path */ -+ var dir = Environment.get_user_data_dir(); var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins"); var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-data"); - engine.add_search_path(user_mod, hdata); From 4e8ecda21725bc1538f2f2273cb077e11b18ddef Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 23:02:36 +0800 Subject: [PATCH 0893/2279] budgie-analogue-clock-applet: Switch to libpeas-2 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- .../bu/budgie-analogue-clock-applet/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index bd0b1dcf1d0e..f2c93edc49b6 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -8,7 +8,7 @@ vala, budgie-desktop, gtk3, - libpeas, + libpeas2, nix-update-script, }: @@ -33,9 +33,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ budgie-desktop gtk3 - libpeas + libpeas2 ]; + postPatch = '' + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + substituteInPlace meson.build \ + --replace-fail "dependency('libpeas-1.0')" "dependency('libpeas-2')" + ''; + passthru = { updateScript = nix-update-script { }; }; From 48d6568862de47cd5be07d75d729b6ab914d497c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 23:04:58 +0800 Subject: [PATCH 0894/2279] budgie-systemmonitor-applet: Switch to libpeas-2 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- .../by-name/bu/budgie-systemmonitor-applet/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix index b4bb9cb2ae23..14ca2c0c4188 100644 --- a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix @@ -7,7 +7,7 @@ gtk3, libgee, libgtop, - libpeas, + libpeas2, meson, ninja, nix-update-script, @@ -45,9 +45,15 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libgee libgtop - libpeas + libpeas2 ]; + postPatch = '' + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + substituteInPlace meson.build \ + --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" + ''; + passthru = { updateScript = nix-update-script { }; }; From 9eb007eb571d0152189faab2e98c1aacbab77743 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 23:06:37 +0800 Subject: [PATCH 0895/2279] budgie-user-indicator-redux: Switch to libpeas-2 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- .../by-name/bu/budgie-user-indicator-redux/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix index 8a90ba6725ed..4c398702469d 100644 --- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix +++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix @@ -7,7 +7,7 @@ gtk3, intltool, libgee, - libpeas, + libpeas2, meson, ninja, nix-update-script, @@ -40,10 +40,16 @@ stdenv.mkDerivation (finalAttrs: { budgie-desktop gtk3 libgee - libpeas + libpeas2 sassc ]; + postPatch = '' + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + substituteInPlace meson.build \ + --replace-fail "dependency('libpeas-1.0', version: '>= 1.26.0')" "dependency('libpeas-2')" + ''; + passthru = { updateScript = nix-update-script { }; }; From 52726692583dcec254fc6a41f95fe6dc08c3ad2d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 23:25:58 +0800 Subject: [PATCH 0896/2279] budgie-media-player-applet: Switch to libpeas-2 See https://gitlab.gnome.org/GNOME/libpeas/-/issues/58. --- pkgs/by-name/bu/budgie-media-player-applet/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index b0228b8c9ae4..9e2f0419ae0c 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace meson.build --replace-fail "/usr" "$out" + + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + substituteInPlace budgie-media-player-applet.plugin.in \ + --replace-fail "Loader=@PYTHON@" "Loader=python" ''; postFixup = '' From 46391794055c11ed20e22656127d4f728dc1b263 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Nov 2025 03:04:46 +0100 Subject: [PATCH 0897/2279] =?UTF-8?q?glib:=202.86.0=20=E2=86=92=202.86.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.86.0...2.86.1 --- pkgs/by-name/gl/glib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index 91ef5d200fc9..b217b4a0dbf4 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.86.0"; + version = "2.86.1"; outputs = [ "bin" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-tXOZctc3z7DW/R5/Fj3+ZQ4uA3QLs7jUCOTR+upYDW0="; + hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc="; }; patches = From 23f16d7cabcbf2b43bd9d44ea18cccaf18f1fad7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 3 Nov 2025 11:17:20 +0100 Subject: [PATCH 0898/2279] nixos/rl-2511: Add GNOME 49 notes --- nixos/doc/manual/release-notes/rl-2511.section.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 24ca7061f630..cc499153bdf6 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -22,6 +22,14 @@ - COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability. +- GNOME has been updated to version 49. + + - Removes X11 session support. Though you can still run X11 apps using XWayland. + - gnome-session’s custom service manager was removed in favour of using systemd. + - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058). + + Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details. + ## New Modules {#sec-release-25.11-new-modules} From 5ee90348fd90971a5705e0ef18b68d35c50f2859 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 08:35:22 -0300 Subject: [PATCH 0899/2279] opensurge: fix build with cmake4 --- pkgs/by-name/op/opensurge/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix index f488d3dd7e4d..9b3294882af6 100644 --- a/pkgs/by-name/op/opensurge/package.nix +++ b/pkgs/by-name/op/opensurge/package.nix @@ -51,6 +51,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = { mainProgram = "opensurge"; description = "Fun 2D retro platformer inspired by Sonic games and a game creation system"; From a6c47b24c4730f87712aa7f7b440eeca5de8231a Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 08:37:48 -0300 Subject: [PATCH 0900/2279] opensurge: add maintainer iedame --- pkgs/by-name/op/opensurge/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix index 9b3294882af6..0088113e1d0c 100644 --- a/pkgs/by-name/op/opensurge/package.nix +++ b/pkgs/by-name/op/opensurge/package.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iedame ]; }; }) From 7bab532eaefabd2f4d5186a0b59d5dbace8d7796 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 3 Nov 2025 13:44:57 +0100 Subject: [PATCH 0901/2279] spandsp,spandsp3: fix tests on musl Includes a couple of test portability fixes, and also, for spandsp 0.0.6, a couple of memory safety backports that fix test failures on musl. Fixes: 8ab72653f2cb ("{spandsp,spandsp3}: Enable tests") --- .../Check-for-feenableexcept-explicitly.patch | 132 ++++++++++++++++++ .../Fix-tests-pcap_parse-build-on-musl.patch | 28 ++++ pkgs/development/libraries/spandsp/common.nix | 10 +- .../development/libraries/spandsp/default.nix | 12 ++ 4 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch create mode 100644 pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch diff --git a/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch b/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch new file mode 100644 index 000000000000..a336732b9000 --- /dev/null +++ b/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch @@ -0,0 +1,132 @@ +From c0caa79a2aa6ac5b358f30719ff80ee2c6db51f7 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Mon, 3 Nov 2025 12:06:15 +0100 +Subject: [PATCH] Check for feenableexcept() explicitly + +musl provides , but not the non-standard feenableexcept() +function, so using feenableexcept() whenever was present +caused build failures on musl. Instead, explicitly check for the +non-standard function we want to use. +--- + configure.ac | 2 +- + tests/v17_tests.c | 6 +++--- + tests/v27ter_tests.c | 6 +++--- + tests/v29_tests.c | 6 +++--- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa87245..a8864d8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,6 +186,7 @@ AC_CHECK_FUNCS([strstr]) + AC_CHECK_FUNCS([strtol]) + AC_CHECK_FUNCS([gettimeofday]) + AC_CHECK_FUNCS([drand48]) ++AC_CHECK_FUNCS([feenableexcept]) + + AC_HEADER_SYS_WAIT + +@@ -209,7 +210,6 @@ AC_CHECK_HEADERS([sys/select.h]) + AC_CHECK_HEADERS([sys/ioctl.h]) + AC_CHECK_HEADERS([sys/fcntl.h]) + AC_CHECK_HEADERS([sndfile.h]) +-AC_CHECK_HEADERS([fenv.h]) + AC_CHECK_HEADERS([fftw3.h], , [AC_CHECK_HEADERS([fftw.h])]) + AC_CHECK_HEADERS([pcap.h]) + AC_CHECK_HEADERS([pthread.h]) +diff --git a/tests/v17_tests.c b/tests/v17_tests.c +index 17c7fcb..411396c 100644 +--- a/tests/v17_tests.c ++++ b/tests/v17_tests.c +@@ -59,7 +59,7 @@ display of modem status is maintained. + #include + #include + #include +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + #define __USE_GNU + #include + #endif +@@ -263,7 +263,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex + } + /*- End of function --------------------------------------------------------*/ + +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + static void sigfpe_handler(int sig_num, siginfo_t *info, void *data) + { + switch (sig_num) +@@ -425,7 +425,7 @@ int main(int argc, char *argv[]) + inhandle = NULL; + outhandle = NULL; + +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + fpe_trap_setup(); + #endif + +diff --git a/tests/v27ter_tests.c b/tests/v27ter_tests.c +index 14b06f8..f0559a4 100644 +--- a/tests/v27ter_tests.c ++++ b/tests/v27ter_tests.c +@@ -58,7 +58,7 @@ display of modem status is maintained. + #include + #include + #include +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + #define __USE_GNU + #include + #endif +@@ -286,7 +286,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex + } + /*- End of function --------------------------------------------------------*/ + +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + static void sigfpe_handler(int sig_num, siginfo_t *info, void *data) + { + switch (sig_num) +@@ -440,7 +440,7 @@ int main(int argc, char *argv[]) + inhandle = NULL; + outhandle = NULL; + +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + fpe_trap_setup(); + #endif + +diff --git a/tests/v29_tests.c b/tests/v29_tests.c +index 390663f..7a43797 100644 +--- a/tests/v29_tests.c ++++ b/tests/v29_tests.c +@@ -58,7 +58,7 @@ display of modem status is maintained. + #include + #include + #include +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + #define __USE_GNU + #include + #endif +@@ -257,7 +257,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex + } + /*- End of function --------------------------------------------------------*/ + +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + static void sigfpe_handler(int sig_num, siginfo_t *info, void *data) + { + switch (sig_num) +@@ -410,7 +410,7 @@ int main(int argc, char *argv[]) + inhandle = NULL; + outhandle = NULL; + +-#if defined(HAVE_FENV_H) ++#if defined(HAVE_FEENABLEEXCEPT) + fpe_trap_setup(); + #endif + +-- +2.51.0 + diff --git a/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch b/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch new file mode 100644 index 000000000000..a7498ab1a63e --- /dev/null +++ b/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch @@ -0,0 +1,28 @@ +From 5007684cd46fec39d3c8f67a222f2d34d48fd4b4 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Mon, 3 Nov 2025 12:07:48 +0100 +Subject: [PATCH] Fix tests/pcap_parse build on musl + +musl only defines the Linux-style struct udphdr member names if +_GNU_SOURCE is defined, so do that, like certain other tests already +do. +--- + tests/pcap_parse.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/pcap_parse.c b/tests/pcap_parse.c +index 4e79743..a8a69a3 100644 +--- a/tests/pcap_parse.c ++++ b/tests/pcap_parse.c +@@ -31,6 +31,8 @@ + #include "config.h" + #endif + ++#define _GNU_SOURCE ++ + #include + #include + #include +-- +2.51.0 + diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index baff42276a60..317e5494f790 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -21,6 +21,7 @@ { version, src, + patches ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -33,7 +34,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/freeswitch/spandsp/commit/1f810894804d3fa61ab3fc2f3feb0599145a3436.patch"; hash = "sha256-Cf8aaoriAvchh5cMb75yP2gsZbZaOLha/j5mq3xlkVA="; }) - ]; + + # https://github.com/freeswitch/spandsp/pull/110 + ./Check-for-feenableexcept-explicitly.patch + + # https://github.com/freeswitch/spandsp/pull/111 + ./Fix-tests-pcap_parse-build-on-musl.patch + ] + ++ patches; postPatch = '' patchShebangs autogen.sh diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index e2b70b402778..9720e110f7cf 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,5 +1,6 @@ { fetchurl, + fetchpatch, callPackage, }: @@ -9,4 +10,15 @@ url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; + patches = [ + (fetchpatch { + url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch"; + includes = [ "spandsp-sim/g1050.c" ]; + hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ="; + }) + (fetchpatch { + url = "https://github.com/freeswitch/spandsp/commit/f47bcdc301fbddad44e918939eed1b361882f740.patch"; + hash = "sha256-O+lIC3V92GVFoiHsUQOXkoTN2hJ7v5+LQP7RrAhvwlY="; + }) + ]; } From d8486c1e524235d86cdadd080d82e73a6fa52e12 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 2 Nov 2025 22:58:09 +0400 Subject: [PATCH 0902/2279] nextvi: init at 2.1 --- pkgs/by-name/ne/nextvi/package.nix | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/ne/nextvi/package.nix diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix new file mode 100644 index 000000000000..237c507bb622 --- /dev/null +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nextvi"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "kyx0r"; + repo = "nextvi"; + tag = finalAttrs.version; + hash = "sha256-FBUcmCkGOf7HVLkZqHWxHxS0qhz5t9VwbWb0VOGnb28="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildPhase = '' + runHook preBuild + + sh ./cbuild.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + PREFIX=$out sh ./cbuild.sh install + + mv $out/bin/{vi,nextvi} + installManPage --name nextvi.1 vi.1 + + runHook postInstall + ''; + + meta = { + description = "Next version of neatvi (a small vi/ex editor)"; + homepage = "https://github.com/kyx0r/nextvi"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "nextvi"; + }; +}) From a783a81473a7657c76410ad9f99f3ea2b4ed2fce Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 3 Nov 2025 22:33:42 +0900 Subject: [PATCH 0903/2279] rumdl: 0.0.166 -> 0.0.169 Diff: https://github.com/rvben/rumdl/compare/v0.0.166...v0.0.169 Changelog: https://github.com/rvben/rumdl/blob/v0.0.169/CHANGELOG.md --- pkgs/by-name/ru/rumdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index b920521248a0..b056bef021d4 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.0.166"; + version = "0.0.169"; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg="; + hash = "sha256-1ly0bAA8NGGqdF6U/BYGvr+aR6OU0ArbK7A0vAMdtlQ="; }; - cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU="; + cargoHash = "sha256-qnNm69SM3pt0LAIOvu0xhnTFft+SCD2LmY3hNoturmo="; cargoBuildFlags = [ "--bin=rumdl" From 5285abfb784cbcee59db51cb274031485dd2107e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Nov 2025 13:51:51 +0000 Subject: [PATCH 0904/2279] kubectl-gadget: 0.44.1 -> 0.46.0 --- pkgs/by-name/ku/kubectl-gadget/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 0602263f0c12..fbf0d59eba9c 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.44.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-S3LF07KY8AwEU8xqgkl4XNNNdygmy0ILfQKVScponlk="; + hash = "sha256-y5eqkTt9CnEPOyFERWhBPqrgnMGaVuWN2FoDV0pDjdI="; }; - vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg="; + vendorHash = "sha256-TBaMbIwR/7MzPn8rYgjqeMLma3arwr5W9HiTztd8z9E="; env.CGO_ENABLED = 0; From d03e33e7a4a320cd055f4274f7aceeb32e62d54a Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Mon, 3 Nov 2025 09:02:26 -0500 Subject: [PATCH 0905/2279] sparrow: remove maintainer emmanuelrosa --- pkgs/by-name/sp/sparrow/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/sp/sparrow/package.nix b/pkgs/by-name/sp/sparrow/package.nix index 10d0ad29f679..2533b628abe7 100644 --- a/pkgs/by-name/sp/sparrow/package.nix +++ b/pkgs/by-name/sp/sparrow/package.nix @@ -301,7 +301,6 @@ stdenvNoCC.mkDerivation rec { ]; license = licenses.asl20; maintainers = with maintainers; [ - emmanuelrosa msgilligan _1000101 ]; From c7e1d27b58e53fff068b81eeb579f168f17d9e26 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 3 Nov 2025 23:13:50 +0800 Subject: [PATCH 0906/2279] pizauth: migrate to finalAttrs --- pkgs/by-name/pi/pizauth/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index fda6138a37b1..5cec7409b239 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -6,14 +6,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "pizauth"; version = "1.0.7"; src = fetchFromGitHub { owner = "ltratt"; repo = "pizauth"; - tag = "pizauth-${version}"; + tag = "pizauth-${finalAttrs.version}"; hash = "sha256-lvG50Ej0ius4gHEsyMKOXLD20700mc4iWJxHK5DvYJc="; }; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Command-line OAuth2 authentication daemon"; homepage = "https://github.com/ltratt/pizauth"; - changelog = "https://github.com/ltratt/pizauth/blob/${src.rev}/CHANGES.md"; + changelog = "https://github.com/ltratt/pizauth/blob/${finalAttrs.src.rev}/CHANGES.md"; license = with lib.licenses; [ asl20 mit @@ -39,4 +39,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "pizauth"; }; -} +}) From 2cc2688a9d50d46a9b52e940ef7c0fa59269d77c Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 3 Nov 2025 23:31:02 +0800 Subject: [PATCH 0907/2279] pizauth: 1.0.7 -> 1.0.8 --- pkgs/by-name/pi/pizauth/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 5cec7409b239..82863c702180 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -8,22 +8,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pizauth"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "ltratt"; repo = "pizauth"; tag = "pizauth-${finalAttrs.version}"; - hash = "sha256-lvG50Ej0ius4gHEsyMKOXLD20700mc4iWJxHK5DvYJc="; + hash = "sha256-KLHccRCJ19CrGKePhUgW4GhQzn+ULE861cW2ykGoaZk="; }; - cargoHash = "sha256-WyQIk74AKfsv0noafCGMRS6o+Lq6CeP99AFSdYq+QHg="; + cargoHash = "sha256-m1kOV0b/HCSAGfbEh4GdtrlphoELe7ebG+kgKKNYihY="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd pizauth \ - --bash share/bash/completion.bash + --bash share/bash/completion.bash \ + --fish share/fish/pizauth.fish ''; passthru.updateScript = nix-update-script { }; From cc2fca607c6bd91ca2fe6c11654ed23247bddb42 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 3 Nov 2025 23:37:36 +0800 Subject: [PATCH 0908/2279] pizauth: add manpage --- pkgs/by-name/pi/pizauth/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 82863c702180..9d8ab68b89bd 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -25,6 +25,8 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion --cmd pizauth \ --bash share/bash/completion.bash \ --fish share/fish/pizauth.fish + + installManPage pizauth.1 pizauth.conf.5 ''; passthru.updateScript = nix-update-script { }; From 64441ef9c19bf500d039e674bd765a80fb4cd32a Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 3 Nov 2025 23:48:04 +0800 Subject: [PATCH 0909/2279] pizauth: add systemd user services --- pkgs/by-name/pi/pizauth/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 9d8ab68b89bd..1722b3c0872c 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -27,6 +27,10 @@ rustPlatform.buildRustPackage (finalAttrs: { --fish share/fish/pizauth.fish installManPage pizauth.1 pizauth.conf.5 + + substituteInPlace lib/systemd/user/pizauth.service \ + --replace-fail /usr/bin/pizauth "$out/bin/pizauth" + install -Dm444 lib/systemd/user/pizauth{,-*}.service -t $out/lib/systemd/user ''; passthru.updateScript = nix-update-script { }; From ba23f63886f5778b8cd5b0637199ea369559754b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Tue, 4 Nov 2025 00:54:28 +0900 Subject: [PATCH 0910/2279] artichoke: drop The upstream repository was archived in 2025-11. https://web.archive.org/web/20251103161827/https://github.com/artichoke/artichoke --- pkgs/by-name/ar/artichoke/package.nix | 58 --------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/by-name/ar/artichoke/package.nix diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix deleted file mode 100644 index d4d1c5e90c95..000000000000 --- a/pkgs/by-name/ar/artichoke/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - llvmPackages, - _experimental-update-script-combinators, - unstableGitUpdater, - nix-update-script, -}: - -rustPlatform.buildRustPackage { - pname = "artichoke"; - version = "0-unstable-2025-09-07"; - - src = fetchFromGitHub { - owner = "artichoke"; - repo = "artichoke"; - rev = "8227e6dbb298631c67b4ca2cc4c911d0ef87f38a"; - hash = "sha256-Pyffs4QB/SkayRwlMmIVagNiamznJp4Dt3nqRDJYfqU="; - }; - - cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg="; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - ]; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - stdout="$("$out/bin/artichoke" -e 'puts "Hello World!"')" - [[ "$stdout" == 'Hello World!' ]] - - runHook postInstallCheck - ''; - - passthru = { - updateScript = _experimental-update-script-combinators.sequence [ - (unstableGitUpdater { }) - (nix-update-script { - # Updating `cargoHash` - extraArgs = [ "--version=skip" ]; - }) - ]; - }; - - meta = { - description = "Ruby implementation written in Rust and Ruby"; - homepage = "https://www.artichokeruby.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - kachick - ]; - mainProgram = "artichoke"; - platforms = with lib.platforms; unix ++ windows; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba2b7755c455..92183487e2f5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -303,6 +303,7 @@ mapAliases { argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27 aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27 arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + artichoke = throw "artichoke has been removed due to being archived upstream."; # Added 2025-11-04 artim-dark = aritim-dark; # Added 2025-07-27 aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27 asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27 From 5aadca9efb935cc56866c5ecf52d0d1070b1df88 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 3 Nov 2025 16:53:39 +0100 Subject: [PATCH 0911/2279] curlMinimal: apply paused HTTP/2 transfer fix This is done before the final release due to how critical this bug is on any application that relies on paused HTTP/2 transfers (e.g. Lix at high concurrency during substitutions). This can be removed as soon as 8.17.0 is landed. Change-Id: I5bf8d7423447fff8e9a16e2c1ce67e432f769885 Signed-off-by: Raito Bezarius --- .../curlMinimal/fix-h2-paused-transfers.patch | 27 +++++++++++++++++++ pkgs/by-name/cu/curlMinimal/package.nix | 8 ++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch diff --git a/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch b/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch new file mode 100644 index 000000000000..50e202684b8c --- /dev/null +++ b/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch @@ -0,0 +1,27 @@ +From 7e91f24c73256af59ac9061c41b73a184c4690aa Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Mon, 3 Nov 2025 15:07:57 +0100 +Subject: [PATCH] cw-out: fix EAGAIN handling on pause + +The interim CURLE_AGAIN result was not always converted to a +CURLE_OK and then caused write callers to report a failure. + +Fixes #19334 +Reported-by: pennae on github +Closes #19338 +--- + lib/cw-out.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/cw-out.c b/lib/cw-out.c +index 1f4031649267..9c0a36e7e5e2 100644 +--- a/lib/cw-out.c ++++ b/lib/cw-out.c +@@ -302,6 +302,7 @@ static CURLcode cw_out_buf_flush(struct cw_out_ctx *ctx, + &consumed); + if(result && (result != CURLE_AGAIN)) + return result; ++ result = CURLE_OK; + + if(consumed) { + if(consumed == curlx_dyn_len(&cwbuf->b)) { diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 2ce9522d6f4d..244454016e47 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -98,6 +98,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QMjN28tsxiUcA96kI6Ryps6kA3vmVLpc9d7G6y0i/x0="; }; + patches = [ + # Bug introduced in curl@fa915b (8.16.0) https://github.com/curl/curl/issues/19334 Paused + # HTTP/2 transfers will return the wrong errors and trash the whole + # transfer. Remove this patch once curl is updated to 8.17.0 which will be + # released on the 5th November 2025. + ./fix-h2-paused-transfers.patch + ]; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' From 6492632ea5f32e5ef5273be7b0ce1f8af220984d Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 13:38:57 -0300 Subject: [PATCH 0912/2279] mtpaint: 3.50.01 -> 3.50.12 --- pkgs/by-name/mt/mtpaint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index 0ff7f39b9b97..6a51b3d0044e 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "mtPaint"; - version = "3.50.01"; + version = "3.50.12"; src = fetchFromGitHub { owner = "wjaguar"; repo = "mtPaint"; - rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; - sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; + rev = "7cae5d663ed835a365d89a535536c39e18862a83"; + hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U="; }; nativeBuildInputs = [ pkg-config ]; From d7fd0c4cf290364e6b227baedd45f89a715c593f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 13:39:38 -0300 Subject: [PATCH 0913/2279] mtpaint: add maintainer iedame --- pkgs/by-name/mt/mtpaint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index 6a51b3d0044e..e1b3eb7323a3 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iedame ]; mainProgram = "mtpaint"; }; } From ea1b8fd3bfab6fce74b701ef1f3f1eab83ee4682 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 4 Nov 2025 00:44:30 +0800 Subject: [PATCH 0914/2279] arch-install-scripts: 29 -> 31 --- .../ar/arch-install-scripts/package.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ar/arch-install-scripts/package.nix b/pkgs/by-name/ar/arch-install-scripts/package.nix index 2a6ac6a6b146..310dd15257ad 100644 --- a/pkgs/by-name/ar/arch-install-scripts/package.nix +++ b/pkgs/by-name/ar/arch-install-scripts/package.nix @@ -19,18 +19,19 @@ "/usr/bin/vendor_perl" "/usr/bin/core_perl" ], + chrootSetprivPath ? "/usr/bin/setpriv", }: resholve.mkDerivation rec { pname = "arch-install-scripts"; - version = "29"; + version = "31"; src = fetchFromGitLab { domain = "gitlab.archlinux.org"; owner = "archlinux"; repo = "arch-install-scripts"; tag = "v${version}"; - hash = "sha256-XWcZZ+ET3J4dB6M9CdXESf0iQh+2vYxlxoJ6TZ3vFUk="; + hash = "sha256-Oh1nC/gPJDDy8cXiZPbEfpwOuO+RFRcxVCZuTtB2MV8="; }; nativeBuildInputs = [ @@ -40,12 +41,16 @@ resholve.mkDerivation rec { postPatch = '' substituteInPlace ./Makefile \ - --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local" + --replace-fail "PREFIX = /usr/local" "PREFIX ?= /usr/local" + substituteInPlace ./pacstrap.in \ - --replace "cp -a" "cp -LR --no-preserve=mode" \ - --replace "unshare pacman" "unshare ${pacman}/bin/pacman" \ - --replace 'gnupg "$newroot/etc/pacman.d/"' 'gnupg "$newroot/etc/pacman.d/" && chmod 700 "$newroot/etc/pacman.d/gnupg"' + --replace-fail "cp -a" "cp -LR --no-preserve=mode" \ + --replace-fail "unshare pacman" "unshare ${pacman}/bin/pacman" \ + --replace-fail '"$gpg_dir" "$newroot/$gpg_dir"' '"$gpg_dir" "$newroot/$gpg_dir" && chmod 700 "$newroot/etc/pacman.d/gnupg"' + echo "export PATH=${lib.strings.makeSearchPath "" chrootPath}:\$PATH" >> ./common + substituteInPlace ./arch-chroot.in \ + --replace-fail "sd_args+=(setpriv" "sd_args+=(${chrootSetprivPath}" ''; installFlags = [ "PREFIX=$(out)" ]; @@ -80,10 +85,17 @@ resholve.mkDerivation rec { util-linux ]; - execer = [ "cannot:${pacman}/bin/pacman-key" ]; + execer = [ + "cannot:${pacman}/bin/pacman-conf" + "cannot:${pacman}/bin/pacman-key" + ]; - # TODO: no good way to resolve mount/umount in Nix builds for now - # see https://github.com/abathur/resholve/issues/29 + fake.external = [ + "systemd-escape" + "systemd-run" + ]; + + # Avoid using setuid wrappers fix = { mount = true; umount = true; @@ -93,6 +105,7 @@ resholve.mkDerivation rec { "$setup" "$pid_unshare" "$mount_unshare" + "$sd_args" "${pacman}/bin/pacman" ]; }; From 5dc0eaf3a14fd9ce8012ce898812228c47a9265b Mon Sep 17 00:00:00 2001 From: Oleksandr Usov Date: Thu, 9 Oct 2025 03:08:05 +0100 Subject: [PATCH 0915/2279] zfs: When ZFS is calling external helper scripts (such as stuff from /etc/zfs/zpool.d or zfs_prepare_disk it uses reduced PATH. This fixes it to use NixOS system path, and not FHS. --- pkgs/os-specific/linux/zfs/generic.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 9513e3e7a85d..dde56cb2684f 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -152,6 +152,11 @@ let ] }" + # substitute path that ZFS will pass on when calling external helper scripts (/etc/zfs/zpool.d/*, zfs_prepare_disk) + substituteInPlace ./lib/libzfs/libzfs_util.c \ + --replace-fail \"PATH=/bin:/sbin:/usr/bin:/usr/sbin\" \ + \"PATH=/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin\" + substituteInPlace ./config/zfs-build.m4 \ --replace-fail "bashcompletiondir=/etc/bash_completion.d" \ "bashcompletiondir=$out/share/bash-completion/completions" From 5c56e48ae020c108c3248ac6eb47d5ac1cac0531 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Nov 2025 17:54:37 +0000 Subject: [PATCH 0916/2279] git-town: 22.1.0 -> 22.2.0 --- pkgs/by-name/gi/git-town/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index 5270a47e3e06..8386749c2f30 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "git-town"; - version = "22.1.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; tag = "v${version}"; - hash = "sha256-hM6aEH4xiMgRWvIzja9QQUZvwdufG1FYooeUO1qJpbU="; + hash = "sha256-JY0zWWMln4r2ga1jwxK+RTp8izATyovRHBf4A29pXW4="; }; vendorHash = null; From c339ffe8e8f92905fa6de514e39a0709bb666a89 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 3 Nov 2025 18:14:43 +0100 Subject: [PATCH 0917/2279] notes: fix build with qt 6.10 Signed-off-by: Marcin Serwin --- pkgs/by-name/no/notes/package.nix | 5 +++++ pkgs/by-name/no/notes/qt610-fix.patch | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/by-name/no/notes/qt610-fix.patch diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix index f12ac0631b4b..d81d379e95f9 100644 --- a/pkgs/by-name/no/notes/package.nix +++ b/pkgs/by-name/no/notes/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Based on https://github.com/nuttyartist/notes/pull/758 which doesn't apply cleanly + ./qt610-fix.patch + ]; + cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/notes/qt610-fix.patch b/pkgs/by-name/no/notes/qt610-fix.patch new file mode 100644 index 000000000000..be466fbc41ee --- /dev/null +++ b/pkgs/by-name/no/notes/qt610-fix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4380d39..1051cc5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,6 +74,11 @@ if(USE_QT_VERSION STREQUAL "") + endif() + endif() + ++ # https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes ++ if(QT_VERSION VERSION_GREATER_EQUAL 6.10) ++ list(APPEND QT_COMPONENTS CorePrivate GuiPrivate WidgetsPrivate) ++ endif() ++ + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_COMPONENTS}) + else() + if(NOT USE_QT_VERSION STREQUAL "5" AND NOT USE_QT_VERSION STREQUAL "6") From 0074a2fc5a3200c382cfc2667369390ca040c5df Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 15:07:22 -0300 Subject: [PATCH 0918/2279] alure: fix build with cmake4 --- pkgs/by-name/al/alure/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/alure/package.nix b/pkgs/by-name/al/alure/package.nix index 67a36b9b1534..fa3260bf5d01 100644 --- a/pkgs/by-name/al/alure/package.nix +++ b/pkgs/by-name/al/alure/package.nix @@ -6,22 +6,27 @@ openal, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alure"; version = "1.2"; src = fetchurl { - url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2"; - sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6"; + url = "http://deb.debian.org/debian/pool/main/a/alure/alure_${finalAttrs.version}.orig.tar.bz2"; + hash = "sha256-Rl5q2uaJJ746AjkDdkZi1kQE5AxMFS0WDjqIOLHXD3E="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ openal ]; - meta = with lib; { + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { description = "Utility library to help manage common tasks with OpenAL applications"; homepage = "https://github.com/kcat/alure"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; -} +}) From 51b6a91ad4d753c054dffa42d22ca6479232671e Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 15:13:36 -0300 Subject: [PATCH 0919/2279] alure: add maintainer iedame --- pkgs/by-name/al/alure/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/al/alure/package.nix b/pkgs/by-name/al/alure/package.nix index fa3260bf5d01..8dc838ea4ced 100644 --- a/pkgs/by-name/al/alure/package.nix +++ b/pkgs/by-name/al/alure/package.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/kcat/alure"; license = lib.licenses.mit; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ iedame ]; }; }) From 22f1a366c63110c8afdd8a2b923ebcc8c6ecff45 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 15:18:15 -0300 Subject: [PATCH 0920/2279] mtpaint: modernize Co-authored-by: Marcin Serwin --- pkgs/by-name/mt/mtpaint/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index e1b3eb7323a3..8bddf23e71db 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -12,6 +12,7 @@ libtiff, openjpeg, gifsicle, + gettext, }: stdenv.mkDerivation { @@ -25,7 +26,14 @@ stdenv.mkDerivation { hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U="; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config + gettext + ]; + buildInputs = [ freetype giflib From 3481c6a3b41e9a7d66c56d78e9ff936364547226 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 15:37:10 -0300 Subject: [PATCH 0921/2279] alure2: fix build with cmake4 --- pkgs/by-name/al/alure2/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/al/alure2/package.nix b/pkgs/by-name/al/alure2/package.nix index e9c5af6d9df4..b3183af7a0ac 100644 --- a/pkgs/by-name/al/alure2/package.nix +++ b/pkgs/by-name/al/alure2/package.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation { libsndfile ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming"; homepage = "https://github.com/kcat/alure"; From b9464c6a20274246fe4290c6dc8565ce4f800f82 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Sun, 2 Nov 2025 20:29:50 +0000 Subject: [PATCH 0922/2279] tests.fetchtorrent: verify and delete in postFetch The Sintel torrent used for testing fetchtorrent is about 124MB, which is downloaded and cached for every test every time the test inputs change. Avoid that by instead validating the file hashes in the postFetch stage, then deleting the downloaded files, so the only thing that needs to be stored is an empty directory. --- .../fetchtorrent/test-hashes.sha512sum | 11 +++ pkgs/build-support/fetchtorrent/tests.nix | 88 ++++++++++++++----- 2 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 pkgs/build-support/fetchtorrent/test-hashes.sha512sum diff --git a/pkgs/build-support/fetchtorrent/test-hashes.sha512sum b/pkgs/build-support/fetchtorrent/test-hashes.sha512sum new file mode 100644 index 000000000000..fe378eb1c5f8 --- /dev/null +++ b/pkgs/build-support/fetchtorrent/test-hashes.sha512sum @@ -0,0 +1,11 @@ +1755c55e08aec3872db177464e0bc3f48c89aa40c1ec32605b472d88f6e92963eb08a10aa37bc47e837ae693db18652f40dfbcd6bf26f07278f0566a19c72cd5 poster.jpg +3ec33eae8153b6e2bdfff8157b332e6f0cfbc14d0c30e6a34042deecf0cff01ee19ca54314678b5ad970ae669da8cb91425e96253caf91d95ae01a62917827b7 Sintel.de.srt +ceac1ea59a9224b26946c6683acfaae27e1551c696fb2c632b55151c17f3faa8f930bbd93904cd7a13a896ad3d670b01e2f2bc1a8851060e05fedd85f804ba17 Sintel.en.srt +6efbc68f872c212f6579c5a5d42d6c2a60d775d32be8a7badcd147dbfc07b24cb2cc97e04a796af4002fcd4c8860a7061aed5d59a1280e4352d1bbd701d612a8 Sintel.es.srt +5619ad5bc7ca82e7f1f3b5e9197ab6ef6f5edd7293d396a3c036fef95d5ef592cf9e8d403e8532f4ba71a93fc9556614bfba3473eceae392d2e3175116c06f95 Sintel.fr.srt +fa93c051491b4e11f8e7a643c2138198f795315c942134b94ceace1adda4a5b28dc58b01b507e0da4c26784fc968f47bca1409f985eec2bf80c3e694662ed7c5 Sintel.it.srt +63426110ed7aa60ed3525078fa324cef4276393b4ada55e0a8cf8292500fdd59c2984e299a4e4f65e4f273b8ae2624da22700de4a55054b00e9d987f606c3c7f Sintel.mp4 +5fb04c25fda9dada8c808a9f289cec2cca001d60966b69d61ad663240a869c76dd0aff605122823ccbe199e266331f6a4b11a414bba92999a7041c4b534ef432 Sintel.nl.srt +510f052cbbda0b9fc31679b9a26cc16766df9054fc15b66cff475975725a1e8452e69a28a6f90bb965330a49e49bbf42a90efb13de07eaece7d273ef1ca7978a Sintel.pl.srt +510dc0eca608bd0fdd9633ea80365c916f8c4f0fd8e2fdf77534f455f03814401d210df47d940be4fd2fb7ab4c3ff5038a548846c5fa9badbe77b1731b3cae29 Sintel.pt.srt +57c014bd3d781a94850f85fd6c9364421e17cb2c4e25e22c0a8578f50c874e3f2eaf5a0b3da615db7dc95efbe2e6be7c7238e2e1ba27671c818b9e34b05ee1d0 Sintel.ru.srt diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index 18774ba1d503..210a4d3bf9dd 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -2,15 +2,29 @@ lib, testers, fetchtorrent, + emptyDirectory, ... }: let + # This meta attribute isn't used anywhere, as the actual derivation + # realizations are only empty directories. It's maintained here as a record + # of the details of the intermediate product that exists briefly while + # building the test derivations. + # + # Ideally we'd use a smaller download, but neither of the Bittorrent backends + # supported by fetchtorrent appear to support torrents that are only reliably + # seeded by HTTP sources rather than other people using Bittorrent clients. + # Sintel was the smallest torrent I could find that had a free license and + # was reliably seeded by other Bittorrent clients. + # + # For more information, see the discussion at + # https://github.com/NixOS/nixpkgs/pull/432091/files/bd13421b2b70f3f125061018c800439ef2d43e8d#r2264073113 sintel.meta = { description = "An open source short film to show off open source technologies."; longDescription = '' An independently produced short film, initiated by the Blender Foundation - as a means to further improve andvalidate the free/open source 3D + as a means to further improve and validate the free/open source 3D creation suite Blender. ''; license = lib.licenses.cc-by-30; @@ -21,71 +35,97 @@ let http.url = "https://webtorrent.io/torrents/sintel.torrent"; magnet.url = "magnet:?xt=urn:btih:08ada5a7a6183aae1e09d831df6748d566095a10&dn=Sintel&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel.torrent"; - flattened.hash = "sha256-EzbmBiTEWOlFUNaV5R4eDeD9EBbp6d93rfby88ACg0s="; - unflattened.hash = "sha256-lVrlo1AwmFcxwsIsY976VYqb3hAprFH1xWYdmlTuw0U="; + # Sintel isn't a massive download, but it's not small. There's also no real + # value in storing copies of it in Nix caches, which is what happens by + # default when this test succeeds. Avoid that by verifying the downloaded + # files using `sha512sum` in the post-fetch hook, then deleting the files so + # the actual derivation result is an empty directory. + # + # Chain `&&` in the postFetch phase because the transmission backend does not + # run that phase with `errexit` enabled. + flattened.postFetch = '' + pushd "$out" && + sha512sum --check --strict ${./test-hashes.sha512sum} && + sed 's/.* //' ${./test-hashes.sha512sum} | xargs rm --verbose && + popd + ''; + unflattened.postFetch = '' + pushd "$out" && + pushd Sintel && + sha512sum --check --strict ${./test-hashes.sha512sum} && + sed 's/.* //' ${./test-hashes.sha512sum} | xargs rm --verbose && + popd && + rm --dir --verbose Sintel && + popd + ''; + + # Fixed output derivation hash is identical for all derivations: the empty + # directory. + fetchtorrentWithHash = + args: + fetchtorrent ( + { + hash = builtins.convertHash { + hash = emptyDirectory.outputHash; + toHashFormat = "sri"; + hashAlgo = emptyDirectory.outputHashAlgo; + }; + } + // args + ); in # Seems almost but not quite worth using lib.mapCartesianProduct... -builtins.mapAttrs (n: v: testers.invalidateFetcherByDrvHash fetchtorrent v) { +builtins.mapAttrs (n: v: testers.invalidateFetcherByDrvHash fetchtorrentWithHash v) { http-link = { inherit (http) url; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; http-link-transmission = { inherit (http) url; backend = "transmission"; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; magnet-link = { inherit (magnet) url; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; magnet-link-transmission = { inherit (magnet) url; backend = "transmission"; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; http-link-rqbit = { inherit (http) url; backend = "rqbit"; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; magnet-link-rqbit = { inherit (magnet) url; backend = "rqbit"; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; http-link-rqbit-flattened = { inherit (http) url; backend = "rqbit"; flatten = true; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; magnet-link-rqbit-flattened = { inherit (magnet) url; backend = "rqbit"; flatten = true; - inherit (flattened) hash; - inherit (sintel) meta; + inherit (flattened) postFetch; }; http-link-rqbit-unflattened = { inherit (http) url; backend = "rqbit"; flatten = false; - inherit (unflattened) hash; - inherit (sintel) meta; + inherit (unflattened) postFetch; }; magnet-link-rqbit-unflattened = { inherit (magnet) url; backend = "rqbit"; flatten = false; - inherit (unflattened) hash; - inherit (sintel) meta; + inherit (unflattened) postFetch; }; } From 47344cd5ef3439c060e5b888f06569ce2fb2523c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 3 Nov 2025 19:48:06 +0100 Subject: [PATCH 0923/2279] tinyemu: fix build Signed-off-by: Marcin Serwin --- pkgs/by-name/ti/tinyemu/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ti/tinyemu/package.nix b/pkgs/by-name/ti/tinyemu/package.nix index 2a769cb68f22..bfef099f21ea 100644 --- a/pkgs/by-name/ti/tinyemu/package.nix +++ b/pkgs/by-name/ti/tinyemu/package.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; }; + postPatch = '' + substituteInPlace fs_wget.c \ + --replace-fail '#include ' '#include ' + ''; + nativeBuildInputs = [ SDL ]; buildInputs = [ From ec380bf2fb47b047736adf7c85c9e9090328084f Mon Sep 17 00:00:00 2001 From: MartiniMoe Date: Mon, 3 Nov 2025 19:39:17 +0100 Subject: [PATCH 0924/2279] sointu: 0.4.1-unstable-2025-08-13 -> 0.5.0 --- pkgs/by-name/so/sointu/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix index 123dd1f43b53..0d54cdda4cff 100644 --- a/pkgs/by-name/so/sointu/package.nix +++ b/pkgs/by-name/so/sointu/package.nix @@ -6,21 +6,22 @@ nix-update-script, alsa-lib, libGL, + libxcb, libxkbcommon, vulkan-headers, wayland, xorg, }: -buildGoModule { +buildGoModule rec { pname = "sointu"; - version = "0.4.1-unstable-2025-08-13"; + version = "0.5.0"; src = fetchFromGitHub { owner = "vsariola"; repo = "sointu"; - rev = "74fea4138fd788eddeb726440c872937de56fd1c"; - hash = "sha256-kHK35Bt/+ucPCsFE3p72J3jSHzhOK9QKtJPG+3grBvs="; + tag = "v${version}"; + hash = "sha256-xHKD+zArsdQVffwbbSOOdzC6o5sxpez8VLAwIzV5X4E="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildGoModule { buildInputs = [ alsa-lib libGL + libxcb libxkbcommon vulkan-headers wayland @@ -47,9 +49,7 @@ buildGoModule { "cmd/sointu-play" ]; - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Fork of 4klang that can target 386, amd64 and WebAssembly"; From 9a86751bdf2b784b5424b5bb7a4b185cb89c7473 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 16:08:24 -0300 Subject: [PATCH 0925/2279] python312Packages.palace: fix build with cmake4 --- pkgs/development/python-modules/palace/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix index 17a4955eccb3..b6937f9258da 100644 --- a/pkgs/development/python-modules/palace/default.nix +++ b/pkgs/development/python-modules/palace/default.nix @@ -26,7 +26,8 @@ buildPythonPackage rec { # Nix uses Release CMake configuration instead of what is assumed by palace. postPatch = '' substituteInPlace CMakeLists.txt \ - --replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE + --replace-fail IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE \ + --replace-fail "cmake_minimum_required(VERSION 2.6.0)" "cmake_minimum_required(VERSION 3.10)" ''; build-system = [ From 81e03be2d437f14688d309cf893827993d2a42bb Mon Sep 17 00:00:00 2001 From: Wim de With Date: Mon, 3 Nov 2025 20:21:07 +0100 Subject: [PATCH 0926/2279] gravit: fix build with SDL_compat 1.2.70 Refer to https://github.com/libsdl-org/sdl12-compat/commit/6595f6e405844cbca4a55e47eaa29ccec0cdd75f --- pkgs/by-name/gr/gravit/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gr/gravit/package.nix b/pkgs/by-name/gr/gravit/package.nix index 53b92adac0c4..6701a6f18b63 100644 --- a/pkgs/by-name/gr/gravit/package.nix +++ b/pkgs/by-name/gr/gravit/package.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = [ + "-DSDL_INCLUDE_GLU_H" + ]; + meta = { broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/gak/gravit"; From e82748cb41862dbc292b4ab1a22e92afdb247d6a Mon Sep 17 00:00:00 2001 From: Ellie Ford Date: Mon, 3 Nov 2025 11:59:13 -0800 Subject: [PATCH 0927/2279] step-kms-plugin: fix broken status on darwin --- pkgs/by-name/st/step-kms-plugin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index 8683bafe7c72..fecf9a3fb954 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -42,13 +42,13 @@ buildGoModule rec { "-X github.com/smallstep/step-kms-plugin/cmd.Version=${version}" ]; + CGO_CFLAGS = "-I${lib.getDev pcsclite}/include/PCSC/"; + meta = with lib; { description = "Step plugin to manage keys and certificates on cloud KMSs and HSMs"; homepage = "https://smallstep.com/cli/"; license = licenses.asl20; maintainers = with maintainers; [ qbit ]; mainProgram = "step-kms-plugin"; - # can't find pcsclite header files - broken = stdenv.hostPlatform.isDarwin; }; } From deff76bf59851254d292906ca731eb4eeada1fbd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 3 Nov 2025 23:17:01 +0200 Subject: [PATCH 0928/2279] python312Packages.scipp: 25.08.0 -> 25.11.0 Diff: https://github.com/scipp/Scipp/compare/25.08.0...25.11.0 --- pkgs/development/python-modules/scipp/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix index a308e8078d07..20b85a5e02ad 100644 --- a/pkgs/development/python-modules/scipp/default.nix +++ b/pkgs/development/python-modules/scipp/default.nix @@ -39,18 +39,17 @@ buildPythonPackage rec { pname = "scipp"; - version = "25.08.0"; + version = "25.11.0"; pyproject = true; src = fetchFromGitHub { owner = "scipp"; repo = "Scipp"; - # https://github.com/scipp/scipp/pull/3722 tag = version; - hash = "sha256-nLccJlFnnVTpamph2oIaMxRD5ljrw6GlCnnTx7LfrO0="; + hash = "sha256-/gCLWRpBnOjNMBEpJe0JSda496iXDFnCE+R+zIaRkWo="; }; env = { - SKIP_CONAN = "true"; + SKIP_REMOTE_SOURCES = "true"; }; build-system = [ From 9b78b717dce8b405c424a0e63145c30d9d035f96 Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 3 Nov 2025 22:38:16 +0100 Subject: [PATCH 0929/2279] doxygen: fix linker errors in darwin build --- .../tools/documentation/doxygen/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 5c2a0d47848d..32c625e30a2a 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'JAVACC_CHAR_TYPE=\"unsigned char\"' \ 'JAVACC_CHAR_TYPE=\"char8_t\"' \ --replace-fail "CMAKE_CXX_STANDARD 17" "CMAKE_CXX_STANDARD 20" + '' + # otherwise getting linker errors for deps + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)' \ + 'set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)' ''; nativeBuildInputs = [ @@ -45,13 +51,10 @@ stdenv.mkDerivation (finalAttrs: { fmt sqlite ] - ++ lib.optionals (qt5 != null) ( - with qt5; - [ - qtbase - wrapQtAppsHook - ] - ); + ++ lib.optionals (qt5 != null) [ + qt5.qtbase + qt5.wrapQtAppsHook + ]; cmakeFlags = [ "-Duse_sys_spdlog=ON" From 07f6f2dcf523f80fe095ab87e5607bbf5b224dbe Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 19:17:34 +0100 Subject: [PATCH 0930/2279] sse2neon: fix description and homepage Signed-off-by: Marcin Serwin --- pkgs/by-name/ss/sse2neon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ss/sse2neon/package.nix b/pkgs/by-name/ss/sse2neon/package.nix index fc5ec88908dc..da6664d70869 100644 --- a/pkgs/by-name/ss/sse2neon/package.nix +++ b/pkgs/by-name/ss/sse2neon/package.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; - homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; + description = "C/C++ header file that converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics"; + homepage = "https://github.com/DLTcollab/sse2neon"; platforms = lib.platforms.unix; license = lib.licenses.mit; maintainers = [ lib.maintainers.gador ]; From e3df16395a0621655f2f88a45e0265dde985e2d0 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 19:17:34 +0100 Subject: [PATCH 0931/2279] sse2neon: modernize Signed-off-by: Marcin Serwin --- pkgs/by-name/bl/blender/package.nix | 2 +- pkgs/by-name/ss/sse2neon/package.nix | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 25d6eb947682..8645982537e9 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -207,7 +207,7 @@ stdenv'.mkDerivation (finalAttrs: { ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBDIR=/does-not-exist" - "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" + "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include" ]; preConfigure = '' diff --git a/pkgs/by-name/ss/sse2neon/package.nix b/pkgs/by-name/ss/sse2neon/package.nix index da6664d70869..7b4420e62f82 100644 --- a/pkgs/by-name/ss/sse2neon/package.nix +++ b/pkgs/by-name/ss/sse2neon/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - pkg-config, stdenv, }: @@ -16,19 +15,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vb9k+KjiGodVngza0R18LjfPTlsqFbzqXZqefm6KHj0="; }; - postPatch = '' - # remove warning about gcc < 10 - substituteInPlace sse2neon.h --replace-fail "#warning \"GCC versions" "// " - ''; + doCheck = true; - nativeBuildInputs = [ pkg-config ]; + installPhase = '' + runHook preInstall - dontInstall = true; - # use postBuild instead of installPhase, because the build - # in itself doesn't produce any ($out) output - postBuild = '' - mkdir -p $out/lib - install -m444 sse2neon.h $out/lib/ + install -Dm644 sse2neon.h $out/include/sse2neon.h + + runHook postInstall ''; meta = { From a543db31e85862d3b8b9193cf4ad9cda728d432c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 3 Nov 2025 22:31:28 +0100 Subject: [PATCH 0932/2279] etterna: add aarch64-linux support Signed-off-by: Marcin Serwin --- .../0001-Add-aarch64-linux-support.patch | 61 +++++++++++++++++++ pkgs/by-name/et/etterna/package.nix | 7 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch diff --git a/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch b/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch new file mode 100644 index 000000000000..33b94e5a6977 --- /dev/null +++ b/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch @@ -0,0 +1,61 @@ +From 778cb2ed0d56614fd06d2129398799e46ff51720 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Mon, 3 Nov 2025 22:25:10 +0100 +Subject: [PATCH] Add aarch64-linux support + +Signed-off-by: Marcin Serwin +--- + src/Etterna/Models/Misc/StageStats.cpp | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +diff --git a/src/Etterna/Models/Misc/StageStats.cpp b/src/Etterna/Models/Misc/StageStats.cpp +index 0c70cf25ae..671717505d 100644 +--- a/src/Etterna/Models/Misc/StageStats.cpp ++++ b/src/Etterna/Models/Misc/StageStats.cpp +@@ -19,8 +19,9 @@ + #include "Etterna/Singletons/GameManager.h" + #include "Etterna/Models/NoteData/NoteDataUtil.h" + +-#if !( defined(_WIN32) || defined(__APPLE__)) +- #include //We only use cpuid.h on Linux :) ++#if !( defined(_WIN32) || defined(__APPLE__)) \ ++ && (defined(__x86_64__) || defined(__i386__)) ++ #include //We only use cpuid.h on x86 Linux :) + #endif + + #ifdef _WIN32 +@@ -236,6 +237,8 @@ getCpuHash() + + #else // !DARWIN + ++#if defined(__x86_64__) || defined(__i386__) ++ + uint16_t + getCpuHash() + { +@@ -248,6 +251,22 @@ getCpuHash() + + return hash; + } ++ ++#else // !x86 ++ ++uint16_t ++getCpuHash() ++{ ++ // https://www.kernel.org/doc/html/v6.17/arch/arm64/cpu-feature-registers.html ++ uint64_t midr = 0; ++ asm("mrs %0, MIDR_EL1" : "=r"(midr)); ++ ++ // Only leave implementer, variant, and architecture bits. ++ // See https://developer.arm.com/documentation/ddi0601/2025-09/AArch64-Registers/MIDR-EL1--Main-ID-Register?lang=en ++ return midr >> 16; ++} ++ ++#endif // !x86 + #endif // !DARWIN + + std::string +-- +2.51.0 + diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix index dff72cd5b51a..c4e6f97a8086 100644 --- a/pkgs/by-name/et/etterna/package.nix +++ b/pkgs/by-name/et/etterna/package.nix @@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZCQt99Qcov/7jGfrSmX9WftaP2U2B1d1APK1mxrUDBs="; }; - patches = [ ./fix-download-manager.patch ]; + patches = [ + ./fix-download-manager.patch + + # https://github.com/etternagame/etterna/pull/1396 + ./0001-Add-aarch64-linux-support.patch + ]; nativeBuildInputs = [ cmake From 55a1fd504b990d5efacf9f9ed788d938fc913d18 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 3 Nov 2025 22:47:31 +0100 Subject: [PATCH 0933/2279] etterna: specify meta.platforms Signed-off-by: Marcin Serwin --- pkgs/by-name/et/etterna/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix index c4e6f97a8086..593b66bd10a1 100644 --- a/pkgs/by-name/et/etterna/package.nix +++ b/pkgs/by-name/et/etterna/package.nix @@ -110,5 +110,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ alikindsys ]; mainProgram = "etterna"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; }) From 882b9d6733ba34cc121a7fe13fcce6d08575a76c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 18:58:10 -0300 Subject: [PATCH 0934/2279] aranym: mark as broken on darwin and aarch64 linux --- pkgs/by-name/ar/aranym/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 435edc7d3274..627790626b4d 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -56,5 +56,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "aranym"; maintainers = [ ]; platforms = lib.platforms.unix; + # never successfully built on Hydra for darwin or aarch64 linux + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; }) From cbaefb220b0ae3d79c95a4d2bd6435d53cba339e Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 18:58:48 -0300 Subject: [PATCH 0935/2279] aranym: add maintainer iedame --- pkgs/by-name/ar/aranym/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 627790626b4d..23a8155b79bb 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "aranym"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iedame ]; platforms = lib.platforms.unix; # never successfully built on Hydra for darwin or aarch64 linux broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; From 44b2a98a25fce208c208852d8ef36c8dafef2913 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 20:26:25 -0300 Subject: [PATCH 0936/2279] itk_5_2: fix build with cmake4 --- pkgs/development/libraries/itk/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index ede33338a811..c55c362c6d4f 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -124,7 +124,8 @@ stdenv.mkDerivation { "-DITK_USE_SYSTEM_SWIG=ON" "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}" ] - ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]; + ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ] + ++ lib.optionals (lib.versionOlder version "5.4") [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; nativeBuildInputs = [ cmake From 80aaab7314a489d41cc0d745530f099f4697b1fb Mon Sep 17 00:00:00 2001 From: daimond113 Date: Mon, 3 Nov 2025 23:29:10 +0000 Subject: [PATCH 0937/2279] coredns: 1.12.2 -> 1.13.1 --- pkgs/by-name/co/coredns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index 57a01b6aa50b..9928821ac4ff 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -6,7 +6,7 @@ installShellFiles, nixosTests, externalPlugins ? [ ], - vendorHash ? "sha256-Es3xy8NVDo7Xgu32jJa4lhYWGa5hJnRyDKFYQqB3aBY=", + vendorHash ? "sha256-pU8INVCKjYfAFOeobM7N1XCMHod7Kz0N5NKwpMpA2lU=", }: let @@ -14,13 +14,13 @@ let in buildGoModule (finalAttrs: { pname = "coredns"; - version = "1.12.2"; + version = "1.13.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; tag = "v${finalAttrs.version}"; - hash = "sha256-P4GhWrEACR1ZhNhGAoXWvNXYlpwnm2dz6Ggqv72zYog="; + hash = "sha256-rWa4xjHRREoMtvPqW6ZP6Ym9qNTa0l8Opd15FsmxraI="; }; inherit vendorHash; From f979e4cd63ed01405331a94b6d27ffff3f16c7b6 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 20:59:25 -0300 Subject: [PATCH 0938/2279] bicgl: fix build with cmake4 --- pkgs/by-name/bi/bicgl/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/bi/bicgl/package.nix b/pkgs/by-name/bi/bicgl/package.nix index 7c7327b31c5e..76231816053c 100644 --- a/pkgs/by-name/bi/bicgl/package.nix +++ b/pkgs/by-name/bi/bicgl/package.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { "-DBICPL_DIR=${bicpl}/lib" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { homepage = "https://github.com/${owner}/bicgl"; description = "Brain Imaging Centre graphics library"; From bf654e42bb635b6ceb605f6c9465d02aae08bf16 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 20:59:41 -0300 Subject: [PATCH 0939/2279] conglomerate: fix build with cmake4 --- pkgs/by-name/co/conglomerate/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/co/conglomerate/package.nix b/pkgs/by-name/co/conglomerate/package.nix index 5c4fc39a8ddc..a200d9fe49c9 100644 --- a/pkgs/by-name/co/conglomerate/package.nix +++ b/pkgs/by-name/co/conglomerate/package.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation { "-DBICPL_DIR=${bicpl}/lib" ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + postFixup = '' for p in $out/bin/*; do wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${ From 81ff7c0634fa0762d5a19cb38e39befaa0793d1e Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 4 Nov 2025 00:53:44 +0000 Subject: [PATCH 0940/2279] caneda: fix build with cmake 4 --- pkgs/applications/science/electronics/caneda/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index b99c2201ec09..757314931a2c 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -2,6 +2,7 @@ mkDerivation, lib, fetchFromGitHub, + fetchpatch, cmake, qtbase, qttools, @@ -20,6 +21,13 @@ mkDerivation rec { sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ="; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/c/caneda/0.4.0-2/debian/patches/fix_cmake_minimum_version.patch"; + hash = "sha256-MRkCA0GWcI6yEo4Ej+F67k0iNG1JHeLNhH0Rbz1QWoA="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase From ad39d44f248a724705956a059f45eeb10433ce40 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 4 Nov 2025 00:55:21 +0000 Subject: [PATCH 0941/2279] caneda: adopt orphaned package --- pkgs/applications/science/electronics/caneda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 757314931a2c..d7ed930cc88b 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { mainProgram = "caneda"; homepage = "http://caneda.org"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ magicquark ]; platforms = with lib.platforms; linux; }; } From 8f57530b0b43dd38fcb2e5f0b24d983d3df8d92d Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 4 Nov 2025 01:01:19 +0000 Subject: [PATCH 0942/2279] caneda: migrate to pkgs/by-name --- .../ca/caneda/package.nix} | 23 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 13 deletions(-) rename pkgs/{applications/science/electronics/caneda/default.nix => by-name/ca/caneda/package.nix} (79%) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/by-name/ca/caneda/package.nix similarity index 79% rename from pkgs/applications/science/electronics/caneda/default.nix rename to pkgs/by-name/ca/caneda/package.nix index d7ed930cc88b..284dd6e72fe8 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/by-name/ca/caneda/package.nix @@ -1,16 +1,13 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, fetchpatch, cmake, - qtbase, - qttools, - qtsvg, - qwt6_1, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "caneda"; version = "0.4.0"; @@ -28,12 +25,16 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.qt5.wrapQtAppsHook + ]; + buildInputs = [ - qtbase - qttools - qtsvg - qwt6_1 + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtsvg + libsForQt5.qwt6_1 ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c55ef11199c..0966d484e378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13800,8 +13800,6 @@ with pkgs; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; - caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; - degate = libsForQt5.callPackage ../applications/science/electronics/degate { }; geda = callPackage ../applications/science/electronics/geda { From 607074e8e83c496c341f989a3f44c2e1e314e646 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 4 Nov 2025 01:03:58 +0000 Subject: [PATCH 0943/2279] caneda: modernise --- pkgs/by-name/ca/caneda/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/caneda/package.nix b/pkgs/by-name/ca/caneda/package.nix index 284dd6e72fe8..4e157aa9ee5d 100644 --- a/pkgs/by-name/ca/caneda/package.nix +++ b/pkgs/by-name/ca/caneda/package.nix @@ -7,14 +7,14 @@ libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "caneda"; version = "0.4.0"; src = fetchFromGitHub { owner = "Caneda"; repo = "Caneda"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ="; }; @@ -39,10 +39,11 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; + changelog = "https://github.com/Caneda/Caneda/releases/tag/${finalAttrs.version}"; mainProgram = "caneda"; homepage = "http://caneda.org"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ magicquark ]; platforms = with lib.platforms; linux; }; -} +}) From 5760911f509a77c0cf8d7140527cbe425c1fa389 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Mon, 3 Nov 2025 17:33:21 -0800 Subject: [PATCH 0944/2279] miro: 0.6.2 -> 0.7.0 --- pkgs/by-name/mi/miro/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index 5324949a7278..2b54d70c09a3 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miro"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "vincent-uden"; repo = "miro"; tag = "v${finalAttrs.version}"; - hash = "sha256-znrbAufYM+YIPm0oSZ8i4vHHrhlgSQWMzKfqdF8qaow="; + hash = "sha256-tkZSyxdcHeumBMlinwA3DT2Y/FgLzbeuVbsFbTfvINg="; }; - cargoHash = "sha256-VP2RUKTQM2AkXY/KgN0tjWXF7SQ24geAvxEQJitH23I="; + cargoHash = "sha256-4NE9nMmOTQpWvMsGexW6GpBGao4yQoofrzGaaM4+rWE="; nativeBuildInputs = [ rustPlatform.bindgenHook From 6ecf2065893909ce5116e15680db2b139044decb Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Mon, 3 Nov 2025 20:46:22 -0600 Subject: [PATCH 0945/2279] openrct2: 0.4.26 -> 0.4.28 --- pkgs/by-name/op/openrct2/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index c25a9e238739..5285de166ca2 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -34,14 +34,14 @@ }: let - openrct2-version = "0.4.26"; + openrct2-version = "0.4.28"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. objects-version = "1.7.3"; openmsx-version = "1.6.1"; opensfx-version = "1.0.6"; - title-sequences-version = "0.4.14"; + title-sequences-version = "0.4.26"; objects = fetchurl { url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip"; @@ -57,7 +57,7 @@ let }; title-sequences = fetchurl { url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${title-sequences-version}/title-sequences.zip"; - hash = "sha256-FA33FOgG/tQRzEl2Pn8WsPzypIelcAHR5Q/Oj5FIqfM="; + hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg="; }; in stdenv.mkDerivation (finalAttrs: { @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "OpenRCT2"; repo = "OpenRCT2"; tag = "v${openrct2-version}"; - hash = "sha256-C6DK1gT/QSgI5ZDyg2FWf9H/BMskS9N2mVMaVb643PE="; + hash = "sha256-/sgvlfJ3aMqpv5hJNzmnpOq7Bx0BTtGzLOMKGA543O8="; }; nativeBuildInputs = [ From 5cbc4dbc3b913ed8d7db7d1a8a2f6872bbaf774e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 03:37:20 +0000 Subject: [PATCH 0946/2279] kcc: 9.1.0 -> 9.2.1 --- pkgs/by-name/kc/kcc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kc/kcc/package.nix b/pkgs/by-name/kc/kcc/package.nix index 1c86d62b41ef..9e0fbd1c89bb 100644 --- a/pkgs/by-name/kc/kcc/package.nix +++ b/pkgs/by-name/kc/kcc/package.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kcc"; - version = "9.1.0"; + version = "9.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ciromattia"; repo = "kcc"; tag = "v${version}"; - hash = "sha256-FGRd2JVcz45KVjQCTEKIjKlkLJS/AsSsopeW9tXHWwk="; + hash = "sha256-zzPgBAmICeDpCHvBek2DsM4aEYvC8VHPDY4Ek6nJW9w="; }; nativeBuildInputs = [ From 0239ba3d7379f841718efb2dd87e575359614545 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 04:12:33 +0000 Subject: [PATCH 0947/2279] astal.source: 0-unstable-2025-10-23 -> 0-unstable-2025-11-03 --- pkgs/development/libraries/astal/source.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index 3a962db76812..06800f8c8038 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -7,15 +7,15 @@ let originalDrv = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "189bf73016c26d7d32729a913d6436cd7b1a0885"; - hash = "sha256-U2r3/DKgr9Fq1yqWLCbKMSqRf8a1JctD0kj/ftBClsg="; + rev = "6976faba892be4c79d2b8b42710203b319278d7f"; + hash = "sha256-aPoaaiZ8VCJhmeeuxrkrfNEWk9Ued7qPYjZFpmnRT3k="; }; in originalDrv.overrideAttrs ( final: prev: { name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name pname = "astal-source"; - version = "0-unstable-2025-10-23"; + version = "0-unstable-2025-11-03"; meta = prev.meta // { description = "Building blocks for creating custom desktop shells (source)"; From 1245c5754e1a689fbf0c0372b6ff803990c1df30 Mon Sep 17 00:00:00 2001 From: Mori Zen <92977828+71zenith@users.noreply.github.com> Date: Tue, 4 Nov 2025 10:20:28 +0530 Subject: [PATCH 0948/2279] spotify-player: 0.21.0 -> 0.21.1 --- pkgs/by-name/sp/spotify-player/package.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 62cbb42c21d0..e2c14b916ae9 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -50,24 +50,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "aome510"; repo = "spotify-player"; tag = "v${version}"; - hash = "sha256-nOswrYt9NrzJV6CFBWZCpj/wIJnIgmr3i2TreAKGGPI="; + hash = "sha256-yjm5NFW+6vEyv45AVfwx+6w2dJ3lKj/UM2NQhGW5SSs="; }; - cargoHash = "sha256-YarKRApcQHom3AQIirqGdmUOuy5B+BRehLijvF/GRPc="; - - patches = [ - (fetchpatch { - name = "fix-build-failure.patch"; - url = "https://github.com/aome510/spotify-player/commit/77af13b48b2a03e61fef1cffea899929057551dc.patch"; - hash = "sha256-5q8W0X49iZLYdwrBiZJTESb628VPamrm0zEYwDm8CVk="; - }) - ]; + cargoHash = "sha256-rqDLkzCl7gn3s/37MPytYaGb0tdtemYi8bgEkrkllDU="; nativeBuildInputs = [ pkg-config From 8a562d67ea56a6905f600dca76782b517fca94ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 06:35:46 +0000 Subject: [PATCH 0949/2279] btcd: 0.24.2 -> 0.25.0 --- pkgs/by-name/bt/btcd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix index 78fb2fef94e2..b8c8fb8481af 100644 --- a/pkgs/by-name/bt/btcd/package.nix +++ b/pkgs/by-name/bt/btcd/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "btcd"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "btcsuite"; repo = "btcd"; rev = "v${version}"; - hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A="; + hash = "sha256-redoqqbiVdwgNLxDzBccqRBZGwhRTIY5nE9Gx6+4POc="; }; - vendorHash = "sha256-ek+gaolwpwoEEWHKYpK2OxCpk/0vywF784J3CC0UCZ4="; + vendorHash = "sha256-qXfZKVoTvq7gNm0G4KKSL8anB8FUt/TxoxbOtH240cc="; subPackages = [ "." From 569f707da65b67e545f59637efe715e61ae113a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 07:09:21 +0000 Subject: [PATCH 0950/2279] LycheeSlicer: 7.4.5 -> 7.4.6 --- pkgs/by-name/ly/LycheeSlicer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index a8237fbd249b..5db8aeb1f0b8 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -9,11 +9,11 @@ }: let pname = "LycheeSlicer"; - version = "7.4.5"; + version = "7.4.6"; src = fetchurl { url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage"; - hash = "sha256-UY8bS3nPhUqyBeMD7Ou6OJZ2LKFi3QbNGeTSmtC1Sbg="; + hash = "sha256-4Cqhr++RP8FlWUMQyfpEY7df2Ai3aqrzwX+kZ+SzGCQ="; }; desktopItem = makeDesktopItem { From fdfbb9d05c813508d3f5e5ed032205fabecdccbf Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Mon, 3 Nov 2025 18:24:17 +0100 Subject: [PATCH 0951/2279] openssl: don't build tests if check is disabled --- pkgs/development/libraries/openssl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index b4816e8cdecc..aee19324bcba 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -239,7 +239,10 @@ let # the code above, inhibiting `./Configure` from adding the # conflicting flags. "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}" - ]; + ] + # tests are not being installed, it makes no sense + # to build them if check is disabled, e.g. on cross. + ++ lib.optional (!finalAttrs.finalPackage.doCheck) "disable-tests"; makeFlags = [ "MANDIR=$(man)/share/man" From 5d09bd3b71150d79651a6927ebe7eac02a414d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Tue, 28 Oct 2025 12:37:45 +0100 Subject: [PATCH 0952/2279] python3Packages.django-postgres-extra: init at 2.0.9 --- .../django-postgres-extra/default.nix | 107 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 109 insertions(+) create mode 100644 pkgs/development/python-modules/django-postgres-extra/default.nix diff --git a/pkgs/development/python-modules/django-postgres-extra/default.nix b/pkgs/development/python-modules/django-postgres-extra/default.nix new file mode 100644 index 000000000000..2dd99612fe02 --- /dev/null +++ b/pkgs/development/python-modules/django-postgres-extra/default.nix @@ -0,0 +1,107 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + django, + python-dateutil, + # test dependencies + coverage, + dj-database-url, + freezegun, + postgresql, + psycopg2, + pytest, + pytest-benchmark, + pytest-cov, + pytest-django, + pytest-freezegun, + pytest-lazy-fixture, + pytestCheckHook, + syrupy, + tox, + types-psycopg2, +}: +buildPythonPackage rec { + pname = "django-postgres-extra"; + version = "2.0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SectorLabs"; + repo = "django-postgres-extra"; + rev = "v${version}"; + hash = "sha256-/2qoXZ2f3un2cgJFAGMnQWBraJ7urkb0kHtcKKJsh6w="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + python-dateutil + ]; + + nativeCheckInputs = [ + coverage + dj-database-url + freezegun + postgresql + psycopg2 + pytest + pytest-benchmark + pytest-cov + pytest-django + pytest-freezegun + pytest-lazy-fixture + pytestCheckHook + syrupy + tox + types-psycopg2 + ]; + + preCheck = '' + # Start Postgres. + export PGDATA="$NIX_BUILD_TOP/.postgres" + export PGHOST="$PGDATA/run" + export DATABASE_URL=postgresql://''${PGHOST//\//%2F}/psqlextra + initdb -E UTF8 + mkdir -p "$PGDATA/run" + cat <> "$PGDATA/postgresql.conf" + unix_socket_directories = '$PGDATA/run' + EOF + echo "CREATE DATABASE psqlextra" | postgres --single -E postgres + echo "Starting Postgres at $PGDATA" >&2 + pg_ctl start -w + ''; + + postCheck = '' + echo "Stopping Postgres at $PGDATA" >&2 + pg_ctl stop -w + ''; + + disabledTests = [ + "test_management_command_partition_auto_confirm" + "test_management_command_partition_confirm_no" + "test_management_command_partition_confirm_yes" + "test_management_command_partition_dry_run" + ] + # tests incompatible with django>=5 + ++ lib.optionals (lib.versionAtLeast django.version "5") [ + "test_schema_editor_clone_model_to_schema" + "test_schema_editor_clone_model_to_schema_custom_constraint_names" + ] + # tests incompatible with django>=5.2 + ++ lib.optionals (lib.versionAtLeast django.version "5.2") [ + "test_query_annotate_rename_chain" + ]; + + pythonImportsCheck = [ "psqlextra" ]; + + meta = with lib; { + description = "Bringing all of PostgreSQL's awesomeness to Django"; + homepage = "https://github.com/SectorLabs/django-postgres-extra"; + changelog = "https://github.com/SectorLabs/django-postgres-extra/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ b4dm4n ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41059f238981..bc27f3326078 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4096,6 +4096,8 @@ self: super: with self; { django-polymorphic = callPackage ../development/python-modules/django-polymorphic { }; + django-postgres-extra = callPackage ../development/python-modules/django-postgres-extra { }; + django-postgres-partition = callPackage ../development/python-modules/django-postgres-partition { }; django-postgresql-netfields = From 20b17c1a5f1c6d3a3b7e5b0a0180c9784af69457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Tue, 4 Nov 2025 09:39:55 +0100 Subject: [PATCH 0953/2279] authentik: 2025.8.4 -> 2025.10.1 --- pkgs/by-name/au/authentik/package.nix | 82 +++++++++++++++++---------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index d9a8783ab369..f03d6b67f963 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -15,13 +15,13 @@ let nodejs = nodejs_24; - version = "2025.8.4"; + version = "2025.10.1"; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; rev = "version/${version}"; - hash = "sha256-pIzDaoDWc58cY/XhsyweCwc4dfRvkaT/zqsV1gDSnCI="; + hash = "sha256-HowB6DTGCqz770fKYbnE+rQ11XRV0WSNkLD+HSWZwz8="; }; meta = { @@ -48,8 +48,8 @@ let outputHash = { - "aarch64-linux" = "sha256-fa/WGRb4lWSXMqBmGhCd+N2fZr1YZKsskr3Oowp8gRE="; - "x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q="; + "aarch64-linux" = "sha256-aXXlzTsZp5mOrsxy9oHNzcc+1cFSnbC9RmtawBohmLI="; + "x86_64-linux" = "sha256-Hi0HXzwTLuer0v4IKF3aim0tVe7AVLi67DiMimrIq5s="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform"); @@ -119,8 +119,8 @@ let outputHash = { - "aarch64-linux" = "sha256-4JkNwQACS3tiiLuj41cGRWNspljVQxlsJvCM9KE2JrQ="; - "x86_64-linux" = "sha256-LD+zXc8neRbEwq1mx9y7b+08p8hxvo/RW6QzsFQgaUs="; + "aarch64-linux" = "sha256-t/jyzG3ibTW3fu8Gl1tWkSjMG6Lek/7JDccDrZX6sD0="; + "x86_64-linux" = "sha256-8I1YAKvgWjM3p9O1mCetZvhZelrfB31w0ZwkZBUEoh4="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform"); outputHashMode = "recursive"; @@ -205,10 +205,32 @@ let python = python312.override { self = python; packageOverrides = final: prev: { - # https://github.com/goauthentik/authentik/pull/14709 - django = final.django_5_1; + # https://github.com/goauthentik/authentik/pull/16324 + django = final.django_5_2; - django-dramatiq-postgres = prev.buildPythonPackage { + django-channels-postgres = final.buildPythonPackage { + pname = "django-channels-postgres"; + inherit version src meta; + pyproject = true; + + sourceRoot = "${src.name}/packages/django-channels-postgres"; + + build-system = with final; [ hatchling ]; + + propagatedBuildInputs = + with final; + [ + channels + django + django-pgtrigger + msgpack + psycopg + structlog + ] + ++ psycopg.optional-dependencies.pool; + }; + + django-dramatiq-postgres = final.buildPythonPackage { pname = "django-dramatiq-postgres"; inherit version src meta; pyproject = true; @@ -222,6 +244,7 @@ let [ cron-converter django + django-pglock django-pgtrigger dramatiq structlog @@ -230,10 +253,25 @@ let ++ dramatiq.optional-dependencies.watch; }; + django-postgres-cache = final.buildPythonPackage { + pname = "django-postgres-cache"; + inherit version src meta; + pyproject = true; + + sourceRoot = "${src.name}/packages/django-postgres-cache"; + + build-system = with final; [ hatchling ]; + + propagatedBuildInputs = with final; [ + django + django-postgres-extra + ]; + }; + # Running authentik currently requires a custom version. # Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section. # See https://github.com/goauthentik/authentik/pull/14057 for latest version bump. - djangorestframework = prev.buildPythonPackage { + djangorestframework = final.buildPythonPackage { pname = "djangorestframework"; version = "3.16.0"; format = "setuptools"; @@ -286,18 +324,7 @@ let }; }); - tenant-schemas-celery = prev.tenant-schemas-celery.overrideAttrs (_: rec { - version = "3.0.0"; - - src = fetchFromGitHub { - owner = "maciej-gol"; - repo = "tenant-schemas-celery"; - tag = version; - hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; - }; - }); - - authentik-django = prev.buildPythonPackage { + authentik-django = final.buildPythonPackage { pname = "authentik-django"; inherit version src meta; pyproject = true; @@ -326,14 +353,13 @@ let with final; [ argon2-cffi - celery channels - channels-redis cryptography dacite deepmerge defusedxml django + django-channels-postgres django-countries django-cte django-dramatiq-postgres @@ -342,8 +368,9 @@ let django-model-utils django-pglock django-pgtrigger + django-postgres-cache + django-postgres-extra django-prometheus - django-redis django-storages django-tenants djangoql @@ -354,7 +381,6 @@ let drf-spectacular duo-client fido2 - flower geoip2 geopy google-api-python-client @@ -383,7 +409,6 @@ let setproctitle structlog swagger-spec-validator - tenant-schemas-celery twilio ua-parser unidecode @@ -396,7 +421,6 @@ let zxcvbn ] ++ django-storages.optional-dependencies.s3 - ++ opencontainers.optional-dependencies.reggie ++ psycopg.optional-dependencies.c ++ psycopg.optional-dependencies.pool ++ uvicorn.optional-dependencies.standard; @@ -431,7 +455,7 @@ let env.CGO_ENABLED = 0; - vendorHash = "sha256-wTTEDBRYCW1UFaeX49ufLT0c17sacJzcCaW/8cPNYR4="; + vendorHash = "sha256-m2shrCwoVdbtr8B83ZcAyG+J6dEys2xdjtlfFFF4CDo="; postInstall = '' mv $out/bin/server $out/bin/authentik From 0d3edca0783efceee72574bb15c1ef1ea2ddc4cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 08:51:38 +0000 Subject: [PATCH 0954/2279] cyclonedx-python: 7.2.0 -> 7.2.1 --- pkgs/by-name/cy/cyclonedx-python/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index 6d1c1df42727..0c7041c6f0b0 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${version}"; - hash = "sha256-4Mvt8l6kDT7GR4ufIelQd9rTt5ljdpMVWwRGZV5jIc8="; + hash = "sha256-JhPrVNzuoUTOmFBaPiq+UuUBRCHG2mqz8z1/24OcZAI="; }; build-system = with python3Packages; [ poetry-core ]; From cc5898f804b7bc4f5a283d80932d6fcfa6c692cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 08:59:25 +0000 Subject: [PATCH 0955/2279] python3Packages.lib4sbom: 0.8.8 -> 0.9.0 --- pkgs/development/python-modules/lib4sbom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index da2e50226b23..eba8b9ef9904 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.8.8"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4sbom"; tag = "v${version}"; - hash = "sha256-JfY47bskOnQeh5ueQfBtQz8Hmi9mPjCMoaFrzpxQMhU="; + hash = "sha256-AtsoCC/p9onzM2BebFtz2Hwf4bnAYd1tNU+acslqCsM="; }; build-system = [ setuptools ]; From 5f62e07e7889bbf72c2cbec43dec2e9c4a2c669e Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 4 Nov 2025 08:59:38 +0000 Subject: [PATCH 0956/2279] vscode-extensions.augment.vscode-augment: 0.613.0 -> 0.627.0 --- .../vscode/extensions/augment.vscode-augment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix index b29a3f0d039c..043d6a9853d6 100644 --- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix +++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-augment"; publisher = "augment"; - version = "0.613.0"; - hash = "sha256-2HvDCfNX+snwnqd9XI6rHBkGBydxnf5OYYfBnAAxjZk="; + version = "0.627.0"; + hash = "sha256-ceaGN7xhVLcMFC+5jYijpqeTJa1zsgCsvQs5mf1ueYM="; }; meta = { From 3c9a1a34c8e0229fc542c43497cb4423778b3c56 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 4 Nov 2025 10:44:57 +0100 Subject: [PATCH 0957/2279] haskellPackages.duckdb-ffi: mark as broken I've decided to wait on upstream feedback on https://github.com/Tritlo/duckdb-haskell/issues/2 before trying to get it to build again. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 3 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9ce84609b518..1bab28281090 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1508,6 +1508,7 @@ broken-packages: - dtw # failure in job https://hydra.nixos.org/build/233198932 at 2023-09-02 - dual # failure in job https://hydra.nixos.org/build/252724683 at 2024-03-16 - dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02 + - duckdb-ffi # failure in job https://hydra.nixos.org/build/311300709, https://github.com/Tritlo/duckdb-haskell/issues/2 - duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02 - duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02 - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 291a82523ce9..b03d66e0fbe4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -810,6 +810,7 @@ dont-distribute-packages: - dsmc-tools - DSTM - dtd + - duckdb-simple - Dust - Dust-crypto - Dust-tools diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b3b5f4c230c2..85cb7460a388 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -205093,6 +205093,8 @@ self: { ]; description = "Haskell FFI bindings for DuckDB"; license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; + broken = true; } ) { inherit (pkgs) duckdb; }; @@ -205176,6 +205178,7 @@ self: { ]; description = "Haskell FFI bindings for DuckDB"; license = lib.licensesSpdx."MPL-2.0"; + hydraPlatforms = lib.platforms.none; } ) { }; From 935c9109572f820ebe13a4daa7952cd69fc90435 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 09:54:33 +0000 Subject: [PATCH 0958/2279] atlas: 0.37.0 -> 0.38.0 --- pkgs/by-name/at/atlas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index 667772b77b84..e7295ec77842 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -9,19 +9,19 @@ buildGoModule (finalAttrs: { pname = "atlas"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; tag = "v${finalAttrs.version}"; - hash = "sha256-9OX2CmL9/5LzIbYHQKvC/wRCifGq9Ycycvr3uYck94Q="; + hash = "sha256-OS0UYrE+5spErR/S+7AsYDPcCce3EEWvcBBKh+8FkTo="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-wIDPTgfpWD0E9Afi5NHvL684k7YPjYkQIpHotNZeneY="; + vendorHash = "sha256-xlKU/hxSjQWSQV++7RHfY4hZhm2tWCPS6DcyaGNnmhc="; nativeBuildInputs = [ installShellFiles ]; From 5049f48dfaea924789d862b9de948ec08dff4924 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Tue, 4 Nov 2025 17:02:28 +0700 Subject: [PATCH 0959/2279] distrho-ports: add build options --- pkgs/by-name/di/distrho-ports/package.nix | 38 ++++++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix index 366b6960f415..186d87c3d0a6 100644 --- a/pkgs/by-name/di/distrho-ports/package.nix +++ b/pkgs/by-name/di/distrho-ports/package.nix @@ -16,12 +16,18 @@ # empty means build all available plugins plugins ? [ ], + + buildVST3 ? true, + buildLV2 ? true, + buildVST2 ? true, }: let rpathLibs = [ fftwFloat ]; + + mesonPlugins = lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]"; in stdenv.mkDerivation { pname = "distrho-ports"; @@ -52,19 +58,27 @@ stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ]; - postFixup = lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) '' - for file in \ - $out/lib/lv2/vitalium.lv2/vitalium.so \ - $out/lib/vst/vitalium.so \ - $out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so - do - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file - done - ''; + postFixup = + let + files = [ + (lib.optionalString buildLV2 "$out/lib/lv2/vitalium.lv2/vitalium.so") + (lib.optionalString buildVST2 "$out/lib/vst/vitalium.so") + (lib.optionalString buildVST3 "$out/lib/vst3/vitalium.vst3/Contents/x86_64-linux/vitalium.so") + ]; + in + lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) '' + for file in ${lib.concatMapStringsSep " \\\n" (x: "${x}") files} + do + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $file)" $file + done + ''; - mesonFlags = lib.optional (plugins != [ ]) ( - lib.mesonOption "plugins" "[${lib.concatMapStringsSep "," (x: "\"${x}\"") plugins}]" - ); + mesonFlags = [ + (lib.mesonBool "build-lv2" buildLV2) + (lib.mesonBool "build-vst2" buildVST2) + (lib.mesonBool "build-vst3" buildVST3) + ] + ++ lib.optional (plugins != [ ]) mesonPlugins; meta = { homepage = "http://distrho.sourceforge.net/ports"; From d41def50137403de710f15911208028dcea2aa95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 10:32:10 +0000 Subject: [PATCH 0960/2279] python3Packages.notion-client: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/notion-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index cc60507b7515..438c7bd1a323 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "notion-client"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "ramnes"; repo = "notion-sdk-py"; tag = version; - hash = "sha256-kUeZhnQwZ+To5NCo7jtQsTfX1kQotbAHDcHf2qwGOIs="; + hash = "sha256-15IPycaLk8r0/bUphL+IDypBMhgdX1tAUS50VD3p/00="; }; build-system = [ setuptools ]; From 6a3480b06be224cc4ac561b04c0bb36a93eaf085 Mon Sep 17 00:00:00 2001 From: Ngoc Nguyen Date: Tue, 4 Nov 2025 19:36:13 +0900 Subject: [PATCH 0961/2279] docker-language-server: fix build failure --- pkgs/by-name/do/docker-language-server/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix index 06d64fb121dd..6c88af2649f5 100644 --- a/pkgs/by-name/do/docker-language-server/package.nix +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -26,8 +26,13 @@ buildGoModule rec { checkPhase = '' runHook preCheck - gotestsum -- $(go list ./... | grep -vE "e2e-tests|/buildkit$|/scout$") -timeout 30s -skip "TestCollectDiagnostics" - go test $(go list ./... | grep e2e-tests) -timeout 120s -skip "TestPublishDiagnostics|TestHover" + + # disable some tests because of sandbox + excludedPackages="e2e-tests|/buildkit$|/scout$" + packages=$(go list ./... | grep -vE "$excludedPackages") + gotestsum -- $packages -timeout 30s -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint" + go test ./e2e-tests/... -timeout 120s -skip "TestPublishDiagnostics|TestHover" + runHook postCheck ''; From 5efa5790dc6e1cc2ec684c61ca1fffd6a3f0ca71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandru=20Scvor=C8=9Bov?= Date: Tue, 28 Oct 2025 09:55:09 +0000 Subject: [PATCH 0962/2279] matrix-tuwunel: 1.4.2->1.4.5 --- pkgs/by-name/ma/matrix-tuwunel/package.nix | 27 +++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index b7fe6422f9c8..e1f6f403077f 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, pkg-config, + libredirect, bzip2, zstd, stdenv, @@ -17,6 +18,7 @@ enableLiburing ? stdenv.hostPlatform.isLinux, liburing, nixosTests, + writeTextFile, }: let rust-jemalloc-sys' = rust-jemalloc-sys.override { @@ -85,16 +87,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.4.2"; + version = "1.4.5"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-h7a8nbKZ6cK6SoAGwORc6+D+jJxQOut7y5KzHfBbqDE="; + hash = "sha256-tZKq8ypDU1MkWORHFQhieDSUOqOzBcfqIQ40amyc1ls="; }; - cargoHash = "sha256-RjoO5eiAXYhC8Tg5UNqCpBsFVN1I+0UhchslAmhm0Qo="; + cargoHash = "sha256-x+LhpwDytwH/NzKWqAuRRbX77OZ2JGaYSaQxqinf81Q="; nativeBuildInputs = [ pkg-config @@ -137,6 +139,25 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optional enableLiburing "io_uring"; + nativeCheckInputs = [ + libredirect.hook + ]; + + preCheck = + let + fakeResolvConf = writeTextFile { + name = "resolv.conf"; + text = '' + nameserver 0.0.0.0 + ''; + }; + in + '' + export NIX_REDIRECTS="/etc/resolv.conf=${fakeResolvConf}" + export TUWUNEL_DATABASE_PATH="$(mktemp -d)/smoketest.db" + ''; + doCheck = true; + passthru = { rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts) updateScript = nix-update-script { }; From b55c7d14affc6b7858fe2adc673132602aea695a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 10:56:08 +0000 Subject: [PATCH 0963/2279] home-manager: 0-unstable-2025-10-25 -> 0-unstable-2025-11-03 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 1af40524d040..d3ba7e38295e 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-10-25"; + version = "0-unstable-2025-11-03"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "c644cb018f9fdec55f5ac2afb4713a8c7beb757c"; - hash = "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M="; + rev = "aa6936bb637e46a49cf1292486200ba41dd4bcf7"; + hash = "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg="; }; nativeBuildInputs = [ From 75234888370dace0aea4246b0f0ba089c63a0a78 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 11:59:17 +0100 Subject: [PATCH 0964/2279] python3Packages.azure-mgmt-containerservice: 39.1.0 -> 40.0.0 Signed-off-by: Paul Meyer --- .../azure-mgmt-containerservice/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index eab2e2e88e4e..0eb74f090d02 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -1,33 +1,33 @@ { lib, - azure-common, azure-mgmt-core, buildPythonPackage, fetchPypi, - isodate, + msrest, + typing-extensions, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "39.1.0"; + version = "40.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "azure_mgmt_containerservice"; inherit version; - hash = "sha256-bww/5E6Tfo79C2A3vhAjkjWZpSzle4EeMFbYC3+XONA="; + hash = "sha256-bFKgzV1VUg7wKOqQtyvY0TKPgNDOaXQ072HFBoYmr28="; }; build-system = [ setuptools ]; dependencies = [ - azure-common + msrest azure-mgmt-core - isodate + typing-extensions ]; # has no tests From ef387cc5869f132aace56045bc944c472c70ab71 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 11:59:44 +0100 Subject: [PATCH 0965/2279] python3Packages.azure-mgmt-recoveryservices: 3.1.0 -> 4.0.0 Signed-off-by: Paul Meyer --- .../python-modules/azure-mgmt-recoveryservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 3f35b8157375..50f89268f30f 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "3.1.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_recoveryservices"; inherit version; - hash = "sha256-fy25hAFwjPFFMi9QvEkcr3lnvsSvO/ewmEufB9MJJoc="; + hash = "sha256-oUKc/Sg6nJlQrBU0gvqcl0Fkb9INqKqcPIHnJceMXJ8="; }; build-system = [ setuptools ]; From 4c00a9768d5e39a23a9983d1bdf305fa7a9201df Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:00:03 +0100 Subject: [PATCH 0966/2279] azure-cli: 2.78.0 -> 2.79.0 Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 5d35697911ef..8108aec93a85 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.78.0"; + version = "2.79.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; tag = "azure-cli-${version}"; - hash = "sha256-kSZ9nFKEXDQtExSuGxyym5xHKVDnOB4QmDG3AZjGGEI="; + hash = "sha256-VvCtHNMdfW/fFZlbu/7EHlSa6GtFZ0B9pdqQFjHdmXg="; }; # put packages that needs to be overridden in the py package scope From f6bd37410fe3a23874b711c2656750c9df7ceedd Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:16 +0100 Subject: [PATCH 0967/2279] azure-cli-extensions.migrate: init at 2.0.1b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 0944d497f7b6..43f44cd6f322 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -685,6 +685,13 @@ "hash": "sha256-i6RQpaPar6i5trbp7oIk9Gj9lyMy6QUADyrMf/AM2bs=", "description": "Microsoft Azure Command-Line Tools Microsoft Fabric Extension" }, + "migrate": { + "pname": "migrate", + "version": "2.0.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-2.0.1b1-py3-none-any.whl", + "hash": "sha256-vRMg/oeqSFXwZaB6J6RO51U6kjWdE4O7EWc/i4LxOmU=", + "description": "Support for Azure Migrate preview" + }, "mixed-reality": { "pname": "mixed-reality", "version": "1.0.0b1", From 90817f4d9aac69ff5b4585796e2a3f7da60247c0 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:18 +0100 Subject: [PATCH 0968/2279] azure-cli-extensions.palo-alto-networks: 1.1.2b2 -> 1.1.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 43f44cd6f322..8eccafc59a7b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -813,9 +813,9 @@ }, "palo-alto-networks": { "pname": "palo-alto-networks", - "version": "1.1.2b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-1.1.2b2-py3-none-any.whl", - "hash": "sha256-xOjYa4QakDrL4Xud0OHvJuY7Df2l2B1mnqw8aMlqiAg=", + "version": "1.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-1.1.2-py3-none-any.whl", + "hash": "sha256-ZxLr6FrIbm4SroHRSxSgG5R4boKdlJ1EQ1rC3ralq70=", "description": "Microsoft Azure Command-Line Tools PaloAltoNetworks Extension" }, "peering": { From 78b88fd1578e48c44b7d33dd3dd849615e2e7069 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:20 +0100 Subject: [PATCH 0969/2279] azure-cli-extensions.stack-hci-vm: 1.10.4 -> 1.10.4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 8eccafc59a7b..70923ade3c08 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -975,7 +975,7 @@ "stack-hci-vm": { "pname": "stack-hci-vm", "version": "1.10.4", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.10.4-py3-none-any.whl", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.10.4-py3-none-any.whl", "hash": "sha256-MjcpQ7a+5Rw6Z7MAVzoa/qT6HSX6uaV+kWoiMBhK/JM=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, From f4f8c3fc319e0d0fca2edee2d82ab5279a7a4b25 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:22 +0100 Subject: [PATCH 0970/2279] azure-cli-extensions.authV2: 1.0.0 -> 1.0.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 70923ade3c08..6381091a2f4e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -120,9 +120,9 @@ }, "authV2": { "pname": "authV2", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-1.0.0-py3-none-any.whl", - "hash": "sha256-wY5B27CGJZK6rL3sPeLvRuZyMS8J+ttHCHI+OZp1NIM=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-1.0.1-py3-none-any.whl", + "hash": "sha256-D5/Yy/ybgTFA6DtTVJeRLmBf97YzB3j0Y/TVAUs/toc=", "description": "Microsoft Azure Command-Line Tools Authv2 Extension" }, "automanage": { From aa1531396a7846d8a4cb4dd088772fb165ee0bfa Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:24 +0100 Subject: [PATCH 0971/2279] azure-cli-extensions.deploy-to-azure: 0.2.0 -> 0.2.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6381091a2f4e..96c9a12f8141 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -338,7 +338,7 @@ "deploy-to-azure": { "pname": "deploy-to-azure", "version": "0.2.0", - "url": "https://github.com/Azure/deploy-to-azure-cli-extension/releases/download/20200318.1/deploy_to_azure-0.2.0-py2.py3-none-any.whl", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/deploy_to_azure-0.2.0-py2.py3-none-any.whl", "hash": "sha256-+SUIDuerw673M9TGMTFwve2qlWmvG5VCc4O8PFnkzrg=", "description": "Deploy to Azure using Github Actions" }, From 6b4f778f73e42aea8980f44cef3f9cfc3b7f34a6 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:26 +0100 Subject: [PATCH 0972/2279] azure-cli-extensions.redisenterprise: 1.2.3 -> 1.3.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 96c9a12f8141..1893b9a30e39 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -883,9 +883,9 @@ }, "redisenterprise": { "pname": "redisenterprise", - "version": "1.2.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.3-py3-none-any.whl", - "hash": "sha256-HTioMOjcy0gBdlrP5Ffd9Pf0SByAiRzkBM9zdPBM/Pw=", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.3.0-py3-none-any.whl", + "hash": "sha256-53kvBZJxKFcjFnGu6VzALidEx2MexVaoZDLW/4tsckY=", "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" }, "reservation": { From 10b311a8d2c0bc89a7e693602375e8132129e3a9 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:28 +0100 Subject: [PATCH 0973/2279] azure-cli-extensions.elastic: 1.0.0b4 -> 1.0.0b5 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 1893b9a30e39..6f14ab0882a0 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -421,9 +421,9 @@ }, "elastic": { "pname": "elastic", - "version": "1.0.0b4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-1.0.0b4-py3-none-any.whl", - "hash": "sha256-+zjE4PUe1FvB7z1i4FFP3EyWBDco/dZe9DbBDMogijY=", + "version": "1.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-1.0.0b5-py3-none-any.whl", + "hash": "sha256-P8N5gq5tmaw3IVJc3616x9gfGKC1F8hzu/Whck4v4XU=", "description": "Microsoft Azure Command-Line Tools MicrosoftElastic Extension" }, "elastic-san": { From 3eb70c09714ecbe32bd0e68a10958c608c60c30a Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:30 +0100 Subject: [PATCH 0974/2279] azure-cli-extensions.quantum: 1.0.0b9 -> 1.0.0b10 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6f14ab0882a0..108aafd9d922 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -862,9 +862,9 @@ }, "quantum": { "pname": "quantum", - "version": "1.0.0b9", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b9-py3-none-any.whl", - "hash": "sha256-DYnSYOsA+nZJ9V2JIqIHB/697a9ATJLBneyrPsHGoVY=", + "version": "1.0.0b10", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b10-py3-none-any.whl", + "hash": "sha256-ihvof5C7EOMq65Ljbv2ax9Lri67AY0kSBb687dUGAv0=", "description": "Microsoft Azure Command-Line Tools Quantum Extension" }, "qumulo": { From 902553ab884b5ac3f4e371b3e621fceaf7f06b20 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:32 +0100 Subject: [PATCH 0975/2279] azure-cli-extensions.workload-orchestration: 4.0.0 -> 4.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 108aafd9d922..0b9697f913bf 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1121,9 +1121,9 @@ }, "workload-orchestration": { "pname": "workload-orchestration", - "version": "4.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.0.0-py3-none-any.whl", - "hash": "sha256-FiAi5pfW67mYqtQJcUlMLwArKQroXD0GoSX82WZH0RQ=", + "version": "4.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.1.0-py3-none-any.whl", + "hash": "sha256-9+pQFtpZzIEk4971hNJuB6gxu7WtRtDO69zt6jgq60A=", "description": "Microsoft Azure Command-Line Tools WorkloadOperations Extension" }, "workloads": { From 33a4b62585cb1efd66e98e73efd7d2d59f60b9b0 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:34 +0100 Subject: [PATCH 0976/2279] azure-cli-extensions.managednetworkfabric: 8.2.1 -> 9.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 0b9697f913bf..884a2596bfd4 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -652,10 +652,10 @@ }, "managednetworkfabric": { "pname": "managednetworkfabric", - "version": "8.2.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-8.2.1-py3-none-any.whl", - "hash": "sha256-lVW++ZSooBiMtWpiFpxpaBygDBckM7OZPYZNZko7/Cs=", - "description": "Support for managednetworkfabric commands based on 2024-06-15-preview API version" + "version": "9.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-9.0.0-py3-none-any.whl", + "hash": "sha256-0rHpjofa54BNAfgzIoapCZKxgVgQJhOyLQxB8LhxkgQ=", + "description": "Support for managednetworkfabric commands based on 2025-07-15 API version" }, "managementpartner": { "pname": "managementpartner", From 24fc67ea12e65ebca4a4bb77af9c60356e083ad6 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:36 +0100 Subject: [PATCH 0977/2279] azure-cli-extensions.azure-firewall: 1.5.0 -> 2.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 884a2596bfd4..a27b9fa3ed61 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -141,9 +141,9 @@ }, "azure-firewall": { "pname": "azure-firewall", - "version": "1.5.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.5.0-py2.py3-none-any.whl", - "hash": "sha256-wE/LgTfxqeHOkkybF8pp7TSLJe+WPqjKiEaYe/C8phs=", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-2.0.0-py2.py3-none-any.whl", + "hash": "sha256-tIX7vovIVGe9NsBg3N8LbwyVsxgurJKXLUtUYveaZtA=", "description": "Manage Azure Firewall resources" }, "azurelargeinstance": { From 6ba40818164ed8193e855505ce923e15e0a02ac4 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:38 +0100 Subject: [PATCH 0978/2279] azure-cli-extensions.connectedmachine: 2.0.0b1 -> 2.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index a27b9fa3ed61..4cb32c6e8917 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -232,9 +232,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "2.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-2.0.0b1-py3-none-any.whl", - "hash": "sha256-TNewwps4rNSx/O+GIhdFMsLJC8Z0pxD2VIlGsujOPVs=", + "version": "2.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-2.0.0b2-py3-none-any.whl", + "hash": "sha256-LZfsPWODjBB6i3Z/oAGquxlRCS8NKxkp2W3K4j+n9XQ=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { From 945b78bf7852442c0570a465bdbd384730422fed Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:40 +0100 Subject: [PATCH 0979/2279] azure-cli-extensions.fzf: 1.0.2 -> 1.0.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 4cb32c6e8917..60399e4df225 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -485,7 +485,7 @@ "fzf": { "pname": "fzf", "version": "1.0.2", - "url": "https://pahealyfzf.blob.core.windows.net/fzf/fzf-1.0.2-py2.py3-none-any.whl", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fzf-1.0.2-py2.py3-none-any.whl", "hash": "sha256-hKvu0DtLv6e4wL4I2TZv8wQOIWDfT1pTnw4cngocNZw=", "description": "Microsoft Azure Command-Line Tools fzf Extension" }, From a3056478fc22ee1f43a2df731de5e17937673bf1 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:42 +0100 Subject: [PATCH 0980/2279] azure-cli-extensions.customlocation: 0.1.4 -> 0.1.4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 60399e4df225..feecc6629765 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -268,7 +268,7 @@ "customlocation": { "pname": "customlocation", "version": "0.1.4", - "url": "https://arcplatformcliextprod.z13.web.core.windows.net/customlocation-0.1.4-py2.py3-none-any.whl", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/customlocation-0.1.4-py2.py3-none-any.whl", "hash": "sha256-4Ou6/8XRwH5c1hXZy54hJE7fxEeyjLAYcTmhGNyIkrc=", "description": "Microsoft Azure Command-Line Tools Customlocation Extension" }, From f95b46da765cbb1eedcf830c4f360f9a1d26a90f Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:44 +0100 Subject: [PATCH 0981/2279] azure-cli-extensions.aks-preview: 18.0.0b44 -> 19.0.0b10 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index feecc6629765..a099c7e88fc8 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "18.0.0b44", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b44-py2.py3-none-any.whl", - "hash": "sha256-lpkKTYjIReWC5J+amHDnR/jhOjXwCmV0MkoiX+nmwiE=", + "version": "19.0.0b10", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-19.0.0b10-py2.py3-none-any.whl", + "hash": "sha256-xteDVuaDzci2reA8MGECuGepCLlcwcWEb8fRCL3r7h8=", "description": "Provides a preview for upcoming AKS features" }, "alb": { From 6b1ebc739b665f226b5a581ea3a919c446b19c79 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 12:01:46 +0100 Subject: [PATCH 0982/2279] azure-cli-extensions.fleet: 1.8.0 -> 1.8.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index a099c7e88fc8..7222b055a91e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -456,9 +456,9 @@ }, "fleet": { "pname": "fleet", - "version": "1.8.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.0-py3-none-any.whl", - "hash": "sha256-3JX3KQ4eSr3CQ5UkvssOcCHaAeIFsm0/xWd5JYaL0G4=", + "version": "1.8.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.1-py3-none-any.whl", + "hash": "sha256-842zQA4Jk0dp8jMCro5lut4Ro5u7ny1sp095uqXyR9k=", "description": "Microsoft Azure Command-Line Tools Fleet Extension" }, "fluid-relay": { From f847b7a54bc439f5d059e2b104d1a853f980b5f8 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 29 Oct 2025 16:28:53 +0000 Subject: [PATCH 0983/2279] orbstack: 2.0.3-19876 -> 2.0.4-19887 --- 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 64e916d49c3f..a449820edc80 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.0.3-19876"; + version = "2.0.4-19887"; sourceData = { aarch64-darwin = { arch = "arm64"; - hash = "sha256-3Ppc0zWEgR/nTS7R9uAkUYYgYu5q2TWmfd3evT+Z8g4="; + hash = "sha256-uog0B1Dro5lkSMDWr+FOvmeH/ue3NoNNvIUR/+FZENs="; }; x86_64-darwin = { arch = "amd64"; - hash = "sha256-+JpyynFKmDjHLetvvEpQ0qw4crAVmx0ucWm+bvtZ2Fg="; + hash = "sha256-lLj4BlSG01CMYCVBWuASjxCjrczv7mbC1iXM0WgWHtw="; }; }; sources = lib.mapAttrs ( From 7c1ce1c246e343007f3f5c5b0da3cec77d192b7d Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 4 Nov 2025 13:07:42 +0100 Subject: [PATCH 0984/2279] taizen: 0-unstable-2023-06-05 -> 0-unstable-2024-11-16 --- pkgs/by-name/ta/taizen/package.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index 313371f41073..620ad52f3167 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -8,26 +8,17 @@ openssl, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "taizen"; - version = "0-unstable-2023-06-05"; + version = "0-unstable-2024-11-16"; src = fetchFromGitHub { owner = "oppiliappan"; repo = "taizen"; - rev = "5486cd4f4c5aa4e0abbcee180ad2ec22839abd31"; - hash = "sha256-pGcD3+3Ds3U8NuNySaDnz0zzAvZlSDte1jRPdM5qrZA="; + rev = "e57f10845d32d51e78c5bbadf9c40780a0fa2481"; + hash = "sha256-5XLRANBRtT8LyyS4EhKgZS+Hc3xFg/+N3rZJTVvVrpo="; }; - cargoPatches = [ - # update cargo dependencies upstreamed: https://github.com/oppiliappan/taizen/pull/27 - (fetchpatch2 { - name = "update-cargo-lock.patch"; - url = "https://github.com/oppiliappan/taizen/commit/104a1663268623e9ded45afaf2fe98c9c42b7b21.patch"; - hash = "sha256-ujsr7MjZWEu+2mijVH1aqtTJXKZC4m5vl73Jre9XHbU="; - }) - ]; - cargoHash = "sha256-kK9na2Pk3Hl4TYYVVUfeBv6DDDkrD7mIv7eVHXkS5QY="; nativeBuildInputs = [ pkg-config ]; @@ -37,11 +28,11 @@ rustPlatform.buildRustPackage { openssl ]; - meta = with lib; { + meta = { description = "Curses-based mediawiki browser"; homepage = "https://github.com/oppiliappan/taizen"; - license = licenses.mit; maintainers = [ ]; + license = lib.licenses.mit; mainProgram = "taizen"; }; -} +}) From e395b01772b093438a62fbab3bcbfb27ad5213de Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 4 Nov 2025 13:08:56 +0100 Subject: [PATCH 0985/2279] taizen: add liberodark to maintainers --- pkgs/by-name/ta/taizen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index 620ad52f3167..cee2f858b382 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Curses-based mediawiki browser"; homepage = "https://github.com/oppiliappan/taizen"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; license = lib.licenses.mit; mainProgram = "taizen"; }; From 2550e30b0ff449bcb5bdc91eb90c0427a4395124 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Nov 2025 13:32:28 +0100 Subject: [PATCH 0986/2279] igvm-tooling: remove python3Packages.ecdsa has been marked vulnerable, and igvm-tooling depends on it. There won't be a fix to the ecdsa lib, and it isn't likely upstream will move to another dependency as the vulnerability doesn't really affect igvm-tooling's use case. Signed-off-by: Paul Meyer --- pkgs/by-name/ig/igvm-tooling/package.nix | 81 ------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 pkgs/by-name/ig/igvm-tooling/package.nix diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix deleted file mode 100644 index 05629f538466..000000000000 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, - fetchpatch, - which, - acpica-tools, - unstableGitUpdater, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "igvm-tooling"; - version = "1.5.0-unstable-2024-06-06"; - pyproject = true; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "igvm-tooling"; - rev = "53656ddde294bbafcae6349b5acfc5da9f7dbb92"; - hash = "sha256-X9Gi+kTmc/ZcsgbHldEj9zPnOmd5puDD7/+J1s1CVws="; - }; - - patches = [ - # drop unused libclang dependency - # remove once https://github.com/microsoft/igvm-tooling/pull/53 is merged - (fetchpatch { - name = "0001-setup.py-remove-unused-libclang-dependency.patch"; - url = "https://github.com/microsoft/igvm-tooling/commit/7182e925de9b5e9f5c8c3a3ce6e3942a92506064.patch"; - hash = "sha256-tcVxcuLxknyEdo2YjeHOqSG9xQna8US+YyvlcfX+Htw="; - stripLen = 1; - }) - ]; - - postPatch = '' - substituteInPlace igvm/acpi.py \ - --replace-fail 'os.path.join(os.path.dirname(__file__), "acpi", "acpi.zip")' "\"$out/share/igvm-tooling/acpi/acpi.zip\"" - ''; - - sourceRoot = "${src.name}/src"; - - nativeBuildInputs = [ acpica-tools ]; - - propagatedBuildInputs = - (with python3.pkgs; [ - setuptools - ecdsa - cstruct - pyelftools - pytest - cached-property - frozendict - ]) - ++ [ - acpica-tools - which - ]; - - postInstall = '' - mkdir -p $out/share/igvm-tooling/acpi/acpi-clh - cp -rT igvm/acpi/acpi-clh $out/share/igvm-tooling/acpi/acpi-clh - cp igvm/acpi/acpi.zip $out/share/igvm-tooling/acpi/acpi.zip - find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; - ''; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "igvm-"; - }; - - meta = { - description = "IGVM Image Generator"; - homepage = "https://github.com/microsoft/igvm-tooling"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - malt3 - katexochen - ]; - changelog = "https://github.com/microsoft/igvm-tooling/releases/tag/igvm-${version}"; - mainProgram = "igvmgen"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e4071c5bcc9..24151b9c552c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -700,6 +700,7 @@ mapAliases { hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27 i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27 ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25 + igvm-tooling = throw "'igvm-tooling' has been removed as it is poorly maintained upstream and a dependency has been marked insecure."; # Added 2025-09-03 ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15 immersed-vr = throw "'immersed-vr' has been renamed to/replaced by 'immersed'"; # Converted to throw 2025-10-27 From 8072daa07e334bc994454dcc3d77c5e3117db7b1 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 4 Nov 2025 13:48:41 +0100 Subject: [PATCH 0987/2279] nextcloud: expose occ binary via $OCC_BIN in nextcloud-setup service script --- nixos/modules/services/web-apps/nextcloud.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 76cb7471f6b9..67a756a4ea01 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1235,6 +1235,8 @@ in path = [ occ ]; restartTriggers = [ overrideConfig ]; script = '' + export OCC_BIN="${lib.getExe occ}" + ${lib.optionalString (c.dbpassFile != null) '' if [ -z "$(<"$CREDENTIALS_DIRECTORY/dbpass")" ]; then echo "dbpassFile ${c.dbpassFile} is empty!" @@ -1275,13 +1277,13 @@ in ${occInstallCmd} fi - ${lib.getExe occ} upgrade + $OCC_BIN upgrade - ${lib.getExe occ} config:system:delete trusted_domains + $OCC_BIN config:system:delete trusted_domains ${lib.optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) '' # Try to enable apps - ${lib.getExe occ} app:enable ${lib.concatStringsSep " " (lib.attrNames cfg.extraApps)} + $OCC_BIN app:enable ${lib.concatStringsSep " " (lib.attrNames cfg.extraApps)} ''} ${occSetTrustedDomainsCmd} From 089ac45d3232de6299651806196e8690e87b97c6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 4 Nov 2025 14:15:44 +0100 Subject: [PATCH 0988/2279] nixosTests.lomiri-music-app: Fix OCR - Stopped finding the Tracks option in the pop-up menu. Just click where it should be, look for the new menu title afterwards. - Stopped finding the small listing of the song title. Move the check to the very end, when the song is already opened in the player interface. --- nixos/tests/lomiri-music-app.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix index 7424847b3794..5cf32619d8f7 100644 --- a/nixos/tests/lomiri-music-app.nix +++ b/nixos/tests/lomiri-music-app.nix @@ -148,10 +148,9 @@ in machine.wait_for_text("Albums") machine.succeed("xdotool mousemove 25 45 click 1") # Open categories machine.sleep(2) - machine.wait_for_text("Tracks") machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category machine.sleep(2) - machine.wait_for_text("${musicFileName}") # the test file + machine.wait_for_text("Tracks") # Written in larger text now, easier for OCR machine.screenshot("lomiri-music_listing") # Ensure pause colours isn't present already @@ -180,8 +179,9 @@ in machine.screenshot("lomiri-music_paused") - # Lastly, check if generated cover image got extracted properly + # Lastly, check if song details like title & generated cover image got extracted properly # if not, indicates an issue with mediascanner / lomiri-thumbnailer + machine.wait_for_text("${musicFileName}") machine.wait_for_text("${ocrContent}") machine.succeed("pkill -f lomiri-music-app") From fd2c2645e2c50b74be72069735335356156e36ef Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Tue, 4 Nov 2025 14:30:26 +0100 Subject: [PATCH 0989/2279] shh: 2025.10.22 -> 2025.11.3 Changelog: https://github.com/desbma/shh/blob/v2025.11.3/CHANGELOG.md --- pkgs/by-name/sh/shh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index bb3337716b20..deedf68e8599 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "shh"; - version = "2025.10.22"; + version = "2025.11.3"; src = fetchFromGitHub { owner = "desbma"; repo = "shh"; tag = "v${finalAttrs.version}"; - hash = "sha256-OxiQOwoWytZvPVVurSckPSWcb88pyDHRdUV/87Dbb9Q="; + hash = "sha256-oXTrKUs6J3Us2m1hFbVa+G03q3oV3pqppQ+QfPXVrFA="; }; - cargoHash = "sha256-KRRBqRm6/TedzjGRTcbj0q4R9xOgj0PmKEm9rY2f4PM="; + cargoHash = "sha256-GGu/oy4bfsnJNbquDeu9bDJWY9HEWS3hwsOj3nhcUNQ="; patches = [ ./fix_run_checks.patch From 4d8d63b5d5900e003b9af2b5aa4ebcd28a7c4b3e Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 4 Nov 2025 14:49:28 +0100 Subject: [PATCH 0990/2279] python3Packages.pyslurm: 24.11.0 -> 25.5.0 https://github.com/PySlurm/pyslurm/releases/tag/v25.5.0 Currently, pyslurm is incompatible with the slurm version we ship. --- pkgs/development/python-modules/pyslurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 4361c2fbc223..552548c0840c 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "24.11.0"; + version = "25.5.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "pyslurm"; owner = "PySlurm"; tag = "v${version}"; - hash = "sha256-Uko4fgi080XWSseOBijzvzi0YtjuRIvH8qSKEWrpFG0="; + hash = "sha256-2FEBOKMN3IhJZu+QQ3nWQfxom6wpZUuQouF7TRYndTs="; }; nativeBuildInputs = [ setuptools ]; From 72e01e413e80806e92d7732e9c7437f8a7a32f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 29 Oct 2025 17:14:28 +0100 Subject: [PATCH 0991/2279] intel-graphics-compiler: 2.18.5 -> 2.20.3 Changelog: https://github.com/intel/intel-graphics-compiler/releases/tag/v2.20.3 (cherry picked from commit 0ced5e4f5481f0f4c7478cb76ba35358e6b56b4d) --- .../intel-graphics-compiler/bump-cmake.patch | 14 ---------- .../in/intel-graphics-compiler/package.nix | 28 +++++++++++-------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch index 518accce964e..1227b9c0a2f9 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch +++ b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch @@ -8,25 +8,11 @@ are no uses of COMPILE_DEFINITIONS_. Signed-off-by: Chris Mayo --- - IGC/MDAutogen/CMakeLists.txt | 2 +- external/SPIRV-Tools/CMakeLists.txt | 2 +- visa/CMakeLists.txt | 7 +------ visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 6 +----- 4 files changed, 4 insertions(+), 13 deletions(-) -diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt -index c9522feea29d..0a79b3c8e32b 100644 ---- a/igc/IGC/MDAutogen/CMakeLists.txt -+++ b/igc/IGC/MDAutogen/CMakeLists.txt -@@ -6,7 +6,7 @@ - # - #============================ end_copyright_notice ============================= - --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.5) - - set(_autogenScript "${IGC_SOURCE_DIR}/common/autogen.py") - set(_autogenSource "${IGC_SOURCE_DIR}/common/MDFrameWork.h") diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt index d2e3f63fb0d3..75f013409990 100644 --- a/igc/external/SPIRV-Tools/CMakeLists.txt diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 2c3e65dcf9fe..a2e01d067c74 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, git, @@ -15,9 +14,12 @@ spirv-headers, }: +let + llvmVersion = "16.0.6"; +in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "2.18.5"; + version = "2.20.3"; # See the repository for expected versions: # @@ -27,35 +29,35 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "intel-graphics-compiler"; tag = "v${version}"; - hash = "sha256-AvEeK3rySEu89br4JgeZlXVQ6IXEzStVZYvehzdWq7g="; + hash = "sha256-OCou4yhx9rY1JznrzGMLhsjj/3CvqQXfXWFAPDxA8Ds="; }) (fetchFromGitHub { name = "llvm-project"; owner = "llvm"; repo = "llvm-project"; - tag = "llvmorg-15.0.7"; - hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; + tag = "llvmorg-${llvmVersion}"; + hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; }) (fetchFromGitHub { name = "vc-intrinsics"; owner = "intel"; repo = "vc-intrinsics"; - tag = "v0.23.1"; - hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc="; + tag = "v0.23.4"; + hash = "sha256-zorhOhBTcymnAlShJxJecXD+HIfScGouhSea/A3tBXE="; }) (fetchFromGitHub { name = "opencl-clang"; owner = "intel"; repo = "opencl-clang"; - tag = "v15.0.3"; - hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw=="; + tag = "v16.0.5"; + hash = "sha256-JfynEsCXltVdVY/LqWvZwzWfzEFUz6nI9Zub+bze1zE="; }) (fetchFromGitHub { name = "llvm-spirv"; owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - tag = "v15.0.15"; - hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ="; + tag = "v16.0.17"; + hash = "sha256-ta5QbVady9/cwBbAwF1r4ft/ESMnLgcmGMrFhv1PCH0="; }) ]; @@ -90,6 +92,10 @@ stdenv.mkDerivation rec { substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \ --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \ 'COMMAND patch -p1 --ignore-whitespace -i ' + + # match default LLVM version with our provided version to apply correct patches + substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \ + --replace-fail "15.0.7" "${llvmVersion}" ''; nativeBuildInputs = [ From 007c38f4fc89b23bb4f2addfed1175b5278b9d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 29 Oct 2025 16:57:14 +0100 Subject: [PATCH 0992/2279] intel-compute-runtime: 25.35.35096.9 -> 25.40.35563.4 Diff: https://github.com/intel/compute-runtime/compare/25.35.35096.9...25.40.35563.4 Changelog: https://github.com/intel/compute-runtime/releases/tag/25.40.35563.4 --- pkgs/by-name/in/intel-compute-runtime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index 7d00ee756764..658f8986dac9 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "25.35.35096.9"; + version = "25.40.35563.4"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = version; - hash = "sha256-GAFbpf5ZUpq+jpVECa5buauCYdpPBOBrREkgrGyhxPA="; + hash = "sha256-V2zmS3CFLxhyFYvGOdkix9g3E6JkeVa/pDLPC5NYivo="; }; nativeBuildInputs = [ From 4a781922b3a1231c49203a92470410030837e0a3 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 4 Nov 2025 15:26:29 +0100 Subject: [PATCH 0993/2279] electron-source.electron_36: remove --- pkgs/development/tools/electron/common.nix | 76 +- pkgs/development/tools/electron/info.json | 1324 -------------------- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 13 insertions(+), 1393 deletions(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index c28c0690bb79..dbfe917ed23d 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -65,73 +65,23 @@ in unpackPhase = null; # prevent chromium's unpackPhase from being used sourceRoot = "src"; - env = - base.env - // { - # Hydra can fail to build electron due to clang spamming deprecation - # warnings mid-build, causing the build log to grow beyond the limit - # of 64mb and then getting killed by Hydra. - # For some reason, the log size limit appears to only be enforced on - # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To - # unbreak the build on h.n.o, we simply disable those warnings for now. - # https://hydra.nixos.org/build/283952243 - NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated"; - } - // lib.optionalAttrs (lib.versionAtLeast info.version "35") { - # Needed for header generation in electron 35 and above - ELECTRON_OUT_DIR = "Release"; - }; + env = base.env // { + # Hydra can fail to build electron due to clang spamming deprecation + # warnings mid-build, causing the build log to grow beyond the limit + # of 64mb and then getting killed by Hydra. + # For some reason, the log size limit appears to only be enforced on + # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To + # unbreak the build on h.n.o, we simply disable those warnings for now. + # https://hydra.nixos.org/build/283952243 + NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated"; + # Needed for header generation in electron 35 and above + ELECTRON_OUT_DIR = "Release"; + }; src = null; patches = base.patches - # Fix building with Rust 1.87+ - # https://issues.chromium.org/issues/407024458 - ++ lib.optionals (lib.versionOlder info.version "37") [ - # https://chromium-review.googlesource.com/c/chromium/src/+/6432410 - # Not using fetchpatch here because it ignores file renames: https://github.com/nixos/nixpkgs/issues/32084 - ./Reland-Use-global_allocator-to-provide-Rust-allocator-implementation.patch - - # https://chromium-review.googlesource.com/c/chromium/src/+/6434355 - (fetchpatch { - name = "Call-Rust-default-allocator-directly-from-Rust.patch"; - url = "https://github.com/chromium/chromium/commit/73eef8797a8138f5c26f52a1372644b20613f5ee.patch"; - hash = "sha256-IcSjPv21xT+l9BwJuzeW2AfwBdKI0dQb3nskk6yeKHU="; - }) - - # https://chromium-review.googlesource.com/c/chromium/src/+/6439711 - (fetchpatch { - name = "Roll-rust.patch"; - url = "https://github.com/chromium/chromium/commit/a6c30520486be844735dc646cd5b9b434afa0c6b.patch"; - includes = [ "build/rust/allocator/*" ]; - hash = "sha256-MFdR75oSAdFW6telEZt/s0qdUvq/BiYFEHW0vk+RgDk="; - }) - - # https://chromium-review.googlesource.com/c/chromium/src/+/6456604 - (fetchpatch { - name = "Drop-remap_alloc-dep.patch"; - url = "https://github.com/chromium/chromium/commit/87d5ad2f621e0d5c81849dde24f3a5347efcb167.patch"; - hash = "sha256-bEoR6jxEyw6Fzm4Zv4US54Cxa0li/0UTZTU2WUf0Rgo="; - }) - - # https://chromium-review.googlesource.com/c/chromium/src/+/6454872 - (fetchpatch { - name = "rust-Clean-up-build-rust-allocator-after-a-Rust-tool.patch"; - url = "https://github.com/chromium/chromium/commit/5c74fcf6fd14491f33dd820022a9ca045f492f68.patch"; - hash = "sha256-vcD0Zfo4Io/FVpupWOdgurFEqwFCv+oDOtSmHbm+ons="; - }) - ] - # Fix building with gperf 3.2+ - # https://issues.chromium.org/issues/40209959 - ++ lib.optionals (lib.versionOlder info.version "37") [ - # https://chromium-review.googlesource.com/c/chromium/src/+/6445471 - (fetchpatch { - name = "Dont-apply-FALLTHROUGH-edit-to-gperf-3-2-output.patch"; - url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch"; - hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA="; - }) - ] # Fix build with Rust 1.89.0 ++ lib.optionals (lib.versionOlder info.version "38") [ # https://chromium-review.googlesource.com/c/chromium/src/+/6624733 @@ -233,8 +183,6 @@ in done done ) - '' - + lib.optionalString (lib.versionAtLeast info.version "36") '' echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni echo 'checkout_mutter = false' >> build/config/gclient_args.gni '' diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index e3376fa7121c..e14995245470 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1,1328 +1,4 @@ { - "36": { - "chrome": "136.0.7103.177", - "chromium": { - "deps": { - "gn": { - "hash": "sha256-MnGl+D9ahQibUHCtyOUf1snvmeupUn4D2yrDj55JTe4=", - "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", - "version": "0-unstable-2025-03-24" - } - }, - "version": "136.0.7103.177" - }, - "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=", - "deps": { - "src": { - "args": { - "hash": "sha256-KrRUazCSb+X51EeffwoZ4Iniok1CMpAu2hP7IzgwX7U=", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "136.0.7103.177", - "url": "https://chromium.googlesource.com/chromium/src.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/chrome/test/data/perf/canvas_bench": { - "args": { - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "args": { - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/chrome/test/data/xr/webvr_info": { - "args": { - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/docs/website": { - "args": { - "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=", - "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb", - "url": "https://chromium.googlesource.com/website.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/electron": { - "args": { - "hash": "sha256-2oJRD32zDb26fieeW+q+n/8xlF9V7GgePYhRn6QSuKs=", - "owner": "electron", - "repo": "electron", - "tag": "v36.9.5" - }, - "fetcher": "fetchFromGitHub" - }, - "src/media/cdm/api": { - "args": { - "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=", - "rev": "5a1675c86821a48f8983842d07f774df28dfb43c", - "url": "https://chromium.googlesource.com/chromium/cdm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/net/third_party/quiche/src": { - "args": { - "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=", - "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85", - "url": "https://quiche.googlesource.com/quiche.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/testing/libfuzzer/fuzzers/wasm_corpus": { - "args": { - "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=", - "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b", - "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/accessibility_test_framework/src": { - "args": { - "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", - "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", - "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle": { - "args": { - "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=", - "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e", - "url": "https://chromium.googlesource.com/angle/angle.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "args": { - "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=", - "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle/third_party/glmark2/src": { - "args": { - "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=", - "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "args": { - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/anonymous_tokens/src": { - "args": { - "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=", - "rev": "d708a2602a5947ee068f784daa1594a673d47c4a", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/beto-core/src": { - "args": { - "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=", - "rev": "89563fec14c756482afa08b016eeba9087c8d1e3", - "url": "https://beto-core.googlesource.com/beto-core.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/boringssl/src": { - "args": { - "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=", - "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48", - "url": "https://boringssl.googlesource.com/boringssl.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/breakpad/breakpad": { - "args": { - "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=", - "rev": "657a441e5c1a818d4c10b7bafd431454e6614901", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cast_core/public/src": { - "args": { - "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=", - "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942", - "url": "https://chromium.googlesource.com/cast_core/public" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/catapult": { - "args": { - "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=", - "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4", - "url": "https://chromium.googlesource.com/catapult.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ced/src": { - "args": { - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/clang-format/script": { - "args": { - "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=", - "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cld_3/src": { - "args": { - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/colorama/src": { - "args": { - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49", - "url": "https://chromium.googlesource.com/external/colorama.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/compiler-rt/src": { - "args": { - "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=", - "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/content_analysis_sdk/src": { - "args": { - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cpu_features/src": { - "args": { - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "rev": "936b9ab5515dead115606559502e3864958f7f6e", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cpuinfo/src": { - "args": { - "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=", - "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/crabbyavif/src": { - "args": { - "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A=", - "rev": "02d0fad2c512380b7270d6e704c86521075d7d54", - "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/crc32c/src": { - "args": { - "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", - "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cros-components/src": { - "args": { - "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=", - "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/cros_system_api": { - "args": { - "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=", - "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/crossbench": { - "args": { - "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=", - "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122", - "url": "https://chromium.googlesource.com/crossbench.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dav1d/libdav1d": { - "args": { - "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=", - "rev": "8d956180934f16244bdb58b39175824775125e55", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn": { - "args": { - "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=", - "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb", - "url": "https://dawn.googlesource.com/dawn.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/dxc": { - "args": { - "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=", - "rev": "206b77577d15fc5798eb7ad52290388539b7146d", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/dxheaders": { - "args": { - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/glfw": { - "args": { - "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", - "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "args": { - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "args": { - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "args": { - "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=", - "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/depot_tools": { - "args": { - "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=", - "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/devtools-frontend/src": { - "args": { - "hash": "sha256-5gbDmUfJI6kGKGxcbDp0CbmLr8ppvz63Nk5HV0XmMBo=", - "rev": "cb82c1525a5b3d277d427b908a21a87489bec532", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/dom_distiller_js/dist": { - "args": { - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/domato/src": { - "args": { - "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=", - "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e", - "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/eigen3/src": { - "args": { - "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=", - "rev": "464c1d097891a1462ab28bf8bb763c1683883892", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/electron_node": { - "args": { - "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=", - "owner": "nodejs", - "repo": "node", - "tag": "v22.19.0" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/emoji-segmenter/src": { - "args": { - "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=", - "rev": "955936be8b391e00835257059607d7c5b72ce744", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/engflow-reclient-configs": { - "args": { - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/expat/src": { - "args": { - "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=", - "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/farmhash/src": { - "args": { - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fast_float/src": { - "args": { - "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=", - "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4", - "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ffmpeg": { - "args": { - "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=", - "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/flac": { - "args": { - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/flatbuffers/src": { - "args": { - "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", - "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fontconfig/src": { - "args": { - "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", - "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", - "url": "https://chromium.googlesource.com/external/fontconfig.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fp16/src": { - "args": { - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/freetype-testing/src": { - "args": { - "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=", - "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/freetype/src": { - "args": { - "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=", - "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fuzztest/src": { - "args": { - "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=", - "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/fxdiv/src": { - "args": { - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/gemmlowp/src": { - "args": { - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/glslang/src": { - "args": { - "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=", - "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/google_benchmark/src": { - "args": { - "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=", - "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/googletest/src": { - "args": { - "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=", - "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/harfbuzz-ng/src": { - "args": { - "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=", - "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/highway/src": { - "args": { - "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=", - "rev": "00fe003dac355b979f36157f9407c7c46448958e", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/hunspell_dictionaries": { - "args": { - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/icu": { - "args": { - "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=", - "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ink/src": { - "args": { - "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=", - "rev": "c542d619a8959415beda5a76fe89ffa2f83df886", - "url": "https://chromium.googlesource.com/external/github.com/google/ink.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ink_stroke_modeler/src": { - "args": { - "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=", - "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba", - "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/instrumented_libs": { - "args": { - "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=", - "rev": "69015643b3f68dbd438c010439c59adc52cac808", - "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/jetstream/main": { - "args": { - "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=", - "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/jetstream/v2.2": { - "args": { - "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=", - "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/jsoncpp/source": { - "args": { - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/leveldatabase/src": { - "args": { - "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=", - "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5", - "url": "https://chromium.googlesource.com/external/leveldb.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libFuzzer/src": { - "args": { - "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=", - "rev": "e31b99917861f891308269c36a32363b120126bb", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libaddressinput/src": { - "args": { - "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=", - "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07", - "url": "https://chromium.googlesource.com/external/libaddressinput.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libaom/source/libaom": { - "args": { - "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=", - "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be", - "url": "https://aomedia.googlesource.com/aom.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libc++/src": { - "args": { - "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=", - "rev": "449310fe2e37834a7e62972d2a690cade2ef596b", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libc++abi/src": { - "args": { - "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=", - "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libdrm/src": { - "args": { - "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=", - "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libgav1/src": { - "args": { - "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=", - "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58", - "url": "https://chromium.googlesource.com/codecs/libgav1.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libipp/libipp": { - "args": { - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libjpeg_turbo": { - "args": { - "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=", - "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/liblouis/src": { - "args": { - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", - "url": "https://chromium.googlesource.com/external/liblouis-github.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libphonenumber/dist": { - "args": { - "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=", - "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7", - "url": "https://chromium.googlesource.com/external/libphonenumber.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libprotobuf-mutator/src": { - "args": { - "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=", - "rev": "7bf98f78a30b067e22420ff699348f084f802e12", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libsrtp": { - "args": { - "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=", - "rev": "a52756acb1c5e133089c798736dd171567df11f5", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libsync/src": { - "args": { - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libunwind/src": { - "args": { - "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=", - "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libva-fake-driver/src": { - "args": { - "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=", - "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194", - "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libvpx/source/libvpx": { - "args": { - "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=", - "rev": "027bbee30a0103b99d86327b48d29567fed11688", - "url": "https://chromium.googlesource.com/webm/libvpx.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libwebm/source": { - "args": { - "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ=", - "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268", - "url": "https://chromium.googlesource.com/webm/libwebm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libwebp/src": { - "args": { - "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=", - "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18", - "url": "https://chromium.googlesource.com/webm/libwebp.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/libyuv": { - "args": { - "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=", - "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/llvm-libc/src": { - "args": { - "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=", - "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/lss": { - "args": { - "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=", - "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0", - "url": "https://chromium.googlesource.com/linux-syscall-support.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/material_color_utilities/src": { - "args": { - "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", - "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/minigbm/src": { - "args": { - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/nan": { - "args": { - "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", - "owner": "nodejs", - "repo": "nan", - "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/nasm": { - "args": { - "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=", - "rev": "767a169c8811b090df222a458b25dfa137fc637e", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/nearby/src": { - "args": { - "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=", - "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/neon_2_sse/src": { - "args": { - "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=", - "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openh264/src": { - "args": { - "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=", - "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openscreen/src": { - "args": { - "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=", - "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8", - "url": "https://chromium.googlesource.com/openscreen" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openscreen/src/buildtools": { - "args": { - "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o=", - "rev": "00459762409cb29cecf398a23cdb0cae918b7515", - "url": "https://chromium.googlesource.com/chromium/src/buildtools" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "args": { - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ots/src": { - "args": { - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pdfium": { - "args": { - "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=", - "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5", - "url": "https://pdfium.googlesource.com/pdfium.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/perfetto": { - "args": { - "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=", - "rev": "054635b91453895720951f7329619d003a98b3e4", - "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/protobuf-javascript/src": { - "args": { - "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=", - "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8", - "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pthreadpool/src": { - "args": { - "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=", - "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86", - "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pyelftools": { - "args": { - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/pywebsocket3/src": { - "args": { - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/quic_trace/src": { - "args": { - "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=", - "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/re2/src": { - "args": { - "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=", - "rev": "c84a140c93352cdabbfb547c531be34515b12228", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ruy/src": { - "args": { - "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=", - "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/search_engines_data/resources": { - "args": { - "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=", - "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455", - "url": "https://chromium.googlesource.com/external/search_engines_data.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/securemessage/src": { - "args": { - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/skia": { - "args": { - "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=", - "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73", - "url": "https://skia.googlesource.com/skia.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/smhasher/src": { - "args": { - "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=", - "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5", - "url": "https://chromium.googlesource.com/external/smhasher.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/snappy/src": { - "args": { - "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=", - "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/speedometer/main": { - "args": { - "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=", - "rev": "c760d160caa05792d3ed7650e85861c9f9462506", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/speedometer/v2.0": { - "args": { - "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=", - "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/speedometer/v2.1": { - "args": { - "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=", - "rev": "8bf7946e39e47c875c00767177197aea5727e84a", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/speedometer/v3.0": { - "args": { - "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", - "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/speedometer/v3.1": { - "args": { - "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=", - "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/spirv-cross/src": { - "args": { - "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", - "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/spirv-headers/src": { - "args": { - "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=", - "rev": "8c88e0c4c94a21de825efccba5f99a862b049825", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/spirv-tools/src": { - "args": { - "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=", - "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/sqlite/src": { - "args": { - "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=", - "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/squirrel.mac": { - "args": { - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "args": { - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "args": { - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "fetcher": "fetchFromGitHub" - }, - "src/third_party/swiftshader": { - "args": { - "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=", - "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde", - "url": "https://swiftshader.googlesource.com/SwiftShader.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/text-fragments-polyfill/src": { - "args": { - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/tflite/src": { - "args": { - "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=", - "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/ukey2/src": { - "args": { - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-deps": { - "args": { - "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=", - "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995", - "url": "https://chromium.googlesource.com/vulkan-deps" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-headers/src": { - "args": { - "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=", - "rev": "78c359741d855213e8685278eb81bb62599f8e56", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-loader/src": { - "args": { - "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=", - "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-tools/src": { - "args": { - "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=", - "rev": "289efccc7560f2b970e2b4e0f50349da87669311", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-utility-libraries/src": { - "args": { - "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=", - "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan-validation-layers/src": { - "args": { - "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=", - "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/vulkan_memory_allocator": { - "args": { - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wasm_tts_engine/src": { - "args": { - "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=", - "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", - "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland-protocols/gtk": { - "args": { - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland-protocols/kde": { - "args": { - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland-protocols/src": { - "args": { - "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=", - "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wayland/src": { - "args": { - "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=", - "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webdriver/pylib": { - "args": { - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webgl/src": { - "args": { - "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=", - "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webgpu-cts/src": { - "args": { - "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=", - "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webpagereplay": { - "args": { - "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro=", - "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7", - "url": "https://chromium.googlesource.com/webpagereplay.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/webrtc": { - "args": { - "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=", - "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21", - "url": "https://webrtc.googlesource.com/src.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/weston/src": { - "args": { - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/wuffs/src": { - "args": { - "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", - "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/xdg-utils": { - "args": { - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/xnnpack/src": { - "args": { - "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=", - "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/third_party/zstd/src": { - "args": { - "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=", - "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" - }, - "fetcher": "fetchFromGitiles" - }, - "src/v8": { - "args": { - "hash": "sha256-lvrFWpivbaiuv6VKCX0ZGw/PurFcZjKelcnHVNS4FsQ=", - "rev": "b0a55a7dad7f536cce1f9aaddba89894c8533946", - "url": "https://chromium.googlesource.com/v8/v8.git" - }, - "fetcher": "fetchFromGitiles" - } - }, - "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk", - "modules": "135", - "node": "22.19.0", - "version": "36.9.5" - }, "37": { "chrome": "138.0.7204.251", "chromium": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde10b631cc0..23ace9a0a66b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6157,11 +6157,7 @@ with pkgs; ; electron_35 = electron_35-bin; - electron_36 = - if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_36 then - electron-source.electron_36 - else - electron_36-bin; + electron_36 = electron_36-bin; electron_37 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then electron-source.electron_37 From 8ecc467b2a492499b403924467cea6b7bc2a02a0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 4 Nov 2025 15:26:48 +0100 Subject: [PATCH 0994/2279] electron_36-bin: mark as insecure --- pkgs/development/tools/electron/binary/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 18d912514c4e..72c6fdc6f4ab 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -54,7 +54,7 @@ let ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "36.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "37.0.0") "Electron version ${version} is EOL"; }; fetcher = From 1c68856fbcb0a67e77935e1c90e8ec0ddcd69b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= Date: Thu, 1 May 2025 10:37:55 +0200 Subject: [PATCH 0995/2279] temurin-{,jre-}bin-23: drop Co-Authored-By: Leona Maroni --- .../development/compilers/openjdk/generic.nix | 2 - .../compilers/temurin-bin/generate-sources.py | 2 +- .../compilers/temurin-bin/jdk-darwin.nix | 3 - .../compilers/temurin-bin/jdk-linux.nix | 3 - .../compilers/temurin-bin/sources.json | 120 ------------------ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 3 - 7 files changed, 3 insertions(+), 132 deletions(-) diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 6196350c32c8..f40ef90c6cf3 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -78,7 +78,6 @@ temurin-bin-11, temurin-bin-17, temurin-bin-21, - temurin-bin-23, temurin-bin-25, jdk-bootstrap ? { @@ -86,7 +85,6 @@ "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11; "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17; "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21; - "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23; "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25; } .${featureVersion}, diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index d2f840632a89..0ebf923b1078 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 17, 21, 23, 25) +feature_versions = (8, 11, 17, 21, 25) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 6a97a46675dc..037f0811f3f0 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -19,9 +19,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; - jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; - jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 2ec2e35a80fc..9e40a4722ce3 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -24,9 +24,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; - jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; - jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index ba71e263bef1..88b3850ba249 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -38,22 +38,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -118,22 +102,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -266,34 +234,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "riscv64": { - "build": "7", - "sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -460,34 +400,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "riscv64": { - "build": "7", - "sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -602,22 +514,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -694,22 +590,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e4071c5bcc9..f0a4542964c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1468,7 +1468,9 @@ mapAliases { teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27 tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10 temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26 + temurin-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04 temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 + temurin-jre-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04 temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27 terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde10b631cc0..4d26dfce6ce5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4322,9 +4322,6 @@ with pkgs; temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25; temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25; - temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23; - temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23; - temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21; From aa31910413f3466a2660e7f0412ba55998adf08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= Date: Wed, 14 May 2025 09:37:12 +0200 Subject: [PATCH 0996/2279] treewide: migrate openjdk-23 -> openjdk-25 Co-Authored-By: Leona Maroni --- pkgs/by-name/cr/cratedb/package.nix | 4 ++-- pkgs/by-name/cr/cryptomator/package.nix | 4 ++-- pkgs/by-name/je/jextract/package.nix | 6 +++--- pkgs/by-name/ko/komga/package.nix | 6 +++--- pkgs/by-name/mo/moneydance/package.nix | 4 ++-- pkgs/by-name/op/openjfx/package.nix | 2 -- pkgs/by-name/re/recaf-launcher/package.nix | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix index 77158519c689..8119c0d7f7fd 100644 --- a/pkgs/by-name/cr/cratedb/package.nix +++ b/pkgs/by-name/cr/cratedb/package.nix @@ -4,13 +4,13 @@ maven, fetchFromGitHub, replaceVars, - openjdk23, + openjdk25, libarchive, makeWrapper, }: let # Wants at least Java 22 - jdk = openjdk23; + jdk = openjdk25; version = "5.9.6"; in maven.buildMavenPackage { diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index 51d690c54019..616ed7a5208a 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fuse3, glib, - jdk23, + jdk25, lib, libayatana-appindicator, makeShellWrapper, @@ -13,7 +13,7 @@ }: let - jdk = jdk23.override { enableJavaFX = true; }; + jdk = jdk25.override { enableJavaFX = true; }; in maven.buildMavenPackage rec { pname = "cryptomator"; diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix index 46ddcad2cf1c..65d264787b83 100644 --- a/pkgs/by-name/je/jextract/package.nix +++ b/pkgs/by-name/je/jextract/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeBinaryWrapper, gradle, - jdk23, + jdk25, llvmPackages, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation { gradleFlags = [ "-Pllvm_home=${lib.getLib llvmPackages.libclang}" - "-Pjdk_home=${jdk23}" + "-Pjdk_home=${jdk25}" ]; patches = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation { description = "Tool which mechanically generates Java bindings from a native library headers"; mainProgram = "jextract"; homepage = "https://github.com/openjdk/jextract"; - platforms = jdk23.meta.platforms; + platforms = jdk25.meta.platforms; license = licenses.gpl2Only; maintainers = with maintainers; [ jlesquembre diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index 3cde789aeab0..3572acb97885 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchurl, makeWrapper, - jdk23_headless, + jdk25_headless, libwebp, # Fixes https://github.com/gotson/komga/issues/1294 nixosTests, }: @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { ]; buildCommand = '' - makeWrapper ${jdk23_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \ + makeWrapper ${jdk25_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libwebp ]} ''; @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { description = "Free and open source comics/mangas server"; homepage = "https://komga.org/"; license = lib.licenses.mit; - platforms = jdk23_headless.meta.platforms; + platforms = jdk25_headless.meta.platforms; maintainers = with lib.maintainers; [ tebriel govanify diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix index b020ace87177..396dc7d007a4 100644 --- a/pkgs/by-name/mo/moneydance/package.nix +++ b/pkgs/by-name/mo/moneydance/package.nix @@ -4,12 +4,12 @@ buildPackages, fetchzip, makeWrapper, - openjdk23, + openjdk25, wrapGAppsHook3, jvmFlags ? [ ], }: let - jdk = openjdk23.override { + jdk = openjdk25.override { enableJavaFX = true; }; in diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 0b15ba7706c6..02c313c74425 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -35,13 +35,11 @@ jdk17_headless, jdk21_headless, - jdk23_headless, jdk25_headless, jdk-bootstrap ? { "17" = jdk17_headless; "21" = jdk21_headless; - "23" = jdk23_headless; "25" = jdk25_headless; } .${featureVersion}, diff --git a/pkgs/by-name/re/recaf-launcher/package.nix b/pkgs/by-name/re/recaf-launcher/package.nix index 1c869bf20cba..c828c98e2dd2 100644 --- a/pkgs/by-name/re/recaf-launcher/package.nix +++ b/pkgs/by-name/re/recaf-launcher/package.nix @@ -19,7 +19,7 @@ buildFHSEnv { p: with p; [ jar - openjdk23 + openjdk25 xorg.libX11 at-spi2-atk cairo From 058600cf06f7246e4021911fe3e459f2b72ee295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= Date: Wed, 14 May 2025 09:37:12 +0200 Subject: [PATCH 0997/2279] openjdk23{,_headless}: drop Co-Authored-By: Leona Maroni --- pkgs/development/compilers/openjdk/23/source.json | 6 ------ pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 ----- pkgs/top-level/java-packages.nix | 1 - 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/compilers/openjdk/23/source.json diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json deleted file mode 100644 index e6d7076744b6..000000000000 --- a/pkgs/development/compilers/openjdk/23/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "hash": "sha256-zlL2DV6iOfV3hgq/Ci95gTwVrhcvz5MWsg4/+O2ntE8=", - "owner": "openjdk", - "repo": "jdk23u", - "rev": "refs/tags/jdk-23.0.2+7" -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0a4542964c8..3a03a55792c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -723,6 +723,8 @@ mapAliases { jami-client = throw "'jami-client' has been renamed to/replaced by 'jami'"; # Converted to throw 2025-10-27 jami-client-qt = throw "'jami-client-qt' has been renamed to/replaced by 'jami-client'"; # Converted to throw 2025-10-27 jami-daemon = throw "'jami-daemon' has been renamed to/replaced by 'jami.daemon'"; # Converted to throw 2025-10-27 + jdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 + jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 @@ -1143,6 +1145,8 @@ mapAliases { openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27 openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27 openimageio2 = throw "'openimageio2' has been renamed to/replaced by 'openimageio'"; # Converted to throw 2025-10-27 + openjdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 + openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d26dfce6ce5..b4612fc90845 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5016,11 +5016,6 @@ with pkgs; jdk21 = openjdk21; jdk21_headless = openjdk21_headless; - openjdk23 = javaPackages.compiler.openjdk23; - openjdk23_headless = javaPackages.compiler.openjdk23.headless; - jdk23 = openjdk23; - jdk23_headless = openjdk23_headless; - openjdk25 = javaPackages.compiler.openjdk25; openjdk25_headless = javaPackages.compiler.openjdk25.headless; jdk25 = openjdk25; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index a890010cd152..873599d0e9c4 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -52,7 +52,6 @@ in openjdk11 = mkOpenjdk "11"; openjdk17 = mkOpenjdk "17"; openjdk21 = mkOpenjdk "21"; - openjdk23 = mkOpenjdk "23"; openjdk25 = mkOpenjdk "25"; # Legacy aliases From 3af1b1461b36c47e8a19ff80844ca64381868a0f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 20 May 2025 06:15:32 +0200 Subject: [PATCH 0998/2279] treewide: migrate openjfx23 -> openjfx25 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While pdfsam-basic maintainer said that they require OpenJFX 23, OpenJFX 25 works fine too. As version 23 is EOL, migrate to 25. Co-Authored-By: Galder Zamarreño --- pkgs/applications/misc/pdfsam-basic/default.nix | 2 +- pkgs/by-name/ja/jabref/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index b5c131015efb..f6b12b600ba7 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { --set PDFSAM_JAVA_PATH ${temurin-jre-bin-21} \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ - javaPackages.openjfx23 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717 + javaPackages.openjfx25 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717 xorg.libXxf86vm xorg.libXtst gtk3 diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix index e94423ed57d1..e35decacd0e8 100644 --- a/pkgs/by-name/ja/jabref/package.nix +++ b/pkgs/by-name/ja/jabref/package.nix @@ -9,14 +9,14 @@ xdg-utils, gtk3, jdk21, - openjfx23, + openjfx25, gradle_8, python3, }: let jdk = jdk21.override { enableJavaFX = true; - openjfx_jdk = openjfx23; + openjfx_jdk = openjfx25; }; # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." gradle = gradle_8; From cfafc746eaf51deb50f13b9ae9a0214e4d090d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= Date: Tue, 20 May 2025 06:15:32 +0200 Subject: [PATCH 0999/2279] openjfx23: drop --- doc/languages-frameworks/gradle.section.md | 2 +- doc/languages-frameworks/index.md | 2 +- pkgs/development/compilers/openjdk/generic.nix | 2 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/java-packages.nix | 2 +- 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md index d99fe9337ecc..37e840935689 100644 --- a/doc/languages-frameworks/gradle.section.md +++ b/doc/languages-frameworks/gradle.section.md @@ -129,7 +129,7 @@ The update script does the following: `fetchDeps` takes the following arguments: - `attrPath` - the path to the package in nixpkgs (for example, - `"javaPackages.openjfx22"`). Used for update script metadata. + `"javaPackages.openjfx25"`). Used for update script metadata. - `pname` - an alias for `attrPath` for convenience. This is what you will generally use instead of `pkg` or `attrPath`. - `pkg` - the package to be used for fetching the dependencies. Defaults diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 71269aa6c030..3f4b6c48e764 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -20,7 +20,7 @@ Each supported language or software ecosystem has its own package set named `' -I nixpkgs=channel:nixpkgs-unstable nix-repl> javaPackages. javaPackages.compiler javaPackages.openjfx15 javaPackages.openjfx21 javaPackages.recurseForDerivations - javaPackages.jogl_2_4_0 javaPackages.openjfx17 javaPackages.openjfx22 + javaPackages.jogl_2_4_0 javaPackages.openjfx17 javaPackages.openjfx25 javaPackages.mavenfod javaPackages.openjfx19 javaPackages.override javaPackages.openjfx11 javaPackages.openjfx20 javaPackages.overrideDerivation ``` diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index f40ef90c6cf3..b783cd7fbf0d 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -58,13 +58,11 @@ enableJavaFX ? false, openjfx17, openjfx21, - openjfx23, openjfx25, openjfx_jdk ? { "17" = openjfx17; "21" = openjfx21; - "23" = openjfx23; "25" = openjfx25; } .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"), diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a03a55792c6..0b203744c259 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1149,6 +1149,7 @@ mapAliases { openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 + openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04 openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04 openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30 openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4612fc90845..7079a84207ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4988,7 +4988,6 @@ with pkgs; openjfx17 = openjfx; openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; }; - openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; }; openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; }; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 873599d0e9c4..974c4d59611d 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,7 +8,7 @@ let ; in { - inherit (pkgs) openjfx17 openjfx21 openjfx23; + inherit (pkgs) openjfx17 openjfx21 openjfx25; compiler = lib.recurseIntoAttrs ( let # merge meta.platforms of both packages so that dependent packages and hydra build them From 1b2b5808e8fa29fb698443df961c7465ab4a5db5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 4 Nov 2025 08:50:30 -0600 Subject: [PATCH 1000/2279] gemstash: migrate to by-name --- pkgs/{development/tools => by-name/ge}/gemstash/Gemfile | 0 pkgs/{development/tools => by-name/ge}/gemstash/Gemfile.lock | 0 pkgs/{development/tools => by-name/ge}/gemstash/gemset.nix | 0 .../gemstash/default.nix => by-name/ge/gemstash/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{development/tools => by-name/ge}/gemstash/Gemfile (100%) rename pkgs/{development/tools => by-name/ge}/gemstash/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/ge}/gemstash/gemset.nix (100%) rename pkgs/{development/tools/gemstash/default.nix => by-name/ge/gemstash/package.nix} (100%) diff --git a/pkgs/development/tools/gemstash/Gemfile b/pkgs/by-name/ge/gemstash/Gemfile similarity index 100% rename from pkgs/development/tools/gemstash/Gemfile rename to pkgs/by-name/ge/gemstash/Gemfile diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/by-name/ge/gemstash/Gemfile.lock similarity index 100% rename from pkgs/development/tools/gemstash/Gemfile.lock rename to pkgs/by-name/ge/gemstash/Gemfile.lock diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/by-name/ge/gemstash/gemset.nix similarity index 100% rename from pkgs/development/tools/gemstash/gemset.nix rename to pkgs/by-name/ge/gemstash/gemset.nix diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/by-name/ge/gemstash/package.nix similarity index 100% rename from pkgs/development/tools/gemstash/default.nix rename to pkgs/by-name/ge/gemstash/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde10b631cc0..c7b657a874fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2736,8 +2736,6 @@ with pkgs; fluentd = callPackage ../tools/misc/fluentd { }; - gemstash = callPackage ../development/tools/gemstash { }; - lp_solve = callPackage ../applications/science/math/lp_solve { inherit (darwin) autoSignDarwinBinariesHook; }; From 02e7276eeeb54e2d9968c2373da6cfb3ac3945bf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 4 Nov 2025 08:53:41 -0600 Subject: [PATCH 1001/2279] gemstash: qualify lib attributes, hardcode pname --- pkgs/by-name/ge/gemstash/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ge/gemstash/package.nix b/pkgs/by-name/ge/gemstash/package.nix index 8256c82baa28..9d71a784750a 100644 --- a/pkgs/by-name/ge/gemstash/package.nix +++ b/pkgs/by-name/ge/gemstash/package.nix @@ -5,20 +5,22 @@ nixosTests, }: -bundlerApp rec { +bundlerApp { pname = "gemstash"; gemdir = ./.; - exes = [ pname ]; + exes = [ "gemstash" ]; passthru = { - updateScript = bundlerUpdateScript pname; + updateScript = bundlerUpdateScript "gemstash"; tests = { inherit (nixosTests) gemstash; }; }; - meta = with lib; { + meta = { description = "Cache for RubyGems.org and a private gem server"; homepage = "https://github.com/rubygems/gemstash"; - license = licenses.mit; - maintainers = [ maintainers.viraptor ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + viraptor + ]; }; } From a8d4474ae16fb2a8d562f0b718e9a43ac8b8622e Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 4 Nov 2025 16:04:03 +0100 Subject: [PATCH 1002/2279] music-assistant: add emilylange as maintainer --- pkgs/by-name/mu/music-assistant/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index c9a6459a3346..9f6589ba03cf 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -193,7 +193,10 @@ python.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/music-assistant/server"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ + hexa + emilylange + ]; mainProgram = "mass"; }; } From 6bce32090175b19164da284d78255f6a4ca11ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Nov 2025 16:22:05 +0100 Subject: [PATCH 1003/2279] level-zero: 1.24.3 -> 1.25.1 Changelog: https://github.com/oneapi-src/level-zero/blob/v1.25.2/CHANGELOG.md --- 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 83b4419136cf..c4b278362ff8 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 rec { pname = "level-zero"; - version = "1.24.3"; + version = "1.25.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${version}"; - hash = "sha256-1UwcH+7q2elpqlqafpytC+K0jTHYdyjRtUX9hpBq+EQ="; + hash = "sha256-qB88S5k+HLBSOxNo6JBSGihJnY1jUdIpJTdLwgAP6bA="; }; nativeBuildInputs = [ From b02faa01c831d50ca550169d565f7c62af59c59a Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Tue, 4 Nov 2025 09:05:11 -0800 Subject: [PATCH 1004/2279] ahk_x11: 1.0.6 -> 1.0.7 --- pkgs/by-name/ah/ahk_x11/package.nix | 4 ++-- pkgs/by-name/ah/ahk_x11/shards.nix | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ah/ahk_x11/package.nix b/pkgs/by-name/ah/ahk_x11/package.nix index c1cb30dd4c1b..d426783ec477 100644 --- a/pkgs/by-name/ah/ahk_x11/package.nix +++ b/pkgs/by-name/ah/ahk_x11/package.nix @@ -20,7 +20,7 @@ # NOTICE: AHK_X11 from this package does not support compiling scripts into portable executables. let pname = "ahk_x11"; - version = "1.0.6"; + version = "1.0.7"; inherit (xorg) libXinerama @@ -37,7 +37,7 @@ crystal.buildCrystalPackage { owner = "phil294"; repo = "AHK_X11"; tag = version; - hash = "sha256-t2fGUIG3T8azx22lFhFAkABHwkePv9uThhlH+fwDj8E="; + hash = "sha256-VuqLlRgNyF6/4aVq1sNlVjOMih0TdHXbr0CqhA4QT6Y="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ah/ahk_x11/shards.nix b/pkgs/by-name/ah/ahk_x11/shards.nix index 2961987c9413..a33b1c0d874c 100644 --- a/pkgs/by-name/ah/ahk_x11/shards.nix +++ b/pkgs/by-name/ah/ahk_x11/shards.nix @@ -1,60 +1,60 @@ { - atspi = { + "atspi" = { url = "https://github.com/phil294/atspi.cr.git"; rev = "7aec8d3604313da415e54e654c1dc6b33ae05d8d"; sha256 = "1r6k9f00a2y406hqsgq0r58zlfmg3xbzqjmfh93nwqs4m6h0shml"; }; - cron_parser = { + "cron_parser" = { url = "https://github.com/kostya/cron_parser.git"; rev = "v0.4.0"; sha256 = "17fgg2nvyx99v05l10h6cnxfr7swz8yaxhmnk4l47kg2spi8w90a"; }; - future = { + "future" = { url = "https://github.com/crystal-community/future.cr.git"; rev = "v1.0.0"; sha256 = "1mji2djkrf4vxgs432kgkzxx54ybzk636789k2vsws3sf14l74i8"; }; - gi-crystal = { + "gi-crystal" = { url = "https://github.com/hugopl/gi-crystal.git"; rev = "v0.23.0"; sha256 = "0ykb7sy62036brix12sj416h6gx85liq2kivwkh2cmf71lk02cqr"; }; - gtk3 = { + "gtk3" = { url = "https://github.com/phil294/gtk3.cr.git"; rev = "3e6cdc45c1c39d82c215b4cdf0bbb9b5598460e1"; sha256 = "0x25p85kp2f6gbsi36nyddhji7mmmqa7v4xs18bddf3kbgh72nw3"; }; - harfbuzz = { + "harfbuzz" = { url = "https://github.com/hugopl/harfbuzz.cr.git"; - rev = "v0.2.0"; - sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694"; + rev = "v0.2.1"; + sha256 = "08zx5q1mm1h4lzfr38dk8nk7mx1y955zdjl6n48rl619bc1ywdpg"; }; - notify = { + "notify" = { url = "https://github.com/phil294/notify.cr.git"; rev = "0c9880e6169e09f0db1cb40432e0b76651d15ad3"; sha256 = "1waasvhx4n817d8gqk3fza4ac4a9d71f80cfii5dbh2aqzhqf070"; }; - pango = { + "pango" = { url = "https://github.com/hugopl/pango.cr.git"; rev = "v0.3.1"; sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; }; - tasker = { + "tasker" = { url = "https://github.com/spider-gazelle/tasker.git"; rev = "v2.1.4"; sha256 = "0254sl279nrw5nz43dz5gm89ah1zrw5bvxfma81navpx5gfg9pyb"; }; - x11 = { + "x11" = { url = "https://github.com/phil294/x11-cr.git"; rev = "5a937d647d8eac29106602fcdeb161a78eb3d59d"; sha256 = "11rflkxrg1dl5c80llwan4qs47ir7w7lgqdmhy2z907kxbrfkznr"; }; - x_do = { + "x_do" = { url = "https://github.com/phil294/x_do.cr.git"; rev = "94f755a4f18a9a9820e9738b371cbe6b49731926"; sha256 = "099mrhyb8kly6isk7xr1mzxbxfm4xizmyyw2ylmlx4ywynz9iyl6"; }; - xtst = { + "xtst" = { url = "https://github.com/phil294/xtst-cr.git"; rev = "f731b708e1789d039258ecd62f7b0d1107a00b78"; sha256 = "1vhzn1ck7ifkvhw5f9kpljsa278va039wa6f3hhd8w6gr2zqvzk8"; From 7aea7e1aa97286f674c13cd98a1c1ee046da376e Mon Sep 17 00:00:00 2001 From: DSeeLP <46624152+DSeeLP@users.noreply.github.com> Date: Tue, 21 Oct 2025 19:51:40 +0200 Subject: [PATCH 1005/2279] dart.flutter_discord_rpc: add 1.1.0 --- .../dart/package-source-builders/flutter_discord_rpc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix index b4aec34f897c..513c0a44cbdf 100644 --- a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix @@ -17,6 +17,7 @@ let cargoHash = { _1_0_0 = "sha256-C9WDE9+6V59yNCNVeMUY5lRpMJ+8XWpHpxzdTmz+/Yw="; + _1_1_0 = "sha256-Kztnt30EcqjXUNEAJW65P6yLjdnyW4Q+lHe6qlCe3xM="; } .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' Unsupported version of pub 'flutter_discord_rpc': '${version}' From 3f62752e6681bcf7a6e82b947f10bcc7287d70f4 Mon Sep 17 00:00:00 2001 From: DSeeLP <46624152+DSeeLP@users.noreply.github.com> Date: Tue, 21 Oct 2025 19:51:40 +0200 Subject: [PATCH 1006/2279] finamp: 0.9.19-beta -> 0.9.20-beta https://github.com/jmshrv/finamp/releases/tag/0.9.20-beta --- pkgs/by-name/fi/finamp/package.nix | 9 +- pkgs/by-name/fi/finamp/pubspec.lock.json | 279 ++++++++++++----------- 2 files changed, 150 insertions(+), 138 deletions(-) diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 059501278184..1c99ea9ed046 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - flutter332, + flutter335, mpv-unwrapped, patchelf, fetchFromGitHub, @@ -9,16 +9,16 @@ makeDesktopItem, }: let - version = "0.9.19-beta"; + version = "0.9.20-beta"; in -flutter332.buildFlutterApplication { +flutter335.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { owner = "jmshrv"; repo = "finamp"; rev = version; - hash = "sha256-gvVKiaQ6qqMcE90B8T2FJKoViRxmIGsABmcXq+fO5hs="; + hash = "sha256-YuqYuUse6xugvc2hckZBc9kx+ryBmRQhoZzjwkpoNfo="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -36,6 +36,7 @@ flutter332.buildFlutterApplication { palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0="; split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="; flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo="; + smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A="; }; postFixup = '' diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index e5bf7270afc9..41652ff39fa4 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -34,11 +34,11 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", + "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.0" + "version": "6.4.1" }, "app_links_linux": { "dependency": "transitive", @@ -174,18 +174,18 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "c59bff0b66a6704bed8bfb09c67571df88167906e0f5543a722373b3d180a743", + "sha256": "a22acfa37aa06ba5cfe6eb7b1aa700c78af64770ff450c73dd3d279d7c37d4ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.3" + "version": "9.2.6" }, "balanced_text": { "dependency": "direct main", "description": { "path": ".", - "ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4", - "resolved-ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4", + "ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323", + "resolved-ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323", "url": "https://github.com/Komodo5197/flutter-balanced-text.git" }, "source": "git", @@ -195,11 +195,11 @@ "dependency": "direct main", "description": { "name": "battery_plus", - "sha256": "fb794c34cee2e4ea31005fb17ff15e1d904951ec7f15eedead741021870ee834", + "sha256": "ad16fcb55b7384be6b4bbc763d5e2031ac7ea62b2d9b6b661490c7b9741155bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.2" + "version": "7.0.0" }, "battery_plus_platform_interface": { "dependency": "transitive", @@ -235,11 +235,11 @@ "dependency": "transitive", "description": { "name": "build_cli_annotations", - "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "build_config": { "dependency": "transitive", @@ -305,11 +305,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62", + "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.11.0" + "version": "8.12.0" }, "characters": { "dependency": "transitive", @@ -335,11 +335,11 @@ "dependency": "direct main", "description": { "name": "chopper", - "sha256": "f366529b450d0fd91931b08339c7c1d09c746d0d20e5ffb8c8641a79b6114dc2", + "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.2.0" + "version": "8.4.0" }, "chopper_generator": { "dependency": "direct dev", @@ -375,11 +375,11 @@ "dependency": "direct main", "description": { "name": "clipboard", - "sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9", + "sha256": "1920c0337f8808be4166c5f1b236301ff381ef69633b0757c502d97f1f740102", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.3" + "version": "2.0.2" }, "clock": { "dependency": "transitive", @@ -395,11 +395,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.1" + "version": "4.11.0" }, "collection": { "dependency": "direct main", @@ -425,11 +425,11 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99", + "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "7.0.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -555,11 +555,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", + "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.5.0" + "version": "12.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -612,7 +612,7 @@ "version": "2.1.4" }, "file": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "file", "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", @@ -625,11 +625,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a", + "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.2.0" + "version": "10.3.3" }, "file_sizes": { "dependency": "direct main", @@ -651,6 +651,26 @@ "source": "hosted", "version": "1.1.1" }, + "flex_color_picker": { + "dependency": "direct main", + "description": { + "name": "flex_color_picker", + "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.7.1" + }, + "flex_seed_scheme": { + "dependency": "transitive", + "description": { + "name": "flex_seed_scheme", + "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.5.1" + }, "flutter": { "dependency": "direct main", "description": "flutter", @@ -681,31 +701,31 @@ "dependency": "direct main", "description": { "name": "flutter_discord_rpc", - "sha256": "9363a803863d56fd89c0a21639c70b126245fcbafaeb0a3d091e7ac06951d03f", + "sha256": "7ee12a3ff928e85e5e0a60c7c23417a2f1f4e604e4983fc0789ff6562fb15f2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.0" }, "flutter_gen_core": { "dependency": "transitive", "description": { "name": "flutter_gen_core", - "sha256": "eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb", + "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.11.0" + "version": "5.12.0" }, "flutter_gen_runner": { "dependency": "direct dev", "description": { "name": "flutter_gen_runner", - "sha256": "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521", + "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.11.0" + "version": "5.12.0" }, "flutter_launcher_icons": { "dependency": "direct dev", @@ -721,11 +741,11 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "6.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -737,11 +757,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", + "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.28" + "version": "2.0.30" }, "flutter_riverpod": { "dependency": "direct main", @@ -757,11 +777,11 @@ "dependency": "transitive", "description": { "name": "flutter_rust_bridge", - "sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287", + "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.11.1" }, "flutter_staggered_grid_view": { "dependency": "transitive", @@ -787,11 +807,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845", + "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "flutter_tabler_icons": { "dependency": "direct main", @@ -813,11 +833,11 @@ "dependency": "direct main", "description": { "name": "flutter_to_airplay", - "sha256": "702408986b652dfaef5ad68c6f3c3008941ae8d8ef5db526792239c8d490a16d", + "sha256": "e71e7cbdf363c3f9686625f68b14e57497b507ef72d54016c14ccdffd3e4305d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.1.0" }, "flutter_user_certificates_android": { "dependency": "direct main", @@ -880,11 +900,11 @@ "dependency": "direct main", "description": { "name": "get_it", - "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.7.0" + "version": "8.2.0" }, "glob": { "dependency": "transitive", @@ -930,21 +950,21 @@ "dependency": "direct main", "description": { "name": "hive_ce", - "sha256": "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658", + "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.3" + "version": "2.13.2" }, "hive_ce_flutter": { "dependency": "direct main", "description": { "name": "hive_ce_flutter", - "sha256": "a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909", + "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "hive_ce_generator": { "dependency": "direct dev", @@ -970,11 +990,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", + "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "http_multi_server": { "dependency": "transitive", @@ -1010,11 +1030,11 @@ "dependency": "transitive", "description": { "name": "image_size_getter", - "sha256": "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653", + "sha256": "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "infinite_scroll_pagination": { "dependency": "direct main", @@ -1142,11 +1162,11 @@ "dependency": "transitive", "description": { "name": "just_audio_platform_interface", - "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a", + "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.6.0" }, "just_audio_web": { "dependency": "transitive", @@ -1162,41 +1182,41 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.9" + "version": "11.0.2" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.9" + "version": "3.0.10" }, "leak_tracker_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "lints": { "dependency": "transitive", "description": { "name": "lints", - "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.1" + "version": "6.0.0" }, "locale_names": { "dependency": "direct main", @@ -1272,8 +1292,8 @@ "dependency": "direct main", "description": { "path": "libs/windows/media_kit_libs_windows_audio", - "ref": "475a08cc97b94702f774bc906e1472b5bddc932b", - "resolved-ref": "475a08cc97b94702f774bc906e1472b5bddc932b", + "ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811", + "resolved-ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811", "url": "https://github.com/Komodo5197/media-kit.git" }, "source": "git", @@ -1303,11 +1323,11 @@ "dependency": "direct dev", "description": { "name": "msix", - "sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f", + "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.9" + "version": "3.16.12" }, "nested": { "dependency": "transitive", @@ -1353,21 +1373,21 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.0" + "version": "9.0.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "palette_generator": { "dependency": "direct main", @@ -1414,21 +1434,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.18" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1524,11 +1544,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -1554,11 +1574,11 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" }, "posix": { "dependency": "transitive", @@ -1584,11 +1604,11 @@ "dependency": "direct main", "description": { "name": "provider", - "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.5" + "version": "6.1.5+1" }, "pub_semver": { "dependency": "transitive", @@ -1614,21 +1634,11 @@ "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "42a7ca80f965786d8d0730633b7cf05c132ebcb9558e04dbc8752f2865caa705", + "sha256": "23e435223d985630e3880fd667128f520237059ca3af0cc2dc029d5365ce9ec1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.9" - }, - "recursive_regex": { - "dependency": "transitive", - "description": { - "name": "recursive_regex", - "sha256": "f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" + "version": "1.5.6" }, "riverpod": { "dependency": "transitive", @@ -1764,21 +1774,21 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", + "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.4" + "version": "12.0.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "6.1.0" }, "shared_preferences": { "dependency": "direct main", @@ -1794,11 +1804,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.13" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1899,12 +1909,13 @@ "smtc_windows": { "dependency": "direct main", "description": { - "name": "smtc_windows", - "sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154", - "url": "https://pub.dev" + "path": "packages/smtc_windows", + "ref": "7ece49cc16a459aaa0718ed23458802533daef37", + "resolved-ref": "7ece49cc16a459aaa0718ed23458802533daef37", + "url": "https://github.com/Komodo5197/frb_plugins.git" }, - "source": "hosted", - "version": "1.0.0" + "source": "git", + "version": "1.1.0" }, "source_gen": { "dependency": "direct main", @@ -1920,11 +1931,11 @@ "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1", + "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "source_span": { "dependency": "transitive", @@ -1971,21 +1982,21 @@ "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2+2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "sqflite_darwin": { "dependency": "transitive", @@ -2081,11 +2092,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.6" }, "time": { "dependency": "transitive", @@ -2171,21 +2182,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.16" + "version": "6.3.22" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.4" }, "url_launcher_linux": { "dependency": "transitive", @@ -2201,11 +2212,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.3" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2281,21 +2292,21 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", + "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.17" + "version": "1.1.19" }, "vector_math": { "dependency": "transitive", "description": { "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "visibility_detector": { "dependency": "direct main", @@ -2311,41 +2322,41 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.2" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678", + "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207", + "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" + "version": "1.3.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a", + "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "weak_map": { "dependency": "transitive", @@ -2411,11 +2422,11 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.3" + "version": "0.5.1" }, "xdg_directories": { "dependency": "transitive", @@ -2431,11 +2442,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" }, "xxh3": { "dependency": "transitive", @@ -2469,7 +2480,7 @@ } }, "sdks": { - "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.32.0" + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" } } From df88f4baacc88de547e60ea400301b87b586cffd Mon Sep 17 00:00:00 2001 From: Oskar <115482671+oskarwires@users.noreply.github.com> Date: Tue, 4 Nov 2025 14:15:06 +0000 Subject: [PATCH 1007/2279] maintainers: add oskarwires --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/python-modules/cocotb-bus/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3d52144b7468..3763d7df1b4f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19554,6 +19554,12 @@ githubId = 52569953; name = "Oskar Manhart"; }; + oskarwires = { + email = "me@usbcable.io"; + github = "oskarwires"; + githubId = 115482671; + name = "Oskar"; + }; osnyx = { email = "os@flyingcircus.io"; github = "osnyx"; diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix index 6e10559b3510..cfd90eb089b6 100644 --- a/pkgs/development/python-modules/cocotb-bus/default.nix +++ b/pkgs/development/python-modules/cocotb-bus/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Pre-packaged testbenching tools and reusable bus interfaces for cocotb"; homepage = "https://github.com/cocotb/cocotb-bus"; license = licenses.bsd3; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ oskarwires ]; }; } From 0c1da552f30d2a8640febfa1a31f7f6ed9b7147e Mon Sep 17 00:00:00 2001 From: Oskar <115482671+oskarwires@users.noreply.github.com> Date: Mon, 3 Nov 2025 13:16:55 +0000 Subject: [PATCH 1008/2279] python3Packages.cocotb-bus: 0.2.1 -> unstable-2025-11-03 --- .../python-modules/cocotb-bus/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix index cfd90eb089b6..c817ebc5a3f2 100644 --- a/pkgs/development/python-modules/cocotb-bus/default.nix +++ b/pkgs/development/python-modules/cocotb-bus/default.nix @@ -1,24 +1,21 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, }: -buildPythonPackage rec { +buildPythonPackage { pname = "cocotb-bus"; - version = "0.2.1"; + version = "unstable-2025-11-03"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "a197aa4b0e0ad28469c8877b41b3fb2ec0206da9f491b9276d1578ce6dd8aa8d"; + src = fetchFromGitHub { + owner = "cocotb"; + repo = "cocotb-bus"; + rev = "f72b989bde036e677d5e9ebab3a6a21bdfe43d09"; + hash = "sha256-4j63kOjBd+iLA2EYqLTM0oKzKksOjH2UqNgDNFvWgYw="; }; - postPatch = '' - # remove circular dependency cocotb from setup.py - substituteInPlace setup.py --replace '"cocotb>=1.5.0.dev,<2.0"' "" - ''; - # tests require cocotb, disable for now to avoid circular dependency doCheck = false; From 5664a353a596bf8fab1064918a2b527b40ebd73f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 17:28:02 +0000 Subject: [PATCH 1009/2279] isle-portable: 0-unstable-2025-10-18 -> 0-unstable-2025-11-03 --- pkgs/by-name/is/isle-portable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix index 82349c4ab717..390eb09089a1 100644 --- a/pkgs/by-name/is/isle-portable/package.nix +++ b/pkgs/by-name/is/isle-portable/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; name = "isle-portable"; - version = "0-unstable-2025-10-18"; + version = "0-unstable-2025-11-03"; src = fetchFromGitHub { owner = "isledecomp"; repo = "isle-portable"; - rev = "b06f05ccf908e208bf8d139ac8adee0e6905803d"; - hash = "sha256-VOfUK2kiTEQdkhO2cVyec3nJ5V3dbqFG0HPr6dOTVMs="; + rev = "d6aaa6b9daf3dd2a858ec127bbb14099bb3886b4"; + hash = "sha256-azNB3oVQl4yxr4LG0NUY8XomWphlizpf6bqmfcrMqsw="; fetchSubmodules = true; }; From 752d772b858f8385cc538880823631a1950be911 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Nov 2025 18:45:33 +0100 Subject: [PATCH 1010/2279] =?UTF-8?q?ocamlPackages.qcheck:=200.25=20?= =?UTF-8?q?=E2=86=92=200.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/containers/default.nix | 20 ++++++++++++------- .../ocaml-modules/qcheck/alcotest.nix | 2 +- .../development/ocaml-modules/qcheck/core.nix | 16 ++++++++------- .../ocaml-modules/qcheck/ounit.nix | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index c5888c737a5a..279c35c1da00 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, + fetchpatch, buildDunePackage, - ocaml, dune-configurator, either, seq, @@ -13,19 +13,25 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "3.16"; pname = "containers"; - minimalOCamlVersion = "4.08"; - src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-WaHAZRLjaEJUba/I2r3Yof/iUqA3PFUuVbzm88izG1k="; }; + patches = [ + # Compatibility with qcheck ≥ 0.26 + (fetchpatch { + url = "https://github.com/c-cube/ocaml-containers/commit/3b49ad2a4e8cfe366d0588e1940d626f0e1b8a2d.patch"; + hash = "sha256-LFe+LtpBBrf82SX57b4iQSvfd9tSXmnfhffjvjcfLpg="; + }) + ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ either @@ -40,7 +46,7 @@ buildDunePackage rec { yojson ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { homepage = "https://github.com/c-cube/ocaml-containers"; @@ -57,4 +63,4 @@ buildDunePackage rec { ''; license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix index e5a6d52cc45c..747844174afa 100644 --- a/pkgs/development/ocaml-modules/qcheck/alcotest.nix +++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "qcheck-alcotest"; - inherit (qcheck-core) version src patches; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index bfa2cffdc4c2..f80eff860259 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,21 +2,23 @@ lib, buildDunePackage, fetchFromGitHub, + alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "qcheck-core"; - version = "0.25"; - - minimalOCamlVersion = "4.08"; + version = "0.27"; src = fetchFromGitHub { owner = "c-cube"; repo = "qcheck"; - tag = "v${version}"; - hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UfBfFVSvDeVPUakj2GQCRy5G5IZBxrgdceYtj+VAYbg="; }; + doCheck = true; + checkInputs = [ alcotest ]; + meta = { description = "Core qcheck library"; homepage = "https://c-cube.github.io/qcheck/"; @@ -24,4 +26,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix index 31c24ab1f7fe..9bc98e3ec24b 100644 --- a/pkgs/development/ocaml-modules/qcheck/ounit.nix +++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "qcheck-ounit"; - inherit (qcheck-core) version src patches; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core From a42a3d6da3375a61e6e42c24f6454f55a4d7fffb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 18:43:42 +0000 Subject: [PATCH 1011/2279] usort: 1.0.8 -> 1.1.0 --- pkgs/development/python-modules/usort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 3c522d4f7f8f..1e3dcaea1b3d 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "usort"; - version = "1.0.8"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "facebook"; repo = "usort"; tag = "v${version}"; - hash = "sha256-iezq2K+Rw0djyOoFm7tguw/vkkDSyrPZIfZPmaZvFpM="; + hash = "sha256-QnhpnuEt6j/QPmX29A0523QDh4o2QfaCoDI0YJpTc8Y="; }; nativeBuildInputs = [ From 114da65b1b0f6fa0ff43ec373e18d4badff22576 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 4 Nov 2025 19:48:41 +0100 Subject: [PATCH 1012/2279] element-desktop: 1.12.2 -> 1.12.3 Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.3 Full changelog: https://github.com/element-hq/element-desktop/compare/v1.12.2...v1.12.3 --- pkgs/by-name/el/element-desktop/element-desktop-pin.nix | 6 +++--- pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index c3c1b7005e3c..a5034a0f1ae1 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.2"; + "version" = "1.12.3"; "hashes" = { - "desktopSrcHash" = "sha256-P/pQpI3kyWGGZo1CK0nnkcg52jlVMrhGh8EFWWn0Euc="; - "desktopYarnHash" = "sha256-M6vz2u7MQuMW1ag3aJW6s2RI6rU6RC2aFEvVvKwtwaA="; + "desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8="; + "desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM="; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 0230c5e0b02b..f3f416350178 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.2"; + "version" = "1.12.3"; "hashes" = { - "webSrcHash" = "sha256-f81axhmX3KRSzlvi7cST/QfmOySkLhTcDTlnpTETQ6c="; - "webYarnHash" = "sha256-NvFpyopXQ/ZI96f2kFN6tud4JkdBONgobkr9u9Rk4z4="; + "webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A="; + "webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k="; }; } From 02b355acd2a813b00ddfb496ab6c872392fbdc81 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Tue, 4 Nov 2025 19:09:55 +0000 Subject: [PATCH 1013/2279] haskellPackages.proto3-suite: fix build --- .../haskell-modules/configuration-common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2037e2a07b9c..d31e2e788679 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2979,9 +2979,19 @@ with haskellLib; # 2024-07-27: building test component requires non-trivial custom build steps # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311 + # Hackage release trails a good deal behind master proto3-suite = lib.pipe super.proto3-suite [ - dontCheck # Hackage release trails a good deal behind master + dontCheck doJailbreak + (overrideSrc { + version = "0.9.0-unstable-2025-04-10"; + src = pkgs.fetchFromGitHub { + owner = "awakesecurity"; + repo = "proto3-suite"; + rev = "24bb3f9c6c83b4ecc31783fa5a8fa4406e6ef0d8"; + hash = "sha256-009UNd1rEg/wDCCxReQWhPwHaONwlB6l6qoIPR0mVBU="; + }; + }) ]; # Tests require docker From 084cc106361001fc0afb625a362e71e10befc6d2 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 4 Nov 2025 14:14:16 -0500 Subject: [PATCH 1014/2279] react-static: drop In "maintainance mode", but hasn't seen patches for 3 years and does not appear to be maintained anymore. --- pkgs/by-name/re/react-static/package.json | 154 --------------------- pkgs/by-name/re/react-static/package.nix | 56 -------- pkgs/development/node-packages/aliases.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 4 files changed, 2 insertions(+), 211 deletions(-) delete mode 100644 pkgs/by-name/re/react-static/package.json delete mode 100644 pkgs/by-name/re/react-static/package.nix diff --git a/pkgs/by-name/re/react-static/package.json b/pkgs/by-name/re/react-static/package.json deleted file mode 100644 index 70b873277fd2..000000000000 --- a/pkgs/by-name/re/react-static/package.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "react-static", - "description": "A progressive static site generator for React", - "version": "7.6.2", - "license": "MIT", - "repository": "https://github.com/react-static/react-static", - "main": "lib/index.js", - "types": "src/index.d.ts", - "engines": { - "node": ">=8.9.0" - }, - "bin": { - "react-static": "./bin/react-static" - }, - "scripts": { - "prebuild": "rimraf lib", - "build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\" --source-maps inline", - "watch": "yarn build --watch", - "watch:link": "onchange './lib/**/*' -- yalc push --changed", - "start": "yarn watch", - "test": "yarn format && yarn lint && yarn unitTest", - "lint": "eslint src", - "format": "prettier README.md {src,templates/*/src}/**/*.js --write", - "unitTest": "cross-env NODE_ENV=test yarn jest ./src", - "unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch", - "preversion": "yarn build && yarn test", - "publishLink": "echo '{{event}} to {{changed}}' && yalc publish" - }, - "peerDependencies": { - "react": "^16.9.0", - "react-dom": "^16.9.0", - "react-hot-loader": "^4.12.11" - }, - "dependencies": { - "@babel/cli": "^7.5.5", - "@babel/core": "^7.5.5", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/plugin-proposal-export-default-from": "^7.5.2", - "@babel/plugin-proposal-optional-chaining": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.5.0", - "@babel/plugin-transform-modules-commonjs": "^7.5.0", - "@babel/plugin-transform-runtime": "^7.5.5", - "@babel/preset-env": "^7.5.5", - "@babel/preset-react": "^7.0.0", - "@babel/preset-stage-0": "^7.0.0", - "@babel/register": "^7.5.5", - "@babel/runtime": "^7.5.5", - "@reach/router": "^1.3.1", - "autoprefixer": "^9.7.4", - "axios": "^0.21.1", - "babel-core": "7.0.0-bridge.0", - "babel-loader": "^8.0.6", - "babel-plugin-macros": "^2.6.1", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "babel-plugin-universal-import": "^4.0.0", - "case-sensitive-paths-webpack-plugin": "^2.2.0", - "chalk": "^2.4.2", - "chokidar": "^3.0.2", - "circular-dependency-plugin": "^5.2.0", - "cors": "^2.8.5", - "css-loader": "^2.1.1", - "download-git-repo": "^2.0.0", - "extract-css-chunks-webpack-plugin": "^4.6.0", - "file-loader": "3.0.1", - "fs-extra": "^7.0.1", - "git-promise": "^1.0.0", - "glob": "^7.1.4", - "gunzip-maybe": "^1.4.1", - "html-webpack-plugin": "^3.2.0", - "inquirer": "^6.5.1", - "inquirer-autocomplete-prompt": "^1.0.1", - "intersection-observer": "^0.7.0", - "jsesc": "^2.5.2", - "match-sorter": "^3.1.1", - "minimist": "^1.2.0", - "mutation-observer": "^1.0.3", - "optimize-css-assets-webpack-plugin": "^5.0.3", - "portfinder": "^1.0.21", - "postcss-flexbugs-fixes": "^4.1.0", - "postcss-loader": "^3.0.0", - "pretty-error": "^2.1.1", - "progress": "^2.0.3", - "prop-types": "^15.7.2", - "raf": "^3.4.1", - "raw-loader": "^3.1.0", - "react-helmet": "^6.1.0", - "react-universal-component": "^4.0.0", - "resolve-from": "^5.0.0", - "serve": "^11.1.0", - "shorthash": "^0.0.2", - "slash": "^2.0.0", - "socket.io": "^2.2.0", - "socket.io-client": "^2.2.0", - "style-loader": "0.23.1", - "swimmer": "^1.4.0", - "tar-fs": "^2.0.0", - "terser-webpack-plugin": "^1.4.1", - "upath": "^1.1.2", - "url-loader": "^2.1.0", - "webpack": "^4.39.2", - "webpack-bundle-analyzer": "^3.4.1", - "webpack-dev-server": "^3.8.0", - "webpack-flush-chunks": "^2.0.3", - "webpack-node-externals": "^1.7.2" - }, - "devDependencies": { - "@types/react": "^16.9.1", - "@types/react-helmet": "^6.1.0", - "babel-jest": "^24.8.0", - "cors": "^2.8.5", - "cross-env": "^5.2.0", - "enzyme": "^3.10.0", - "enzyme-adapter-react-16": "^1.14.0", - "enzyme-to-json": "^3.4.0", - "eslint": "^6.1.0", - "eslint-config-prettier": "^6.0.0", - "eslint-config-react-tools": "^1.1.7", - "eslint-plugin-babel": "^5.3.0", - "eslint-plugin-import": "^2.18.2", - "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-react": "^7.14.3", - "express": "^4.17.1", - "husky": "^3.0.3", - "jest": "^24.8.0", - "lerna": "^3.16.4", - "onchange": "^6.0.0", - "prettier": "1.18.2", - "react": "^16.9.0", - "react-dev-utils": "^9.0.3", - "react-dom": "^16.9.0", - "react-hot-loader": "^4.12.11", - "rimraf": "^2.7.0", - "webpack-hot-middleware": "^2.25.0" - }, - "jest": { - "verbose": true, - "moduleDirectories": [ - "node_modules", - "src" - ], - "testRegex": "(/__tests__/.*\\.(test))\\.jsx?$", - "moduleNameMapper": { - "static.config.js$": "/src/static/__mocks__/static.config.js.mock.js" - }, - "setupFiles": [ - "/setupTests.js" - ], - "snapshotSerializers": [ - "enzyme-to-json/serializer" - ] - }, - "gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a" -} diff --git a/pkgs/by-name/re/react-static/package.nix b/pkgs/by-name/re/react-static/package.nix deleted file mode 100644 index bf10eeb9494f..000000000000 --- a/pkgs/by-name/re/react-static/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - mkYarnPackage, - fetchFromGitHub, - fetchYarnDeps, -}: - -mkYarnPackage rec { - pname = "react-static"; - version = "7.6.2"; - - src = fetchFromGitHub { - owner = "react-static"; - repo = "react-static"; - rev = "v${version}"; - hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs="; - }; - - packageJSON = ./package.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8="; - }; - - buildPhase = '' - runHook preBuild - - yarn --cwd deps/react-static/packages/react-static --offline build - - runHook postBuild - ''; - - doDist = false; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/lib/node_modules" - mv deps/react-static/packages/react-static "$out/lib/node_modules" - mv node_modules "$out/lib/node_modules/react-static" - - ln -s "$out/lib/node_modules/react-static/bin" "$out" - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md"; - description = "Progressive static site generator for React"; - homepage = "https://github.com/react-static/react-static"; - license = lib.licenses.mit; - mainProgram = "react-static"; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ede344e09c7d..e51f5a22c7a5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -192,7 +192,7 @@ mapAliases { inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25 - inherit (pkgs) react-static; # added 2023-08-21 + react-static = throw "'react-static has been removed because of a lack of upstream maintainance"; # Converted to throw 2025-11-04 react-tools = throw "react-tools was removed because it was deprecated"; # added 2023-09-25 readability-cli = pkgs.readability-cli; # Added 2023-06-12 inherit (pkgs) redoc-cli; # added 2023-09-12 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 111f184b70b1..6aba9955548b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1302,6 +1302,7 @@ mapAliases { railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27 rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27 + react-static = throw "'react-static' has been removed due to lack of maintainance upstream"; # Added 2025-11-04 recurseIntoAttrs = warnAlias "'recurseIntoAttrs' has been removed from pkgs, use `lib.recurseIntoAttrs` instead" lib.recurseIntoAttrs; # Added 2025-10-30 redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16 redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01 From badad8308587fdd97bdd5686be8e66ffe7d4c8c8 Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 4 Nov 2025 20:25:47 +0100 Subject: [PATCH 1015/2279] catch2_3: fix pkgsLLVM checkPhase --- pkgs/by-name/ca/catch2_3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix index 5afa01a642f5..586fa9f3d9ed 100644 --- a/pkgs/by-name/ca/catch2_3/package.nix +++ b/pkgs/by-name/ca/catch2_3/package.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" "-DCATCH_ENABLE_WERROR=OFF" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [ + ++ lib.optionals (stdenv.cc.isClang && doCheck) [ # test has a faulty path normalization technique that won't work in - # our darwin build environment https://github.com/catchorg/Catch2/issues/1691 + # our darwin/LLVM build environment https://github.com/catchorg/Catch2/issues/1691 "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; From 5d1597fb5a041a8f3a25a6bf41e7c151b5f0e27b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 4 Nov 2025 20:31:18 +0100 Subject: [PATCH 1016/2279] buildMozillaMach: fix build for firefox 145 or later --- pkgs/build-support/build-mozilla-mach/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 610bd353568a..8b00b6211c0e 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -98,6 +98,7 @@ in # Darwin apple-sdk_14, apple-sdk_15, + apple-sdk_26, cups, rsync, # used when preparing .app directory @@ -330,7 +331,7 @@ buildStdenv.mkDerivation { ++ lib.optionals ( - lib.versionAtLeast version "141.0.2" + (lib.versionAtLeast version "141.0.2" && lib.versionOlder version "145.0") || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0") ) [ @@ -466,6 +467,7 @@ buildStdenv.mkDerivation { ( stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "143" + && lib.versionOlder version "145" && lib.versionOlder apple-sdk_15.version "15.4" ) '' @@ -556,7 +558,14 @@ buildStdenv.mkDerivation { zip ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14) + ( + if lib.versionAtLeast version "145" then + apple-sdk_26 + else if lib.versionAtLeast version "138" then + apple-sdk_15 + else + apple-sdk_14 + ) cups ] ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) ( From 02affb31581f17f93b96529577df0deeaea7cf9d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 4 Nov 2025 19:20:43 +0000 Subject: [PATCH 1017/2279] firefox-devedition-unwrapped: 144.0b9 -> 145.0b9 --- .../browsers/firefox/packages/firefox-devedition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 5a5bf633bd9a..c65b04e5ac36 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "144.0b9"; + version = "145.0b9"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247"; + sha512 = "36000021b8f30eb5e80ce3b2e4ae05499e8b8cbdec93ba97dfb9c8f107cbe80202a13c4923491c01c8c245fc1810bb6fc82a46a06817ab7e70a47c04385b306e"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but From 21ae3a47de0f15745c757abc8dfe3602214567a9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 4 Nov 2025 19:21:04 +0000 Subject: [PATCH 1018/2279] firefox-beta-unwrapped: 144.0b9 -> 145.0b9 --- .../networking/browsers/firefox/packages/firefox-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 86b09c0b85a4..3bfbca592ae1 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "144.0b9"; + version = "145.0b9"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7"; + sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769"; }; meta = { From 4d63ecabd35c4e2fbcc1f7b9d89917e22f2ea45b Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 4 Nov 2025 17:42:44 +0100 Subject: [PATCH 1019/2279] linuxPackages.shufflecake: use wrapped gcc compiler --- pkgs/os-specific/linux/shufflecake/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 6871364183b5..f8bda2bcfd5b 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -23,12 +23,16 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt lvm2 ]; - makeFlags = kernelModuleMakeFlags ++ [ - "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ]; - - # GCC 14 makes this an error by default, remove when fixed upstream - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + makeFlags = + kernelModuleMakeFlags + ++ [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ] + # Use wrapped gcc compiler since the unwrapped one fails to find the + # headers. + ++ lib.optionals stdenv.cc.isGNU [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; outputs = [ "out" From 1376730c663089c3f62071fd666f61362da183e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Nov 2025 21:48:57 +0100 Subject: [PATCH 1020/2279] akkuPackages: do not define meta.{description,homepage} to empty strings --- .../tools/package-management/akku/default.nix | 98 ++++++++++--------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix index 882db169d2bf..724d1dfd92a9 100644 --- a/pkgs/tools/package-management/akku/default.nix +++ b/pkgs/tools/package-management/akku/default.nix @@ -20,8 +20,8 @@ lib.makeScope newScope (self: rec { url, sha256, source, - synopsis ? "", - homepage ? "", + synopsis ? null, + homepage ? null, ... }: (akkuDerivation { @@ -35,50 +35,56 @@ lib.makeScope newScope (self: rec { nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies; unpackPhase = "tar xf $src"; - meta.homepage = homepage; - meta.description = synopsis; - meta.license = - let - stringToLicense = - s: - ( - lib.licenses - // (with lib.licenses; { - "0bsd" = bsd0; - "agpl" = agpl3Only; - "apache-2.0" = asl20; - "artistic" = artistic2; - "bsd" = bsd3; - "bsd-1-clause" = bsd1; - "bsd-2-clause" = bsd2; - "bsd-3-clause" = bsd3; - "cc0-1.0" = cc0; - "gpl" = gpl3Only; - "gpl-2" = gpl2Only; - "gpl-2.0-or-later" = gpl2Plus; - "gplv2" = gpl2Only; - "gpl-3" = gpl3Only; - "gpl-3.0" = gpl3Only; - "gpl-3.0-or-later" = gpl3Plus; - "gplv3" = gpl3Only; - "lgpl" = lgpl3Only; - "lgpl-2" = lgpl2Only; - "lgpl-2.0+" = lgpl2Plus; - "lgpl-2.1" = lgpl21Only; - "lgpl-2.1-or-later" = lgpl21Plus; - "lgpl-3.0-or-later" = lgpl3Plus; - "lgpl-3" = lgpl3Only; - "lgplv3" = lgpl3Only; - "public-domain" = publicDomain; - "srfi" = bsd3; - "unicode" = ucd; - "xerox" = xerox; - "zlib-acknowledgement" = zlib; - "noassertion" = free; - }) - ).${s} or s; - in - if builtins.isList license then map stringToLicense license else stringToLicense license; + meta = { + license = + let + stringToLicense = + s: + ( + lib.licenses + // (with lib.licenses; { + "0bsd" = bsd0; + "agpl" = agpl3Only; + "apache-2.0" = asl20; + "artistic" = artistic2; + "bsd" = bsd3; + "bsd-1-clause" = bsd1; + "bsd-2-clause" = bsd2; + "bsd-3-clause" = bsd3; + "cc0-1.0" = cc0; + "gpl" = gpl3Only; + "gpl-2" = gpl2Only; + "gpl-2.0-or-later" = gpl2Plus; + "gplv2" = gpl2Only; + "gpl-3" = gpl3Only; + "gpl-3.0" = gpl3Only; + "gpl-3.0-or-later" = gpl3Plus; + "gplv3" = gpl3Only; + "lgpl" = lgpl3Only; + "lgpl-2" = lgpl2Only; + "lgpl-2.0+" = lgpl2Plus; + "lgpl-2.1" = lgpl21Only; + "lgpl-2.1-or-later" = lgpl21Plus; + "lgpl-3.0-or-later" = lgpl3Plus; + "lgpl-3" = lgpl3Only; + "lgplv3" = lgpl3Only; + "public-domain" = publicDomain; + "srfi" = bsd3; + "unicode" = ucd; + "xerox" = xerox; + "zlib-acknowledgement" = zlib; + "noassertion" = free; + }) + ).${s} or s; + in + if builtins.isList license then map stringToLicense license else stringToLicense license; + } + // lib.optionalAttrs (homepage != null) { + inherit homepage; + } + // lib.optionalAttrs (synopsis != null) { + description = synopsis; + }; }).overrideAttrs ({ "${pname}" = lib.id; } // overrides)."${pname}"; deps = lib.importTOML ./deps.toml; From 0416c521c9e3201792b5a0916375cdfc3055a6e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Nov 2025 21:14:02 +0000 Subject: [PATCH 1021/2279] kiro: 0.4.0 -> 0.5.9 --- pkgs/by-name/ki/kiro/package.nix | 2 +- pkgs/by-name/ki/kiro/sources.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index d186b24ecdd4..98f94898129e 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -15,7 +15,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.4.0"; + version = "0.5.9"; pname = "kiro"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index b58ceb2c1e24..9bd3bc43de19 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,14 +1,14 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/202510142329--distro-linux-x64-tar-gz/202510142329-distro-linux-x64.tar.gz", - "hash": "sha256-Pi96jAd2qZNCk/LSv9f5n08VzOS3WwaW+eI+8PIwM9I=" + "url": "https://prod.download.desktop.kiro.dev/releases/202511032205--distro-linux-x64-tar-gz/202511032205-distro-linux-x64.tar.gz", + "hash": "sha256-Xm7uRogux3bQMsWjdaamrHELnxNltRmjPLM8Mgt5+5Y=" }, "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-x64.dmg", - "hash": "sha256-wjUyT9KF3Tg5M6Ad01sxhZlin1WySF0Tci1dAPlvh04=" + "url": "https://prod.download.desktop.kiro.dev/releases/202511032205-Kiro-dmg-darwin-x64.dmg", + "hash": "sha256-oJ5Xr/wJQIX3R5cLnBCv1kpULLy3ljW53LGqw4zYY5c=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-arm64.dmg", - "hash": "sha256-Bsul3QLJ9qbDPBnhUu7Stk4wz1yJkYk9eMrtUyQ4rbU=" + "url": "https://prod.download.desktop.kiro.dev/releases/202511032205-Kiro-dmg-darwin-arm64.dmg", + "hash": "sha256-dtc/Wfs8GzVPHny58MDRFSr9gG0hwdZC5qz5uIJh6N4=" } } From 5be3ff47f516b48bbf93262d2820f34c4f7dc2e3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 4 Nov 2025 21:30:46 +0000 Subject: [PATCH 1022/2279] dmsdos: fix `cmake-4` fix Without the change the build fails on `master` as https://hydra.nixos.org/build/310538691: CMake Error at CMakeLists.txt:2 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. ZHF: #457852 --- pkgs/by-name/dm/dmsdos/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/dm/dmsdos/package.nix b/pkgs/by-name/dm/dmsdos/package.nix index 44b7bb9bdad5..0b6fa637d30e 100644 --- a/pkgs/by-name/dm/dmsdos/package.nix +++ b/pkgs/by-name/dm/dmsdos/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, }: @@ -16,6 +17,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oGVkDf1gFaSMRpvHq4GNLN8htBm/sYawZeVwiqQxjL8="; }; + patches = [ + # cmake-4 support: + # https://github.com/sandsmark/dmsdos/pull/1 + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/sandsmark/dmsdos/commit/94076ab27800e9cba41ab05e6bb2edbb421154d9.patch"; + hash = "sha256-olpnzPg/kbveUl0muwHKwI+DMGqXzxLrruFomf/SXjE="; + }) + ]; + nativeBuildInputs = [ cmake ]; From c083f0e3eb2a32c8463bdcca36c592db68cf700e Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 4 Nov 2025 22:38:56 +0100 Subject: [PATCH 1023/2279] linuxPackages.linux-gpib: 4.3.6 -> 4.3.7 --- pkgs/applications/science/electronics/linux-gpib/common.nix | 4 ++-- pkgs/applications/science/electronics/linux-gpib/kernel.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/linux-gpib/common.nix b/pkgs/applications/science/electronics/linux-gpib/common.nix index e121c6c005f0..1e47424cce1f 100644 --- a/pkgs/applications/science/electronics/linux-gpib/common.nix +++ b/pkgs/applications/science/electronics/linux-gpib/common.nix @@ -4,12 +4,12 @@ lib, }: rec { - version = "4.3.6"; + version = "4.3.7"; inherit pname; src = fetchurl { url = "mirror://sourceforge/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/${version}/linux-gpib-${version}.tar.gz"; - hash = "sha256-Gze4xrvkhEgn+J5Jhrycezjp2uhlD1v6aX0WGv4J2Jg="; + hash = "sha256-s/+BJgaGXIW1iwEqQhim/juC0XfIwKvHlcsi20HzrWg="; }; unpackPhase = '' diff --git a/pkgs/applications/science/electronics/linux-gpib/kernel.nix b/pkgs/applications/science/electronics/linux-gpib/kernel.nix index 49d280757d14..9529f2ee1713 100644 --- a/pkgs/applications/science/electronics/linux-gpib/kernel.nix +++ b/pkgs/applications/science/electronics/linux-gpib/kernel.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation ( makeFlags = [ "LINUX_SRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "LINUX_SSRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" ]; installFlags = [ From 2467e9335635a8efa0ffad47f58e3939028a6128 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 4 Nov 2025 22:53:08 +0100 Subject: [PATCH 1024/2279] linuxPackages.shufflecake: 0.5.2 -> 0.5.5 --- pkgs/os-specific/linux/shufflecake/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index f8bda2bcfd5b..c087b0c55382 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -9,13 +9,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "shufflecake"; - version = "0.5.2"; + version = "0.5.5"; + src = fetchFromGitea { domain = "codeberg.org"; owner = "shufflecake"; repo = "shufflecake-c"; rev = "v${finalAttrs.version}"; - hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s="; + hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -44,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: { install -Dm555 shufflecake $bin/shufflecake ''; - meta = with lib; { + meta = { description = "Plausible deniability (hidden storage) layer for Linux"; homepage = "https://shufflecake.net"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ oluceps ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ oluceps ]; outputsToInstall = [ "bin" ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; broken = kernel.kernelOlder "6.1" || kernel.meta.name == "linux-lqx-6.12.1"; }; }) From 3106949fd710b35d3e89e3def45913f1441394a1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 1 Oct 2025 22:45:49 +0200 Subject: [PATCH 1025/2279] lib/types: add externalPath --- lib/tests/modules.sh | 9 +++++++++ lib/tests/modules/types.nix | 8 ++++++++ lib/types.nix | 5 +++++ .../manual/development/option-types.section.md | 15 +++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 093196da16c5..505c1c5a5fe4 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -223,6 +223,15 @@ checkConfigError 'A definition for option .* is not of type .path in the Nix sto checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix +# types.externalPath +checkConfigOutput '".*/foo/bar"' config.externalPath.ok1 ./types.nix +checkConfigOutput '".*/"' config.externalPath.ok2 ./types.nix +checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad1 ./types.nix +checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad2 ./types.nix +checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad3 ./types.nix +checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad4 ./types.nix +checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad5 ./types.nix + # types.fileset checkConfigOutput '^0$' config.filesetCardinal.ok1 ./fileset.nix checkConfigOutput '^1$' config.filesetCardinal.ok2 ./fileset.nix diff --git a/lib/tests/modules/types.nix b/lib/tests/modules/types.nix index 3127ece89e49..0a566ea960c4 100644 --- a/lib/tests/modules/types.nix +++ b/lib/tests/modules/types.nix @@ -15,6 +15,7 @@ in { options = { pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; }; + externalPath = mkOption { type = types.lazyAttrsOf types.externalPath; }; assertions = mkOption { }; }; config = { @@ -26,6 +27,13 @@ in pathInStore.bad3 = "${storeDir}/"; pathInStore.bad4 = "${storeDir}/.links"; # technically true, but not reasonable pathInStore.bad5 = "/foo/bar"; + externalPath.bad1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"; + externalPath.bad2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"; + externalPath.bad3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"; + externalPath.bad4 = ""; + externalPath.bad5 = "./foo/bar"; + externalPath.ok1 = "/foo/bar"; + externalPath.ok2 = "/"; assertions = with lib.types; diff --git a/lib/types.nix b/lib/types.nix index cb41fb5c85aa..e57ceafcbaa4 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -676,6 +676,11 @@ let inStore = true; }; + externalPath = pathWith { + absolute = true; + inStore = false; + }; + pathWith = { inStore ? null, diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index d2e0c7299415..707e2e3d1345 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -31,6 +31,21 @@ merging is handled. : A path that is contained in the Nix store. This can be a top-level store path like `pkgs.hello` or a descendant like `"${pkgs.hello}/bin/hello"`. +`types.externalPath` + +: A path that is not contained in the Nix store. Typical use cases are: + secrets, password or any other external file. + +::: {.warning} +This type only validates that the path is not *currently* in the Nix store. +It does NOT prevent the value from being copied to the store later when: +- Referenced in a derivation +- Used in certain path operations (e.g., `${path}` interpolation) +- Passed to functions that copy to the store + +Users must still be careful about how they reference these paths. +::: + `types.pathWith` { *`inStore`* ? `null`, *`absolute`* ? `null` } : A filesystem path. Either a string or something that can be coerced From 76a698a87cd73d874c0e17f4b110a1f3137dd80e Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 4 Nov 2025 22:59:59 +0100 Subject: [PATCH 1026/2279] fwts: 24.09.00 -> 25.09.00; fix kernel module --- pkgs/os-specific/linux/fwts/default.nix | 12 +++++++----- pkgs/os-specific/linux/fwts/module.nix | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 6fd7dc8e99d1..13560cd6a965 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -16,16 +16,18 @@ libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fwts"; - version = "24.09.00"; + version = "25.09.00"; src = fetchzip { - url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; + url = "https://fwts.ubuntu.com/release/fwts-V${finalAttrs.version}.tar.gz"; + hash = "sha256-OJI2O9MptckmGj4rTrh9haIGaXJOO3er59yIorbgSVw="; stripRoot = false; }; + sourceRoot = "${finalAttrs.src.name}/fwts-${finalAttrs.version}"; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -64,4 +66,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tadfisher ]; }; -} +}) diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 76326198b8be..922abd9019ec 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -6,13 +6,13 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fwts-efi-runtime"; version = "${fwts.version}-${kernel.version}"; inherit (fwts) src; - sourceRoot = "${src.name}/efi_runtime"; + sourceRoot = "${fwts.sourceRoot}/efi_runtime"; postPatch = '' substituteInPlace Makefile --replace \ @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; }; -} +}) From e7e92a1a28f20365a8a513d640e549940dc95fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Nov 2025 15:59:09 -0800 Subject: [PATCH 1027/2279] python312Packages.mat2: fix tests --- pkgs/development/python-modules/mat2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f6ff184eb2c0..f75b9ba52faf 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -50,6 +50,11 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch + (fetchpatch { + name = "fix-test_html.patch"; + url = "https://github.com/jvoisin/mat2/commit/00b4f110711754496932c59d5af3c0b2ed694484.patch"; + hash = "sha256-5h/nM1dK8HmYtoIBVGOvUegMFBpGxcfpn5O6QrjLi9M="; + }) ]; postPatch = '' From 85cd1ddde33b5bd65b49fb25a7e2faa0da02161d Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 4 Nov 2025 21:20:09 +0800 Subject: [PATCH 1028/2279] taplo: add yzx9 to maintainers --- pkgs/by-name/ta/taplo/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index c50de7ee18ca..9bd4a899fb35 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -57,7 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ defelo ]; + maintainers = with lib.maintainers; [ + defelo + yzx9 + ]; mainProgram = "taplo"; }; }) From c850869e00447456e55bf3dfa6fbb5947516bd3a Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Tue, 4 Nov 2025 17:52:56 -0800 Subject: [PATCH 1029/2279] super-productivity: 15.2.2 -> 16.2.1 --- pkgs/by-name/su/super-productivity/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index db78c39f1121..0c9a7cf2a8c1 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -14,13 +14,13 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "15.2.2"; + version = "16.2.1"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-jnHPlKA2I/HIUoxDn+h4F9BDTr5G0mLcq6pAlFgxTv8="; + hash = "sha256-R+GZE7hxPUOF5eny0vxH7H1Ja82AbXx4xcL4tszaDQc="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -63,7 +63,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-0HQ0+/1gxlODdHeLxgj0y5RtWUOizB+9SULtOmi0DFk="; + hash = "sha256-MPTLx/5+0qP7PcxcsIyJEZVUPsoA5J+NG+g92n6vNEk="; } ); @@ -101,7 +101,8 @@ buildNpmPackage rec { npm run build npm exec electron-builder -- --dir \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.mac.identity=null runHook postBuild ''; From 118b6b6778f664b2768cdf9fd7e97077240294a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 02:40:31 +0000 Subject: [PATCH 1030/2279] mongosh: 2.5.8 -> 2.5.9 --- pkgs/by-name/mo/mongosh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix index 98cd5ead45e2..7fb9820a7f1c 100644 --- a/pkgs/by-name/mo/mongosh/package.nix +++ b/pkgs/by-name/mo/mongosh/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "mongosh"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "mongodb-js"; repo = "mongosh"; tag = "v${finalAttrs.version}"; - hash = "sha256-VQJkhaPXy2Mg9uoV6qKFzACtJ6TMDWZj52wUvP/7SLg="; + hash = "sha256-lZ2JnFIZvfxRyYXMUbjnazgggRm4ZBdEStn91bPSzkY="; }; - npmDepsHash = "sha256-BnuzrIS/RtKReTPrSY/yQ5LRmA3PIGkv80rS+6IJZxQ="; + npmDepsHash = "sha256-tLgfhg940PJYPQ9myT+mi7+nubcGHU1C1/Az8gF6spQ="; patches = [ ./disable-telemetry.patch From 642d5d3c173d01ab118100599982ffa92852b1f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 03:08:21 +0000 Subject: [PATCH 1031/2279] airwindows: 0-unstable-2025-10-18 -> 0-unstable-2025-11-02 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 9cc03af3642f..968e9111e87a 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-10-18"; + version = "0-unstable-2025-11-02"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "1b0b4d56623e464db038e88cb87d1703b5aa0c63"; - hash = "sha256-u83unbD3qf3OudMeOq20Iw2K3SOsKrGLekYCiVZTzF8="; + rev = "d27f470c0796a32d8241a0be25f74a0fc63e7f8d"; + hash = "sha256-tSbGn7t4EeH5xtvjRRQQneaLP4VEf8ix+0m/v6eosXw="; }; # we patch helpers because honestly im spooked out by where those variables From 1dd714f74580f0cc02e54657012a336005397c20 Mon Sep 17 00:00:00 2001 From: qzylinra <225773816+qzylinra@users.noreply.github.com> Date: Wed, 5 Nov 2025 11:49:36 +0800 Subject: [PATCH 1032/2279] libretrack: fix build --- pkgs/by-name/li/libretrack/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libretrack/package.nix b/pkgs/by-name/li/libretrack/package.nix index ceda0fb98977..22e4c7198518 100644 --- a/pkgs/by-name/li/libretrack/package.nix +++ b/pkgs/by-name/li/libretrack/package.nix @@ -31,6 +31,9 @@ flutter329.buildFlutterApplication rec { libappindicator ]; + # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965 + CXXFLAGS = [ "-Wno-deprecated-literal-operator" ]; + postInstall = '' substituteInPlace snap/gui/org.proninyaroslav.libretrack.desktop \ --replace-fail 'Icon=''${SNAP}/meta/gui/libretrack.png' 'Icon=libretrack' \ From ad77908bb10af6c159023548801757b98be58358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 03:53:41 +0000 Subject: [PATCH 1033/2279] postman: 11.67.0 -> 11.70.2 --- pkgs/by-name/po/postman/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index bc1241c7b0fc..eecbbad5fa98 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -8,7 +8,7 @@ let pname = "postman"; - version = "11.67.0"; + version = "11.70.2"; src = let @@ -27,10 +27,10 @@ let name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}"; url = "https://dl.pstmn.io/download/version/${version}/${system}"; hash = selectSystem { - aarch64-darwin = "sha256-WDXYSHhwvNo4IifeuYOZmF7KX/5ZArPXtoBe30bmGIg="; - aarch64-linux = "sha256-7rtKBx5axftXEXmps1mUPIKPypFUVwhSGA/yJstVU2I="; - x86_64-darwin = "sha256-7cm9u0zdvEBfjId6Xp0i4X2E/dtAZ0HeI3y0guzyMp4="; - x86_64-linux = "sha256-xg9d1E3S6yR3BOMLb5OXmMfZj5e+GmW9p1FFMBj/5mI="; + aarch64-darwin = "sha256-IJrASCvoYvJMrPr5wrpveOy457iRgp+cqFEsCPUcegA="; + aarch64-linux = "sha256-Pig0ZVFb+CVxcbPIwnWVxypxalAmLVcNTegBaDBLjAE="; + x86_64-darwin = "sha256-gI4vww6XkUti5RMc8fr9769t+emVpo0u3OozlxQdar8="; + x86_64-linux = "sha256-T0O6Y3ElK7eJ7ekEx8BjGiYOM8S4S3t0skkZBYh9AQ4="; }; }; From 8e2ce3a081a1fe48b77c6931340d1b8a85e78423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Nov 2025 20:13:18 -0800 Subject: [PATCH 1034/2279] python3Packages.compit-inext-api: init at 0.3.1 --- .../compit-inext-api/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/compit-inext-api/default.nix diff --git a/pkgs/development/python-modules/compit-inext-api/default.nix b/pkgs/development/python-modules/compit-inext-api/default.nix new file mode 100644 index 000000000000..0263ecd56fe4 --- /dev/null +++ b/pkgs/development/python-modules/compit-inext-api/default.nix @@ -0,0 +1,40 @@ +{ + aiofiles, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "compit-inext-api"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Przemko92"; + repo = "compit-inext-api"; + tag = version; + hash = "sha256-Wx3V0AdxNGLdCIl4G7FlfzeDSirRPnxgQ9Fbp5cRjFw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiofiles + aiohttp + ]; + + pythonImportsCheck = [ "compit_inext_api" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Python client for the Compit iNext API"; + homepage = "https://github.com/Przemko92/compit-inext-api"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f22805eed7cc..c9edc5cbe55d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2929,6 +2929,8 @@ self: super: with self; { commonregex = callPackage ../development/python-modules/commonregex { }; + compit-inext-api = callPackage ../development/python-modules/compit-inext-api { }; + compliance-trestle = callPackage ../development/python-modules/compliance-trestle { }; complycube = callPackage ../development/python-modules/complycube { }; From a4c18e1e57e2eb30591bf765f279a6450cabc2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Nov 2025 20:14:13 -0800 Subject: [PATCH 1035/2279] home-assistant: support compit component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d8b05c3a638c..dbc10044b499 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -986,7 +986,8 @@ ]; "compit" = ps: with ps; [ - ]; # missing inputs: compit-inext-api + compit-inext-api + ]; "concord232" = ps: with ps; [ concord232 @@ -7131,6 +7132,7 @@ "comfoconnect" "command_line" "compensation" + "compit" "config" "configurator" "control4" From 2b1f0eb6a60bfdee0e9bd70110d01355c1ea42f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 04:27:17 +0000 Subject: [PATCH 1036/2279] python3Packages.google-cloud-pubsub: 2.32.0 -> 2.33.0 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 65b55da32464..5851550c7153 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.32.0"; + version = "2.33.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-PG24WT6ncsoGX7Iu5Pre5DhlLrW0z0x4s/28Ah9FKDY="; + hash = "sha256-g7xQxU9mnvuSStIThbxwkvoR91duq+89C016qO+pCqY="; }; build-system = [ setuptools ]; From c228f3b3c357ecca2f0286837878e4a02483289e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 04:32:23 +0000 Subject: [PATCH 1037/2279] python3Packages.ruff-api: 0.1.0 -> 0.2.0 --- pkgs/development/python-modules/ruff-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index da708831d3ba..a5e194e2ca11 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ruff-api"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "amyreese"; repo = "ruff-api"; tag = "v${version}"; - hash = "sha256-1XULyxu3XujhAcFnvqI5zMiXOc0axx1LS4EevjhoGDc="; + hash = "sha256-+tGBaHEau2OjAjj452wEAQ4gyxczg6Fb+NJ42oIkKQY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-q8Y5oqoSzUk1Xg4AmjLs7RO8Kr87Oi3eKLSpmXlHp4U="; + hash = "sha256-cpW2XsrQvFC5wkGF8hBQ7xFp5oLEJpbHuHBLi6VFkEo="; }; nativeBuildInputs = [ From 447aaff2fd169b3d991ae181e34443c09e3a75b7 Mon Sep 17 00:00:00 2001 From: themadbit Date: Tue, 30 Sep 2025 10:04:53 +0300 Subject: [PATCH 1038/2279] cryptpad: 2025.3.0 -> 2025.6.0 Signed-off-by: themadbit --- pkgs/by-name/cr/cryptpad/package.nix | 92 +++++++++++++++++++++------- 1 file changed, 71 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 7238621b3a1c..a588aaccda80 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -14,22 +14,60 @@ }: let - version = "2025.3.0"; + version = "2025.6.0"; # nix version of install-onlyoffice.sh # a later version could rebuild from sdkjs/web-apps as per # https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh - onlyoffice_build = - rev: hash: - fetchFromGitHub { - inherit rev hash; - owner = "cryptpad"; - repo = "onlyoffice-builds"; - }; + onlyoffice_fetch = + { + rev ? null, + version ? null, + hash, + ... + }: + assert ( + lib.assertMsg (lib.xor (rev == null) ( + version == null + )) "onlyoffice_fetch requires one of either `rev` or `version` to be provided (not both)." + ); + if rev != null then + fetchFromGitHub { + inherit rev hash; + owner = "cryptpad"; + repo = "onlyoffice-builds"; + } + # New method for v7+ versions that use ZIP releases + else + fetchurl { + url = "https://github.com/cryptpad/onlyoffice-editor/releases/download/${version}/onlyoffice-editor.zip"; + inherit hash; + }; + onlyoffice_install = oo: '' oo_dir="$out_cryptpad/www/common/onlyoffice/dist/${oo.subdir}" - cp -a "${onlyoffice_build oo.rev oo.hash}/." "$oo_dir" - chmod -R +w "$oo_dir" - echo "${oo.rev}" > "$oo_dir/.commit" + ${ + if oo ? "version" then + '' + mkdir -p "$oo_dir" + unzip ${onlyoffice_fetch oo} -d "$oo_dir" + echo "${oo.version}" > "$oo_dir/.version" + + # Clean up help files and dictionaries as per upstream + ${lib.optionalString (oo.subdir == "v7") '' + rm -rf "$oo_dir"/web-apps/apps/*/main/resources/help + rm -rf "$oo_dir"/dictionaries/ + ''} + '' + else + '' + cp -a "${onlyoffice_fetch oo}/." "$oo_dir" + chmod -R +w "$oo_dir" + echo "${oo.rev}" > "$oo_dir/.commit" + + # Clean up help files as per upstream + rm -rf "$oo_dir"/web-apps/apps/*/main/resources/help + '' + } ''; onlyoffice_versions = [ { @@ -59,8 +97,13 @@ let } { subdir = "v7"; - rev = "e1267803"; - hash = "sha256-iIds0GnCHAyeIEdSD4aCCgDtnnwARh3NE470CywseS0="; + version = "v7.3.3.60+11"; + hash = "sha256-He8RwsaJPBhaxFklA7vSxxNUpmcM41lW859gQUUJWbQ="; + } + { + subdir = "v8"; + version = "v8.3.3.23+4"; + hash = "sha256-DeK84fa7Jc1L1+vF8LBKLXM5oWS0SV2qBnAWG3Xzu4U="; } ]; @@ -83,11 +126,11 @@ buildNpmPackage { src = fetchFromGitHub { owner = "cryptpad"; repo = "cryptpad"; - rev = version; - hash = "sha256-NxkVMsfLzdzifdn+f0C6mBJGd1oLwcMTAIXv+gBG7rI="; + tag = version; + hash = "sha256-R8Oonrnb1tqvl1zTkWv5Xv/f8bFtUljD6X/re72IvsU="; }; - npmDepsHash = "sha256-GWkyRlizPSA72WwoY+mRLwaMeD/SXdo6oUVwsd2gp7c="; + npmDepsHash = "sha256-4Zr+8ANZJ9XX2umY/SY7BrEHPheVelFSeZipgOaW6bI=="; nativeBuildInputs = [ makeBinaryWrapper @@ -120,8 +163,13 @@ buildNpmPackage { # Move to install directory manually. npm run install:components mv www/components "$out_cryptpad/www/" - # and fix absolute symlink to /build... - ln -Tfs ../../src/tweetnacl "$out_cryptpad/www/components/tweetnacl" + # optimization: replace copies with symlinks... + for d in "$out_cryptpad/www/components/"*; do + d="''${d##*/}" + [ -e "$out_cryptpad/node_modules/$d" ] || continue + rm -rf "$out_cryptpad/www/components/$d" + ln -Tfs "../../node_modules/$d" "$out_cryptpad/www/components/$d" + done # install OnlyOffice (install-onlyoffice.sh without network) mkdir -p "$out_cryptpad/www/common/onlyoffice/dist" @@ -130,8 +178,10 @@ buildNpmPackage { # Run upstream's `install-onlyoffice.sh` script in `--check` mode to # verify that we've installed the correct versions of the various # OnlyOffice components. - patchShebangs --build $out_cryptpad/install-onlyoffice.sh - $out_cryptpad/install-onlyoffice.sh --accept-license --check --rdfind + + # TODO: Patch the new install method to only verify versions; + # patchShebangs --build $out_cryptpad/install-onlyoffice.sh + # $out_cryptpad/install-onlyoffice.sh --accept-license --check --rdfind # cryptpad assumes it runs in the source directory and also outputs # its state files there, which is not exactly great for us. @@ -144,7 +194,7 @@ buildNpmPackage { # directory. makeWrapper "${lib.getExe nodejs}" "$out/bin/cryptpad" \ --add-flags "$out_cryptpad/server.js" \ - --run "for d in customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \ + --run "for d in src customize.dist lib www scripts; do ${coreutils}/bin/ln -sf \"$out_cryptpad/\$d\" .; done" \ --run "if ! [ -d customize ]; then \"${lib.getExe nodejs}\" \"$out_cryptpad/scripts/build.js\"; fi" ''; From 1748770fcaa14e3fe3de18a7d418a74a88f0da4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 4 Nov 2025 20:49:54 -0800 Subject: [PATCH 1039/2279] python3Packages.av: 15.1.0 -> 16.0.1 Diff: https://github.com/PyAV-Org/PyAV/compare/v15.1.0...v16.0.1 Changelog: https://github.com/PyAV-Org/PyAV/blob/v16.0.1/CHANGELOG.rst --- pkgs/development/python-modules/av/default.nix | 9 +++------ pkgs/development/python-modules/av/test-samples.toml | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7a6da605e338..738d75e59b73 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "av"; - version = "15.1.0"; + version = "16.0.1"; pyproject = true; src = fetchFromGitHub { owner = "PyAV-Org"; repo = "PyAV"; tag = "v${version}"; - hash = "sha256-VeF6Sti1Ide2LchiCuPut/bdbJUv+5eTH2q0YMcniyA="; + hash = "sha256-iFKDDOJzCynaqwHIjykfh82diGiuOjWytwU3dq1J9PA="; }; build-system = [ @@ -63,10 +63,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why. - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - "tests/test_timeout.py" - ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "av" diff --git a/pkgs/development/python-modules/av/test-samples.toml b/pkgs/development/python-modules/av/test-samples.toml index cdc1d93362f1..b20328e97560 100644 --- a/pkgs/development/python-modules/av/test-samples.toml +++ b/pkgs/development/python-modules/av/test-samples.toml @@ -1,6 +1,7 @@ "fate-suite/aac/latm_stereo_to_51.ts" = { url = "http://fate.ffmpeg.org/fate-suite/aac/latm_stereo_to_51.ts", hash = "sha256-lVz0iby2IEUVdwKYamv4HVm8EUGHJS/cWY+QFBMaCBY=" } "fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv" = { url = "http://fate.ffmpeg.org/fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv", hash = "sha256-O9YMj0+0bM4YyZNGgkZJL8E2aG+Y3lq8/c+DVht0McI=" } "fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav" = { url = "http://fate.ffmpeg.org/fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav", hash = "sha256-KodB5hQkBFtfkI+L7hnkSonPM+IuOCNrTV3Vsy1bvhs=" } +"fate-suite/h264/extradata-reload-multi-stsd.mov" = { url = "http://fate.ffmpeg.org/fate-suite/h264/extradata-reload-multi-stsd.mov", hash = "sha256-tby9Ttwc4+rVjoaDZ+fqcqCUXSuYjQD/LiLdvhOdlOc=" } "fate-suite/h264/interlaced_crop.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/h264/interlaced_crop.mp4", hash = "sha256-SVWWaOcfOp718dvgkpgOWCYoV9Ylomv8MBYzbRqvbBE=" } "fate-suite/hap/HAPQA_NoSnappy_127x1.mov" = { url = "http://fate.ffmpeg.org/fate-suite/hap/HAPQA_NoSnappy_127x1.mov", hash = "sha256-WMUqg9o84ki2AIIsGhY8P10KBc3qgCsmljqJXXRHbs8=" } "fate-suite/mkv/codec_delay_opus.mkv" = { url = "http://fate.ffmpeg.org/fate-suite/mkv/codec_delay_opus.mkv", hash = "sha256-GanpfRyGKN36NLAa7pZehcM1F2VDCW3g6hhO26vFg1I=" } @@ -13,5 +14,6 @@ "fate-suite/qtrle/aletrek-rle.mov" = { url = "http://fate.ffmpeg.org/fate-suite/qtrle/aletrek-rle.mov", hash = "sha256-uXUvVkwuPbfs/rzT896ty3RZfvGoSPj3su+sjLPU09g=" } "fate-suite/sub/MovText_capability_tester.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/sub/MovText_capability_tester.mp4", hash = "sha256-Y2uhvfGrZaPebD6ZsJemzpOk+XHX6ukBceVauEit9h8=" } "fate-suite/sub/vobsub.sub" = { url = "http://fate.ffmpeg.org/fate-suite/sub/vobsub.sub", hash = "sha256-X2rEMyTlo1xuUlqgx2uvqd2WWhfOCID9fraeGbaFPIs=" } +"fate-suite/vorbis/vorbis_chapter_extension_demo.ogg" = { url = "http://fate.ffmpeg.org/fate-suite/vorbis/vorbis_chapter_extension_demo.ogg", hash = "sha256-s0kGcghf8Td/bSPy1HOBKaG5bT5zVxFlT1NfQiKHMN8=" } "pyav-curated/pexels/time-lapse-video-of-night-sky-857195.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-night-sky-857195.mp4", hash = "sha256-6307VwepfoVNKeGm8WEMZtfowJZ27Hv2fwgp6J/Q0oE=" } "pyav-curated/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4", hash = "sha256-2RWphhz5KWPSnJh8ARrC7aPjBa77DJO1Fv0/I4kWxYg=" } From 5e634232cbaf8017423065854a3b6c0dcda45d3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 05:28:57 +0000 Subject: [PATCH 1040/2279] ansible-doctor: 7.3.0 -> 8.0.0 --- pkgs/by-name/an/ansible-doctor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index d8fe94d1c988..acd5622e1676 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "7.3.0"; + version = "8.0.0"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-4Mep9JA4I5zCciglK/yn4Jxu0EIjHi7WUWeKlLcVcP8="; + hash = "sha256-6elotoKZ4Hjelnw9LEiDONAFqqM5ewMKEorDtzA7LKY="; }; build-system = with python3Packages; [ From e6fdf44e5501f1d307dd58b2f5a68c1979ec4405 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Tue, 21 Oct 2025 12:52:15 -0300 Subject: [PATCH 1041/2279] jumanpp: 2.0.0-rc3 -> 2.0.0-rc4 --- ...001-Exclude-all-tests-from-the-build.patch | 177 ------------------ pkgs/by-name/ju/jumanpp/package.nix | 45 ++--- 2 files changed, 15 insertions(+), 207 deletions(-) delete mode 100644 pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch diff --git a/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch deleted file mode 100644 index d41bada82def..000000000000 --- a/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch +++ /dev/null @@ -1,177 +0,0 @@ -From c52a5046e19718a43d48c9b3cfdc121d964e8c3b Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 28 Jan 2022 17:43:35 +0100 -Subject: [PATCH] Exclude all tests from the build - -For some reason it isn't sufficient to set `-DJPP_ENABLE_TESTS=OFF`. -Doing that because the tests on 2.0.0-rc3 don't seem to be working and -the vendored catch2 doesn't build with glibc 2.34. ---- - src/CMakeLists.txt | 3 +-- - src/core/CMakeLists.txt | 11 +---------- - src/core/analysis/CMakeLists.txt | 2 -- - src/core/codegen/CMakeLists.txt | 3 --- - src/core/spec/CMakeLists.txt | 2 -- - src/core/training/CMakeLists.txt | 2 -- - src/jumandic/CMakeLists.txt | 8 +------- - src/rnn/CMakeLists.txt | 5 +---- - src/util/CMakeLists.txt | 2 -- - 9 files changed, 4 insertions(+), 34 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 169dff5..64b6a07 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -67,7 +67,6 @@ function(jpp_feature_codegen) - endfunction(jpp_feature_codegen) - - add_subdirectory(util) --add_subdirectory(testing) - add_subdirectory(core) - add_subdirectory(jumandic) --add_subdirectory(rnn) -\ No newline at end of file -+add_subdirectory(rnn) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index c63d134..01c825e 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -55,20 +55,11 @@ set(core_hdrs - ${core_hdrs} - ) - --set(core_test_srcs -- ${core_test_srcs} -- ${core_tsrcs} -- test/test_analyzer_env.h -- ../testing/test_analyzer.h -- ) -- - add_library(jpp_core ${core_srcs} ${core_hdrs} ${libs3p_pegtl_headers}) --jpp_test_executable(jpp_core_tests ${core_test_srcs}) - - target_include_directories(jpp_core PUBLIC ${jpp_core_cfg_dir}) - - target_link_libraries(jpp_core PUBLIC jpp_util jpp_rnn PRIVATE pathie) --target_link_libraries(jpp_core_tests jpp_core jpp_core_train) - - if (${JPP_USE_PROTOBUF}) - target_include_directories(jpp_core PUBLIC ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -@@ -78,4 +69,4 @@ endif() - add_subdirectory(benchmarks) - if (${JPP_ENABLE_DEV_TOOLS}) - add_subdirectory(devtools) --endif () -\ No newline at end of file -+endif () -diff --git a/src/core/analysis/CMakeLists.txt b/src/core/analysis/CMakeLists.txt -index 526263e..1b32f8d 100644 ---- a/src/core/analysis/CMakeLists.txt -+++ b/src/core/analysis/CMakeLists.txt -@@ -79,5 +79,3 @@ jpp_core_files(core_hdrs - ) - - --jpp_test_executable(jpp_core_analysis_tests ${core_analysis_tsrc}) --target_link_libraries(jpp_core_analysis_tests jpp_core) -diff --git a/src/core/codegen/CMakeLists.txt b/src/core/codegen/CMakeLists.txt -index a905cee..fa759c7 100644 ---- a/src/core/codegen/CMakeLists.txt -+++ b/src/core/codegen/CMakeLists.txt -@@ -30,7 +30,4 @@ set(jpp_codegen_tsrcs - - add_library(jpp_core_codegen ${jpp_codegen_srcs} ${jpp_codegen_hdrs}) - --jpp_test_executable(jpp_codegen_tests ${jpp_codegen_tsrcs}) --target_include_directories(jpp_codegen_tests PRIVATE ${cgtest02_INCLUDE}) - target_link_libraries(jpp_core_codegen jpp_core) --target_link_libraries(jpp_codegen_tests jpp_core_codegen) -\ No newline at end of file -diff --git a/src/core/spec/CMakeLists.txt b/src/core/spec/CMakeLists.txt -index f495d67..da827b9 100644 ---- a/src/core/spec/CMakeLists.txt -+++ b/src/core/spec/CMakeLists.txt -@@ -33,5 +33,3 @@ jpp_core_files(core_hdrs - - ) - --jpp_test_executable(jpp_core_spec_tests ${core_spec_tsrc} ${libs3p_pegtl_headers}) --target_link_libraries(jpp_core_spec_tests jpp_core) -\ No newline at end of file -diff --git a/src/core/training/CMakeLists.txt b/src/core/training/CMakeLists.txt -index 960437e..4ede9e1 100644 ---- a/src/core/training/CMakeLists.txt -+++ b/src/core/training/CMakeLists.txt -@@ -39,7 +39,5 @@ set(core_train_hdrs - - - add_library(jpp_core_train ${core_train_src} ${core_train_hdrs}) --jpp_test_executable(jpp_core_train_tests ${core_train_tsrc}) - - target_link_libraries(jpp_core_train jpp_core) --target_link_libraries(jpp_core_train_tests jpp_core_train) -\ No newline at end of file -diff --git a/src/jumandic/CMakeLists.txt b/src/jumandic/CMakeLists.txt -index bef3149..85a8b5d 100644 ---- a/src/jumandic/CMakeLists.txt -+++ b/src/jumandic/CMakeLists.txt -@@ -53,10 +53,6 @@ if (${JPP_USE_PROTOBUF}) - endif () - - --jpp_test_executable(jpp_jumandic_tests ${jumandic_tests}) --jpp_test_executable(jpp_bug_tests ${bug_test_sources}) --target_include_directories(jpp_jumandic_tests PRIVATE ${jpp_jumandic_cg_INCLUDE}) -- - add_executable(jpp_jumandic_bootstrap main/bootstrap.cc) - add_executable(jumanpp_v2 main/jumanpp.cc) - add_executable(jumanpp_v2_train main/jumanpp_train.cc main/jumanpp_train.h) -@@ -64,11 +60,9 @@ add_executable(jpp_jumandic_pathdiff main/path_diff.cc) - target_include_directories(jpp_jumandic_pathdiff PRIVATE ${jpp_jumandic_cg_INCLUDE}) - - target_link_libraries(jpp_jumandic jpp_jumandic_spec) --target_link_libraries(jpp_jumandic_tests jpp_jumandic jpp_core_train) --target_link_libraries(jpp_bug_tests jpp_jumandic jpp_core_train) - target_link_libraries(jpp_jumandic_bootstrap jpp_jumandic) - target_link_libraries(jumanpp_v2 jpp_jumandic) - target_link_libraries(jumanpp_v2_train jpp_jumandic jpp_core_train) - target_link_libraries(jpp_jumandic_pathdiff jpp_jumandic) - --install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) -\ No newline at end of file -+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) -diff --git a/src/rnn/CMakeLists.txt b/src/rnn/CMakeLists.txt -index 448ba51..ca09a00 100644 ---- a/src/rnn/CMakeLists.txt -+++ b/src/rnn/CMakeLists.txt -@@ -1,12 +1,9 @@ - set(jpp_rnn_sources mikolov_rnn.cc) - set(jpp_rnn_includes mikolov_rnn.h simple_rnn_impl.h mikolov_rnn_impl.h rnn_arg_parse.h) --set(jpp_rnn_tests mikolov_rnn_test.cc) - - add_library(jpp_rnn ${jpp_rnn_sources} ${jpp_rnn_includes} ) - add_library(jumanpp_rnn_legacy legacy/rnnlmlib.h legacy/rnnlmlib_static.h legacy/rnnlmlib_static.cpp) - --jpp_test_executable(jpp_rnn_tests ${jpp_rnn_tests}) - target_link_libraries(jpp_rnn jpp_util) --target_link_libraries(jpp_rnn_tests jpp_rnn jumanpp_rnn_legacy) - --target_link_libraries(jumanpp_rnn_legacy jpp_util) -\ No newline at end of file -+target_link_libraries(jumanpp_rnn_legacy jpp_util) -diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt -index 53b6c57..c4599d5 100644 ---- a/src/util/CMakeLists.txt -+++ b/src/util/CMakeLists.txt -@@ -25,8 +25,6 @@ endif() - - - add_library(jpp_util ${jpp_util_sources} ${jpp_util_headers} ${BACKWARD_headers}) --jpp_test_executable(jpp_util_test ${jpp_util_test_srcs} ${jpp_util_headers}) --target_link_libraries(jpp_util_test jpp_util) - target_link_libraries(jpp_util ${CMAKE_THREAD_LIBS_INIT}) - target_include_directories(jpp_util PUBLIC ${JPP_LIBS_DIR} ${JPP_SRC_DIR}) - target_compile_features(jpp_util PUBLIC --- -2.33.1 - diff --git a/pkgs/by-name/ju/jumanpp/package.nix b/pkgs/by-name/ju/jumanpp/package.nix index 6f0ca2599757..a3b8678b5ead 100644 --- a/pkgs/by-name/ju/jumanpp/package.nix +++ b/pkgs/by-name/ju/jumanpp/package.nix @@ -2,46 +2,31 @@ lib, stdenv, fetchurl, - fetchpatch, cmake, protobuf, libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jumanpp"; - version = "2.0.0-rc3"; + version = "2.0.0-rc4"; src = fetchurl { - url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; + url = "https://github.com/ku-nlp/jumanpp/releases/download/v${finalAttrs.version}/jumanpp-${finalAttrs.version}.tar.xz"; + hash = "sha256-qyy0mTBrH3y8OBIVXuTHIDV+AbQIvCIA7rzhbI2b8y8="; }; - patches = [ - ./0001-Exclude-all-tests-from-the-build.patch - # https://github.com/ku-nlp/jumanpp/pull/132 - (fetchpatch { - name = "fix-unused-warning.patch"; - url = "https://github.com/ku-nlp/jumanpp/commit/cc0d555287c8b214e9d6f0279c449a4e035deee4.patch"; - sha256 = "sha256-yRKwuUJ2UPXJcjxBGhSOmcQI/EOijiJDMmmmSRdNpX8="; - }) - (fetchpatch { - name = "update-libs.patch"; - url = "https://github.com/ku-nlp/jumanpp/commit/5e9068f56ae310ed7c1df185b14d49654ffe1ab6.patch"; - sha256 = "sha256-X49/ZoLT0OGePLZYlgacNxA1dHM4WYdQ8I4LW3sW16E="; - }) - (fetchpatch { - name = "fix-mmap-on-apple-m1.patch"; - url = "https://github.com/ku-nlp/jumanpp/commit/0c22249f12928d0c962f03f229026661bf0c7921.patch"; - sha256 = "sha256-g6CuruqyoMJxU/hlNoALx1QnFM8BlTsTd0pwlVrco3I="; - }) - ]; - cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ]; + doCheck = true; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; - meta = with lib; { + postPatch = '' + substituteInPlace libs/pathie-cpp/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" + ''; + + meta = { description = "Japanese morphological analyser using a recurrent neural network language model (RNNLM)"; mainProgram = "jumanpp"; longDescription = '' @@ -50,8 +35,8 @@ stdenv.mkDerivation rec { language model (RNNLM). ''; homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; - license = licenses.asl20; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mt-caret ]; + platforms = lib.platforms.all; }; -} +}) From 982cede53b6b01b88972085e79f5b7e60e0a3e13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 07:58:52 +0000 Subject: [PATCH 1042/2279] python3Packages.orgparse: 0.4.20250520 -> 0.4.20251020 --- pkgs/development/python-modules/orgparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orgparse/default.nix b/pkgs/development/python-modules/orgparse/default.nix index 2ee36ebbb55b..cfa8a419666c 100644 --- a/pkgs/development/python-modules/orgparse/default.nix +++ b/pkgs/development/python-modules/orgparse/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "orgparse"; - version = "0.4.20250520"; + version = "0.4.20251020"; pyproject = true; src = fetchFromGitHub { owner = "karlicoss"; repo = "orgparse"; tag = "v${version}"; - hash = "sha256-y3mkGCZvikbmymgvPOWq4GLxoFmslXGm/cxR2PZ6DRM="; + hash = "sha256-RJ+1HVI9OgbylBxdEztpQ4v0MG0PUFqXlFfe0vsDaTg="; }; build-system = [ From 1701d4b756545542d70452cacd014e6d3340466c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 05:35:51 -0300 Subject: [PATCH 1043/2279] clblas: fix build with cmake4 --- pkgs/by-name/cl/clblas/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix index e284e350b80f..27e32115e82d 100644 --- a/pkgs/by-name/cl/clblas/package.nix +++ b/pkgs/by-name/cl/clblas/package.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt + + substituteInPlace src/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace src/library/tools/tplgen/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; preConfigure = '' From 8ac30023ea1926d93d7fa3969c8b55dec44fbdfe Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Tue, 4 Nov 2025 20:47:47 +0100 Subject: [PATCH 1044/2279] appium-inspector: bump to electron_38 --- pkgs/by-name/ap/appium-inspector/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index e3353ebd71b8..473216d965f1 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, copyDesktopItems, - electron_36, + electron_38, fetchFromGitHub, makeDesktopItem, makeWrapper, @@ -10,7 +10,7 @@ }: let - electron = electron_36; + electron = electron_38; version = "2025.8.2"; in From 4e24853df60d56f45a3900dd25dfac145bb9245d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 09:13:48 +0000 Subject: [PATCH 1045/2279] proton-ge-bin: GE-Proton10-24 -> GE-Proton10-25 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 82da233a89bd..7c9edd97cee6 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton10-24"; + version = "GE-Proton10-25"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-QZBu2C4JrsETY+EV0zs4e921qOxYT9lk0EYXXpOCKLs="; + hash = "sha256-RKko4QMxtnuC1SAHTSEQGBzVyl3ywnirFSYJ1WKSY0k="; }; dontUnpack = true; From c94424796e997bcb56bf5065cdbef3d3aa81bb8b Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 4 Nov 2025 12:35:06 +0100 Subject: [PATCH 1046/2279] {topfew, topfew-rs}: cleanup --- pkgs/by-name/to/topfew-rs/package.nix | 10 +++++----- pkgs/by-name/to/topfew/package.nix | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix index 53d726e1e18e..8a8488fc4076 100644 --- a/pkgs/by-name/to/topfew-rs/package.nix +++ b/pkgs/by-name/to/topfew-rs/package.nix @@ -4,24 +4,24 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "topfew-rs"; version = "0.2.3"; src = fetchFromGitHub { owner = "djc"; repo = "topfew-rs"; - rev = version; + tag = finalAttrs.version; hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY="; }; cargoHash = "sha256-NAM/s3m+ZqgHoX6GESgJOxr88sy4+JieWB8u8aKbW7Y="; - meta = with lib; { + meta = { description = "Rust implementation of Tim Bray's topfew tool"; homepage = "https://github.com/djc/topfew-rs"; - license = licenses.gpl3Only; maintainers = [ ]; + license = lib.licenses.gpl3Only; mainProgram = "tf"; }; -} +}) diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix index 8e88803fe238..34a5da824c9b 100644 --- a/pkgs/by-name/to/topfew/package.nix +++ b/pkgs/by-name/to/topfew/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "topfew"; version = "2.0.0"; src = fetchFromGitHub { owner = "timbray"; repo = "topfew"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI="; }; @@ -24,18 +24,17 @@ buildGoModule rec { ldflags = [ "-s" - "-w" ]; postInstall = '' installManPage doc/tf.1 ''; - meta = with lib; { + meta = { description = "Finds the fields (or combinations of fields) which appear most often in a stream of records"; homepage = "https://github.com/timbray/topfew"; - license = licenses.gpl3Only; maintainers = [ ]; + license = lib.licenses.gpl3Only; mainProgram = "tf"; }; -} +}) From d2b2bd34a43b552ed05a0d93e931db1778f978ff Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 5 Nov 2025 10:18:34 +0100 Subject: [PATCH 1047/2279] {topfew, topfew-rs}: add liberodark to maintainers --- pkgs/by-name/to/topfew-rs/package.nix | 2 +- pkgs/by-name/to/topfew/package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix index 8a8488fc4076..9c6e3cb1e2e6 100644 --- a/pkgs/by-name/to/topfew-rs/package.nix +++ b/pkgs/by-name/to/topfew-rs/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Rust implementation of Tim Bray's topfew tool"; homepage = "https://github.com/djc/topfew-rs"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; license = lib.licenses.gpl3Only; mainProgram = "tf"; }; diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix index 34a5da824c9b..906bd91cfaa2 100644 --- a/pkgs/by-name/to/topfew/package.nix +++ b/pkgs/by-name/to/topfew/package.nix @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { meta = { description = "Finds the fields (or combinations of fields) which appear most often in a stream of records"; homepage = "https://github.com/timbray/topfew"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; license = lib.licenses.gpl3Only; mainProgram = "tf"; }; From 41fbabea29bc3cf57afd4e9a0802abbeb7e61994 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 06:32:03 -0300 Subject: [PATCH 1048/2279] clblas: fix build on darwin --- pkgs/by-name/cl/clblas/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix index 27e32115e82d..f77834528d23 100644 --- a/pkgs/by-name/cl/clblas/package.nix +++ b/pkgs/by-name/cl/clblas/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + llvmPackages_19, fetchFromGitHub, fetchpatch, cmake, @@ -12,15 +13,19 @@ opencl-headers, }: -stdenv.mkDerivation rec { +let + stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; +in + +stdenv'.mkDerivation (finalAttrs: { pname = "clblas"; version = "2.12"; src = fetchFromGitHub { owner = "clMathLibraries"; repo = "clBLAS"; - rev = "v${version}"; - sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ="; }; patches = [ @@ -64,15 +69,15 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "Software library containing BLAS functions written in OpenCL"; longDescription = '' This package contains a library of BLAS functions on top of OpenCL. ''; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) From e687c0a5027967b74e07f8da6a9f57a9ca46561a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 09:32:31 +0000 Subject: [PATCH 1049/2279] maestro: 2.0.8 -> 2.0.9 --- pkgs/by-name/ma/maestro/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 3eb5260d0b42..169dedbf9eb8 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; - hash = "sha256-VBXpbEdGWY5v9E0GT+2Q9hko8lZoVmE1T7FzrQL/cs4="; + hash = "sha256-b1p50qqNvwqku3pv3dylkRgsZnZwExwx95RQ6zV5pQM="; }; dontUnpack = true; From eaf47e2fec99204d522f9a2e51d65ab94625d8f4 Mon Sep 17 00:00:00 2001 From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com> Date: Wed, 5 Nov 2025 11:46:06 +0200 Subject: [PATCH 1050/2279] burpsuite: fix update script to avoid downgrades --- pkgs/by-name/bu/burpsuite/update.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bu/burpsuite/update.sh b/pkgs/by-name/bu/burpsuite/update.sh index 7d0214045c50..4824a5499471 100755 --- a/pkgs/by-name/bu/burpsuite/update.sh +++ b/pkgs/by-name/bu/burpsuite/update.sh @@ -4,17 +4,16 @@ set -eu -o pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -curl -s 'https://portswigger.net/burp/releases/data' | - jq -r ' - [[ - .ResultSet.Results[] - | select( - (.categories | sort) == (["Professional","Community"] | sort) - and .releaseChannels == ["Early Adopter"] - ) - ][0].builds[] - | select(.ProductPlatform == "Jar") - ]' >latest.json +curl -s 'https://portswigger.net/burp/releases/data' | jq -r ' + def verarr: (.Version // "") | split(".") | map(tonumber? // 0); + [ .ResultSet.Results[] + | select((.categories|sort) == (["Professional","Community"]|sort)) + | .builds[] + | select(.ProductPlatform == "Jar") + ] as $all + | ($all | max_by( (.Version // "") | split(".") | map(tonumber? // 0) ) | .Version) as $v + | $all | map(select(.Version == $v)) + ' > latest.json version=$(jq -r '.[0].Version' latest.json) From 6bef59aadec88e96a4c227be715211d7e764fca4 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 22:24:40 -0300 Subject: [PATCH 1051/2279] getdp: 3.6.0 -> 3.6.0-unstable-2025-10-25 --- pkgs/by-name/ge/getdp/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ge/getdp/package.nix b/pkgs/by-name/ge/getdp/package.nix index e911a6570942..38b4807c8fa8 100644 --- a/pkgs/by-name/ge/getdp/package.nix +++ b/pkgs/by-name/ge/getdp/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, cmake, gfortran, blas, @@ -14,12 +14,16 @@ let mpiSupport = petsc.passthru.mpiSupport; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "getdp"; - version = "3.6.0"; - src = fetchurl { - url = "http://getdp.info/src/getdp-${version}-source.tgz"; - hash = "sha256-nzefwCV+Z9BHDofuTfhR+vhqm3cCSiUT+7cbtn601N8="; + version = "3.6.0-unstable-2025-10-25"; + + src = fetchFromGitLab { + domain = "gitlab.onelab.info"; + owner = "getdp"; + repo = "getdp"; + rev = "cac7f393ac34be1618b588083d2e391efd4976f7"; + hash = "sha256-yiqi9Fb3UM81iJtpU+Mg71BB73injdkWCzbJGgor4ww="; }; nativeBuildInputs = [ @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { ++ lib.optional mpiSupport mpi; cmakeFlags = lib.optional mpiSupport "-DENABLE_MPI=1"; - meta = with lib; { + meta = { description = "General Environment for the Treatment of Discrete Problems"; mainProgram = "getdp"; longDescription = '' @@ -46,8 +50,8 @@ stdenv.mkDerivation rec { symbolic mathematical expressions of these problems. ''; homepage = "http://getdp.info/"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 9a07914fe5dd8c6ee98cec4610070a7b10c77071 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 3 Nov 2025 22:25:35 -0300 Subject: [PATCH 1052/2279] getdp: add maintainer iedame --- pkgs/by-name/ge/getdp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ge/getdp/package.nix b/pkgs/by-name/ge/getdp/package.nix index 38b4807c8fa8..2fc9925b416a 100644 --- a/pkgs/by-name/ge/getdp/package.nix +++ b/pkgs/by-name/ge/getdp/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ''; homepage = "http://getdp.info/"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ iedame ]; platforms = lib.platforms.linux; }; } From 71b5a37815992cb243e85e03d8a73a94ada7ec4f Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 03:22:17 -0300 Subject: [PATCH 1053/2279] gmsh: 4.14.0 -> 4.15.0 --- pkgs/by-name/gm/gmsh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index c2b341e5f15e..e1e9c2b08382 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -25,11 +25,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "gmsh"; - version = "4.14.0"; + version = "4.15.0"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${finalAttrs.version}-source.tgz"; - hash = "sha256-2019ogYumkNWqCCDITirmfl69jiL/rIVmaLq37C3aig="; + hash = "sha256-q7JjJxW9fQEw3tcUT9YmNjXNfeqIO432G6TaWM5qHf4="; }; nativeBuildInputs = [ From e1b834484a19e5c95ecd2b3571ea727dccf42d02 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 03:28:12 -0300 Subject: [PATCH 1054/2279] gmsh: add maintainer iedame --- pkgs/by-name/gm/gmsh/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index e1e9c2b08382..c27b128b153d 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -113,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gmsh.info/"; changelog = "https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_${lib.concatStringsSep "_" (lib.versions.splitVersion finalAttrs.version)}#changelog"; license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ iedame ]; }; }) From 3cae4c787d19efb29c706cf5e563c5f723f254ec Mon Sep 17 00:00:00 2001 From: Alexander Nabokikh Date: Wed, 5 Nov 2025 11:31:31 +0100 Subject: [PATCH 1055/2279] swaynotificationcenter: 0.12.2 -> 0.12.3 --- pkgs/by-name/sw/swaynotificationcenter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index e29f89e13332..61e505607a8b 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SwayNotificationCenter"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "ErikReider"; repo = "SwayNotificationCenter"; tag = "v${finalAttrs.version}"; - hash = "sha256-BtcT2N08BVxVrzEd1Z/s5MXWHaHFt6PqBH4gdH6TEvs="; + hash = "sha256-8zVG3mJxT6K0jkqsnaJ4wscPAk3z00YTsmHsJmuKWc8="; }; # build pkg-config is required to locate the native `scdoc` input From d1a1a0a1b1d779fb075097f6a7e38a6bbb54074d Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 20 Oct 2025 14:59:07 +0200 Subject: [PATCH 1056/2279] boringssl: add updateScript --- pkgs/by-name/bo/boringssl/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 9efc590eaaa2..54c2c9507013 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -6,6 +6,7 @@ ninja, perl, buildGoModule, + gitUpdater, }: # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md @@ -81,6 +82,8 @@ buildGoModule (finalAttrs: { "dev" ]; + passthru.updateScript = gitUpdater { }; + meta = { description = "Free TLS/SSL implementation"; mainProgram = "bssl"; From 100a688336398a0e59c08655942b7d1c218f95bf Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 20 Oct 2025 15:16:14 +0200 Subject: [PATCH 1057/2279] boringssl: fix license BoringSSL has been relicensed to Apache 2.0 as of February 2025 --- pkgs/by-name/bo/boringssl/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 54c2c9507013..ec0d2186b3c4 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -90,7 +90,7 @@ buildGoModule (finalAttrs: { homepage = "https://boringssl.googlesource.com"; maintainers = [ lib.maintainers.thoughtpolice ]; license = with lib.licenses; [ - openssl + asl20 isc mit bsd3 From c95158747779baf6c2cfcb596de37c63fe20f8dc Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 20 Oct 2025 15:17:50 +0200 Subject: [PATCH 1058/2279] boringssl: refactor build Co-Authored-By: Theo Paris --- pkgs/by-name/bo/boringssl/package.nix | 38 +-------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index ec0d2186b3c4..71f09d807713 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -5,12 +5,11 @@ cmake, ninja, perl, - buildGoModule, gitUpdater, }: # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md -buildGoModule (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "boringssl"; version = "0.20251002.0"; @@ -31,18 +30,6 @@ buildGoModule (finalAttrs: { perl ]; - vendorHash = "sha256-IXmnoCYLoiQ/XL2wjksRFv5Kwsje0VNkcupgGxG6rSY="; - proxyVendor = true; - - # hack to get both go and cmake configure phase - # (if we use postConfigure then cmake will loop runHook postConfigure) - preBuild = '' - cmakeConfigurePhase - '' - + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - export GOARCH=$(go env GOHOSTARCH) - ''; - env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 but breaks on darwin (with clang) @@ -53,29 +40,6 @@ buildGoModule (finalAttrs: { ] ); - buildPhase = '' - ninjaBuildPhase - ''; - - # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. - cmakeFlags = [ - "-GNinja" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $bin/bin $dev $out/lib - - install -Dm755 bssl -t $bin/bin - install -Dm644 {libcrypto,libdecrepit,libpki,libssl}.a -t $out/lib - - cp -r ../include $dev - - runHook postInstall - ''; - outputs = [ "out" "bin" From 905b80d01a8a97b10c9bbd8098803b915e4b0d40 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 20 Oct 2025 17:39:46 +0200 Subject: [PATCH 1059/2279] boringssl: add maintainers theoparis and niklaskorz --- pkgs/by-name/bo/boringssl/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 71f09d807713..ea8695903891 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -52,7 +52,11 @@ stdenv.mkDerivation (finalAttrs: { description = "Free TLS/SSL implementation"; mainProgram = "bssl"; homepage = "https://boringssl.googlesource.com"; - maintainers = [ lib.maintainers.thoughtpolice ]; + maintainers = with lib.maintainers; [ + thoughtpolice + theoparis + niklaskorz + ]; license = with lib.licenses; [ asl20 isc From 79dbe83fce77b6d16e5d0b8fec4079fce638c8ca Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 3 Oct 2025 22:12:16 +0000 Subject: [PATCH 1060/2279] scip: 0.5.1 -> 0.6.0 Diff: https://github.com/sourcegraph/scip/compare/v0.5.1...v0.6.0 Changelog: https://github.com/sourcegraph/scip/blob/v0.6.0/CHANGELOG.md --- pkgs/by-name/sc/scip/package.nix | 58 +++++++++++++++++++------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix index d9cfa6444b3b..7ba2d321cc1e 100644 --- a/pkgs/by-name/sc/scip/package.nix +++ b/pkgs/by-name/sc/scip/package.nix @@ -1,23 +1,25 @@ { lib, - buildGoModule, + stdenv, + buildGo124Module, fetchFromGitHub, - testers, - scip, + libredirect, + iana-etc, + versionCheckHook, }: -buildGoModule rec { +buildGo124Module (finalAttrs: { pname = "scip"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; - rev = "v${version}"; - hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZyU1CmDBVDNP6zCXpvqEoQ3ttWNPGLCIjkj4mezUcKc="; }; - vendorHash = "sha256-6vx3Dt0ZNR0rY5bEUF5X1hHj/gv21920bhfd+JJ9bYk="; + vendorHash = "sha256-RwBlzBqGd/xEaTL6m3sm6e/tcNUc7Mfdf213qzuMPug="; ldflags = [ "-s" @@ -25,25 +27,35 @@ buildGoModule rec { "-X=main.Reproducible=true" ]; - # update documentation to fix broken test - postPatch = '' - substituteInPlace docs/CLI.md \ - --replace 0.3.0 0.3.1 + nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ]; + + checkFlags = + let + skippedTests = [ + "TestParseCompat" # could not locate sample indexes directory starting from parents of working directory + "TestParseSymbol_ZeroAllocationsIfMemoryAvailable" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + __darwinAllowLocalNetworking = true; + + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services ''; - passthru.tests = { - version = testers.testVersion { - package = scip; - version = "v${version}"; - }; - }; + doInstallCheck = stdenv.hostPlatform.isLinux; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + meta = { description = "SCIP Code Intelligence Protocol CLI"; mainProgram = "scip"; homepage = "https://github.com/sourcegraph/scip"; - changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + changelog = "https://github.com/sourcegraph/scip/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ ]; }; -} +}) From dab7117a3b88aaacb4ab8d1643949bea87e5de0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 12:58:28 +0000 Subject: [PATCH 1061/2279] kube-bench: 0.13.0 -> 0.14.0 --- pkgs/by-name/ku/kube-bench/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 6b3bd12cbb70..d9d1aeff0645 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "kube-bench"; - version = "0.13.0"; + version = "0.14.0"; __darwinAllowLocalNetworking = true; # required for tests @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "aquasecurity"; repo = "kube-bench"; tag = "v${finalAttrs.version}"; - hash = "sha256-5P8kF8k25E7dezhQ7oKKlu/6y9Ofq3nAeenAI7IOBwE="; + hash = "sha256-zu1ckblQnn3Df71myPIYebIQHjMi7S3LoSbsY8RAiVQ="; }; - vendorHash = "sha256-vueIQbsF34lkmIFpH8DiOSjxEBevxxiJLd0L/sQwJBE="; + vendorHash = "sha256-qRtEkYL+OgcfdYS+u2vRynr+6w6ZEEURxOXE/vCt2fM="; nativeBuildInputs = [ installShellFiles ]; From 8336641e79f7058eaf75b95ed12b5c724e69e988 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 12:59:06 +0000 Subject: [PATCH 1062/2279] runc: 1.3.2 -> 1.3.3 --- pkgs/by-name/ru/runc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/runc/package.nix b/pkgs/by-name/ru/runc/package.nix index 590910d5ac68..6e0fc961a771 100644 --- a/pkgs/by-name/ru/runc/package.nix +++ b/pkgs/by-name/ru/runc/package.nix @@ -16,13 +16,13 @@ buildGoModule (finalAttrs: { pname = "runc"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yva0zrcnuHCuIYVi07sxTxNc4fOXVo93jO1hbHjdYNo="; + hash = "sha256-Ci/2otySB7FaFoutmzWeVaTU+tO/lnluQfneFSQM1RE="; }; vendorHash = null; From 5be63ef46e71e4c4fa8f586116051dafa904d63e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 13:03:49 +0000 Subject: [PATCH 1063/2279] vscode-extensions.vscjava.vscode-java-dependency: 0.26.2 -> 0.26.3 --- 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 1a5b850fe551..2eaefaa41c30 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5050,8 +5050,8 @@ let mktplcRef = { publisher = "vscjava"; name = "vscode-java-dependency"; - version = "0.26.2"; - hash = "sha256-msRaLNS1a5BXY3GN1MmOi9jBbNj6aqJDbZkFc1pLG3I="; + version = "0.26.3"; + hash = "sha256-o7FWpesuG6qS1UFVaSQ97X3sWc/6vOOZPy/iid3nNJs="; }; meta = { license = lib.licenses.mit; From ba205aa3c40f197034221925325f1af938bd181e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 13:22:09 +0000 Subject: [PATCH 1064/2279] python3Packages.json-stream-rs-tokenizer: 0.4.30 -> 0.4.31 --- .../python-modules/json-stream-rs-tokenizer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix index d09ead373c51..0f08c6891bee 100644 --- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix +++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "json-stream-rs-tokenizer"; - version = "0.4.30"; + version = "0.4.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,12 +26,12 @@ buildPythonPackage rec { owner = "smheidrich"; repo = "py-json-stream-rs-tokenizer"; tag = "v${version}"; - hash = "sha256-kzeEG42KcmczIC69aJe1dkqeBpMYn5uBBj1Ni+/+sTM="; + hash = "sha256-n+ZPB1BGUHEanpLpe4ZO6LjbxTALJ4Ns9/Hn7nE3mpc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Zvtu7pH50hPPuLKVn7itcuO+BeSJKRQmZCWtQkMIZI8="; + hash = "sha256-IPQrqayhyQ/gmT6nK+TgDcUQ4mPrG9yiJJk6enBzybA="; }; nativeBuildInputs = [ From e53443455a1dea3a4a1f7325ff9b3df9eb413314 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 13:27:09 +0000 Subject: [PATCH 1065/2279] temporal-cli: 1.5.0 -> 1.5.1 --- pkgs/by-name/te/temporal-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index a8b9aa69f393..cfd4ce4208b6 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "temporal-cli"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-V0ob6Y7ns0ZEH1nZUIDFXxw8JFSzqbMoS4x2KT8pV+k="; + hash = "sha256-Y/hTD31WUcVn/OBuNwdhbjDZd36EKbOJRr9PFDKHifg="; }; - vendorHash = "sha256-ZftQ1jt4y6HUF4aI2x3i7hnqNO4GKgblzjS1Zzb9sWo="; + vendorHash = "sha256-dZhrozZc3SeZQQ7lGeeICrptL2I0DH0EpsjCt4CjCJU="; overrideModAttrs = old: { # https://gitlab.com/cznic/libc/-/merge_requests/10 From ad4450ca527b6080f55d5bec7979c94ed5832abf Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Wed, 5 Nov 2025 21:49:17 +0800 Subject: [PATCH 1066/2279] qq: 3.2.20-2025-10-23 -> 3.2.21-2025-11-05 --- pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 04c0bf153bd8..5197817bb9cc 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,12 +1,12 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-10-24 +# Last updated: 2025-11-05 { fetchurl }: let any-darwin = { - version = "6.9.82-2025-10-23"; + version = "6.9.83-2025-11-05"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.82_251023_01.dmg"; - hash = "sha256-oBhThy9NC0W6gyztHQCL88NDdQrYHzZ27RAzTGcyyRY="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.83_251105_01.dmg"; + hash = "sha256-/tXuL9WszgWSIFpBSQnmAhRnhNNrK4qCf4uVgBC/DBk="; }; }; in @@ -14,17 +14,17 @@ in aarch64-darwin = any-darwin; x86_64-darwin = any-darwin; aarch64-linux = { - version = "3.2.20-2025-10-23"; + version = "3.2.21-2025-11-05"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_arm64_01.deb"; - hash = "sha256-m90k4S0BAA3R4alRl+1ZfLK3q35LnCVBMUOcJpALIYU="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_arm64_01.deb"; + hash = "sha256-THK5bjq3fGJiGndvIwq+o7t0gKGtthd9JNXf0A0RwCs="; }; }; x86_64-linux = { - version = "3.2.20-2025-10-23"; + version = "3.2.21-2025-11-05"; src = fetchurl { - url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_amd64_01.deb"; - hash = "sha256-PIq2FPB+LpnyfzE51o9eulw93/BofPrlU+PqUyYlh2M="; + url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_amd64_01.deb"; + hash = "sha256-ERQB+fuf0HBR0TOOGauA+38Qz0QaeoH0EdyICeDe7eY="; }; }; } From ba143987f5636b504e5c5addea7d5099b7f26a12 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 5 Nov 2025 22:24:25 +0800 Subject: [PATCH 1067/2279] nezha-theme-user: add missing node_modules/@esbuild/* --- .../ne/nezha-theme-user/package-lock.json | 2211 ++++++++++++----- pkgs/by-name/ne/nezha-theme-user/package.nix | 2 +- 2 files changed, 1651 insertions(+), 562 deletions(-) diff --git a/pkgs/by-name/ne/nezha-theme-user/package-lock.json b/pkgs/by-name/ne/nezha-theme-user/package-lock.json index 9a742fa2bdec..39c7a1d66af0 100644 --- a/pkgs/by-name/ne/nezha-theme-user/package-lock.json +++ b/pkgs/by-name/ne/nezha-theme-user/package-lock.json @@ -72,6 +72,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -80,55 +81,69 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", - "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.25.9", + "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" + "picocolors": "^1.1.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/generator": { - "version": "7.26.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", - "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz", + "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==", + "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.5", - "@babel/types": "^7.26.5", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", + "@babel/parser": "^7.28.5", + "@babel/types": "^7.28.5", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/helper-globals": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", + "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-string-parser": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", - "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", - "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz", - "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", + "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.26.7" + "@babel/types": "^7.28.5" }, "bin": { "parser": "bin/babel-parser.js" @@ -138,92 +153,331 @@ } }, "node_modules/@babel/runtime": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", - "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", - "dependencies": { - "regenerator-runtime": "^0.14.0" - }, + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", + "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "version": "7.27.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", + "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/template/node_modules/@babel/parser": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz", - "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==", - "dependencies": { - "@babel/types": "^7.26.3" - }, - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/template/node_modules/@babel/types": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz", - "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==", - "dependencies": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" + "@babel/code-frame": "^7.27.1", + "@babel/parser": "^7.27.2", + "@babel/types": "^7.27.1" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz", - "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz", + "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==", + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.7", - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.7", - "debug": "^4.3.1", - "globals": "^11.1.0" + "@babel/code-frame": "^7.27.1", + "@babel/generator": "^7.28.5", + "@babel/helper-globals": "^7.28.0", + "@babel/parser": "^7.28.5", + "@babel/template": "^7.27.2", + "@babel/types": "^7.28.5", + "debug": "^4.3.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/types": { - "version": "7.26.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz", - "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", + "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.25.9", - "@babel/helper-validator-identifier": "^7.25.9" + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/linux-x64": { "version": "0.24.2", "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", @@ -232,6 +486,7 @@ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -240,17 +495,157 @@ "node": ">=18" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "dev": true, + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } @@ -260,6 +655,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -268,10 +664,11 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -281,6 +678,7 @@ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", @@ -295,6 +693,7 @@ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, @@ -303,10 +702,11 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz", - "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -330,6 +730,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -342,26 +743,29 @@ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz", - "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", + "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.12.0", + "@eslint/core": "^0.13.0", "levn": "^0.4.1" }, "engines": { @@ -369,10 +773,11 @@ } }, "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", - "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, @@ -381,28 +786,31 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz", - "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz", + "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==", + "license": "MIT", "dependencies": { - "@floating-ui/utils": "^0.2.8" + "@floating-ui/utils": "^0.2.10" } }, "node_modules/@floating-ui/dom": { - "version": "1.6.11", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz", - "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz", + "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==", + "license": "MIT", "dependencies": { - "@floating-ui/core": "^1.6.0", - "@floating-ui/utils": "^0.2.8" + "@floating-ui/core": "^1.7.3", + "@floating-ui/utils": "^0.2.10" } }, "node_modules/@floating-ui/react-dom": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz", - "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz", + "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==", + "license": "MIT", "dependencies": { - "@floating-ui/dom": "^1.0.0" + "@floating-ui/dom": "^1.7.4" }, "peerDependencies": { "react": ">=16.8.0", @@ -410,19 +818,22 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", - "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz", + "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==", + "license": "MIT" }, "node_modules/@fontsource/inter": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.1.tgz", - "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw==" + "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw==", + "license": "OFL-1.1" }, "node_modules/@heroicons/react": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz", "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==", + "license": "MIT", "peerDependencies": { "react": ">= 16 || ^19.0.0-rc" } @@ -432,41 +843,31 @@ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18.0" } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -476,10 +877,11 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", - "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -492,6 +894,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -504,59 +907,36 @@ "node": ">=12" } }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==" + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -566,6 +946,7 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -578,6 +959,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -586,6 +968,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -598,6 +981,7 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/@number-flow/react/-/react-0.5.5.tgz", "integrity": "sha512-Zdju5n0osxrb+7jbcpUJ9L2VJ2+9ptwjz5+A+2wq9Q32hs3PW/noPJjHtLTrtGINM9mEw76DcDg0ac/dx6j1aA==", + "license": "MIT", "dependencies": { "esm-env": "^1.1.4", "number-flow": "0.5.3" @@ -611,6 +995,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", "optional": true, "engines": { "node": ">=14" @@ -619,17 +1004,20 @@ "node_modules/@radix-ui/number": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz", - "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==" + "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==", + "license": "MIT" }, "node_modules/@radix-ui/primitive": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz", - "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==" + "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==", + "license": "MIT" }, "node_modules/@radix-ui/react-accordion": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz", "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collapsible": "1.1.3", @@ -660,6 +1048,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz", "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==", + "license": "MIT", "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, @@ -682,6 +1071,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz", "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -711,6 +1101,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.3.tgz", "integrity": "sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -740,6 +1131,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz", "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==", + "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-context": "1.1.1", @@ -765,6 +1157,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -779,6 +1172,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -793,6 +1187,7 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz", "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -828,6 +1223,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz", "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -842,6 +1238,7 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -868,6 +1265,7 @@ "version": "2.1.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz", "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -896,6 +1294,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -910,6 +1309,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", + "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-primitive": "2.0.2", @@ -934,6 +1334,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", + "license": "MIT", "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.0" }, @@ -951,6 +1352,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz", "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==", + "license": "MIT", "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, @@ -973,6 +1375,7 @@ "version": "2.1.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz", "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", @@ -1012,6 +1415,7 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz", "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -1048,6 +1452,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz", "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==", + "license": "MIT", "dependencies": { "@floating-ui/react-dom": "^2.0.0", "@radix-ui/react-arrow": "1.1.2", @@ -1079,6 +1484,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", + "license": "MIT", "dependencies": { "@radix-ui/react-primitive": "2.0.2", "@radix-ui/react-use-layout-effect": "1.1.0" @@ -1102,6 +1508,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz", "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==", + "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1", "@radix-ui/react-use-layout-effect": "1.1.0" @@ -1125,6 +1532,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz", "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==", + "license": "MIT", "dependencies": { "@radix-ui/react-slot": "1.1.2" }, @@ -1147,6 +1555,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.2.tgz", "integrity": "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA==", + "license": "MIT", "dependencies": { "@radix-ui/react-context": "1.1.1", "@radix-ui/react-primitive": "2.0.2" @@ -1170,6 +1579,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz", "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-collection": "1.1.2", @@ -1200,6 +1610,7 @@ "version": "2.1.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz", "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==", + "license": "MIT", "dependencies": { "@radix-ui/number": "1.1.0", "@radix-ui/primitive": "1.1.1", @@ -1242,6 +1653,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz", "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==", + "license": "MIT", "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, @@ -1264,6 +1676,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz", "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==", + "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "1.1.1" }, @@ -1281,6 +1694,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.3.tgz", "integrity": "sha512-1nc+vjEOQkJVsJtWPSiISGT6OKm4SiOdjMo+/icLxo2G4vxz1GntC5MzfL4v8ey9OEfw787QCD1y3mUv0NiFEQ==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -1309,6 +1723,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.8.tgz", "integrity": "sha512-YAA2cu48EkJZdAMHC0dqo9kialOcRStbtiY4nJPaht7Ptrhcvpo+eDChaM6BIs8kL6a8Z5l5poiqLnXcNduOkA==", + "license": "MIT", "dependencies": { "@radix-ui/primitive": "1.1.1", "@radix-ui/react-compose-refs": "1.1.1", @@ -1342,6 +1757,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -1356,6 +1772,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", + "license": "MIT", "dependencies": { "@radix-ui/react-use-callback-ref": "1.1.0" }, @@ -1373,6 +1790,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", + "license": "MIT", "dependencies": { "@radix-ui/react-use-callback-ref": "1.1.0" }, @@ -1390,6 +1808,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -1404,6 +1823,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz", "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==", + "license": "MIT", "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -1418,6 +1838,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz", "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==", + "license": "MIT", "dependencies": { "@radix-ui/rect": "1.1.0" }, @@ -1435,6 +1856,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", + "license": "MIT", "dependencies": { "@radix-ui/react-use-layout-effect": "1.1.0" }, @@ -1452,6 +1874,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz", "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==", + "license": "MIT", "dependencies": { "@radix-ui/react-primitive": "2.0.2" }, @@ -1473,43 +1896,327 @@ "node_modules/@radix-ui/rect": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz", - "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==" + "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", + "license": "MIT" }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.34.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz", - "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==", + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz", + "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz", + "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz", + "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz", + "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz", + "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz", + "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz", + "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz", + "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz", + "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz", + "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz", + "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz", + "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz", + "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz", + "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz", + "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz", + "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.34.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz", - "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==", + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz", + "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ] }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz", + "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz", + "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz", + "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz", + "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz", + "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@swc/core": { - "version": "1.10.15", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.15.tgz", - "integrity": "sha512-/iFeQuNaGdK7mfJbQcObhAhsMqLT7qgMYl7jX2GEIO+VDTejESpzAyKwaMeYXExN8D6e5BRHBCe7M5YlsuzjDA==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.0.tgz", + "integrity": "sha512-8SnJV+JV0rYbfSiEiUvYOmf62E7QwsEG+aZueqSlKoxFt0pw333+bgZSQXGUV6etXU88nxur0afVMaINujBMSw==", "dev": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { "@swc/counter": "^0.1.3", - "@swc/types": "^0.1.17" + "@swc/types": "^0.1.25" }, "engines": { "node": ">=10" @@ -1519,19 +2226,19 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.10.15", - "@swc/core-darwin-x64": "1.10.15", - "@swc/core-linux-arm-gnueabihf": "1.10.15", - "@swc/core-linux-arm64-gnu": "1.10.15", - "@swc/core-linux-arm64-musl": "1.10.15", - "@swc/core-linux-x64-gnu": "1.10.15", - "@swc/core-linux-x64-musl": "1.10.15", - "@swc/core-win32-arm64-msvc": "1.10.15", - "@swc/core-win32-ia32-msvc": "1.10.15", - "@swc/core-win32-x64-msvc": "1.10.15" + "@swc/core-darwin-arm64": "1.15.0", + "@swc/core-darwin-x64": "1.15.0", + "@swc/core-linux-arm-gnueabihf": "1.15.0", + "@swc/core-linux-arm64-gnu": "1.15.0", + "@swc/core-linux-arm64-musl": "1.15.0", + "@swc/core-linux-x64-gnu": "1.15.0", + "@swc/core-linux-x64-musl": "1.15.0", + "@swc/core-win32-arm64-msvc": "1.15.0", + "@swc/core-win32-ia32-msvc": "1.15.0", + "@swc/core-win32-x64-msvc": "1.15.0" }, "peerDependencies": { - "@swc/helpers": "*" + "@swc/helpers": ">=0.5.17" }, "peerDependenciesMeta": { "@swc/helpers": { @@ -1539,14 +2246,100 @@ } } }, - "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.10.15", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.15.tgz", - "integrity": "sha512-S1+ZEEn3+a/MiMeQqQypbwTGoBG8/sPoCvpNbk+uValyygT+jSn3U0xVr45FbukpmMB+NhBMqfedMLqKA0QnJA==", + "node_modules/@swc/core-darwin-arm64": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.0.tgz", + "integrity": "sha512-TBKWkbnShnEjlIbO4/gfsrIgAqHBVqgPWLbWmPdZ80bF393yJcLgkrb7bZEnJs6FCbSSuGwZv2rx1jDR2zo6YA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-darwin-x64": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.0.tgz", + "integrity": "sha512-f5JKL1v1H56CIZc1pVn4RGPOfnWqPwmuHdpf4wesvXunF1Bx85YgcspW5YxwqG5J9g3nPU610UFuExJXVUzOiQ==", "cpu": [ "x64" ], "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm-gnueabihf": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.0.tgz", + "integrity": "sha512-duK6nG+WyuunnfsfiTUQdzC9Fk8cyDLqT9zyXvY2i2YgDu5+BH5W6wM5O4mDNCU5MocyB/SuF5YDF7XySnowiQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm64-gnu": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.0.tgz", + "integrity": "sha512-ITe9iDtTRXM98B91rvyPP6qDVbhUBnmA/j4UxrHlMQ0RlwpqTjfZYZkD0uclOxSZ6qIrOj/X5CaoJlDUuQ0+Cw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-arm64-musl": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.0.tgz", + "integrity": "sha512-Q5ldc2bzriuzYEoAuqJ9Vr3FyZhakk5hiwDbniZ8tlEXpbjBhbOleGf9/gkhLaouDnkNUEazFW9mtqwUTRdh7Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-linux-x64-gnu": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.0.tgz", + "integrity": "sha512-pY4is+jEpOxlYCSnI+7N8Oxbap9TmTz5YT84tUvRTlOlTBwFAUlWFCX0FRwWJlsfP0TxbqhIe8dNNzlsEmJbXQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", "optional": true, "os": [ "linux" @@ -1556,13 +2349,14 @@ } }, "node_modules/@swc/core-linux-x64-musl": { - "version": "1.10.15", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.15.tgz", - "integrity": "sha512-qW+H9g/2zTJ4jP7NDw4VAALY0ZlNEKzYsEoSj/HKi7k3tYEHjMzsxjfsY9I8WZCft23bBdV3RTCPoxCshaj1CQ==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.0.tgz", + "integrity": "sha512-zYEt5eT8y8RUpoe7t5pjpoOdGu+/gSTExj8PV86efhj6ugB3bPlj3Y85ogdW3WMVXr4NvwqvzdaYGCZfXzSyVg==", "cpu": [ "x64" ], "dev": true, + "license": "Apache-2.0 AND MIT", "optional": true, "os": [ "linux" @@ -1571,17 +2365,70 @@ "node": ">=10" } }, + "node_modules/@swc/core-win32-arm64-msvc": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.0.tgz", + "integrity": "sha512-zC1rmOgFH5v2BCbByOazEqs0aRNpTdLRchDExfcCfgKgeaD+IdpUOqp7i3VG1YzkcnbuZjMlXfM0ugpt+CddoA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-ia32-msvc": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.0.tgz", + "integrity": "sha512-7t9U9KwMwQblkdJIH+zX1V4q1o3o41i0HNO+VlnAHT5o+5qHJ963PHKJ/pX3P2UlZnBCY465orJuflAN4rAP9A==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, + "node_modules/@swc/core-win32-x64-msvc": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.0.tgz", + "integrity": "sha512-VE0Zod5vcs8iMLT64m5QS1DlTMXJFI/qSgtMDRx8rtZrnjt6/9NW8XUaiPJuRu8GluEO1hmHoyf1qlbY19gGSQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0 AND MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=10" + } + }, "node_modules/@swc/counter": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/@swc/types": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz", - "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==", + "version": "0.1.25", + "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz", + "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@swc/counter": "^0.1.3" } @@ -1590,6 +2437,7 @@ "version": "5.66.4", "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.66.4.tgz", "integrity": "sha512-skM/gzNX4shPkqmdTCSoHtJAPMTtmIJNS0hE+xwTTUVYwezArCT34NMermABmBVUg5Ls5aiUXEDXfqwR1oVkcA==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -1599,6 +2447,7 @@ "version": "5.65.0", "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.65.0.tgz", "integrity": "sha512-g5y7zc07U9D3esMdqUfTEVu9kMHoIaVBsD0+M3LPdAdD710RpTcLiNvJY1JkYXqkq9+NV+CQoemVNpQPBXVsJg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" @@ -1608,6 +2457,7 @@ "version": "5.66.7", "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz", "integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==", + "license": "MIT", "dependencies": { "@tanstack/query-core": "5.66.4" }, @@ -1623,6 +2473,7 @@ "version": "5.66.7", "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz", "integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==", + "license": "MIT", "dependencies": { "@tanstack/query-devtools": "5.65.0" }, @@ -1639,6 +2490,7 @@ "version": "8.21.2", "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz", "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==", + "license": "MIT", "dependencies": { "@tanstack/table-core": "8.21.2" }, @@ -1658,6 +2510,7 @@ "version": "8.21.2", "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz", "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -1670,6 +2523,7 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz", "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==", + "license": "Apache-2.0", "dependencies": { "@babel/generator": "^7.26.5", "@babel/parser": "^7.26.7", @@ -1702,27 +2556,32 @@ "node_modules/@types/cookie": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" }, "node_modules/@types/d3-array": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz", - "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz", + "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==", + "license": "MIT" }, "node_modules/@types/d3-color": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", - "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==" + "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==", + "license": "MIT" }, "node_modules/@types/d3-ease": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", - "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==" + "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==", + "license": "MIT" }, "node_modules/@types/d3-geo": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz", "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==", + "license": "MIT", "dependencies": { "@types/geojson": "*" } @@ -1731,68 +2590,79 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", + "license": "MIT", "dependencies": { "@types/d3-color": "*" } }, "node_modules/@types/d3-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz", - "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz", + "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==", + "license": "MIT" }, "node_modules/@types/d3-scale": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", - "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz", + "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==", + "license": "MIT", "dependencies": { "@types/d3-time": "*" } }, "node_modules/@types/d3-shape": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz", - "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz", + "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==", + "license": "MIT", "dependencies": { "@types/d3-path": "*" } }, "node_modules/@types/d3-time": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz", - "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", + "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==", + "license": "MIT" }, "node_modules/@types/d3-timer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", - "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==" + "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==", + "license": "MIT" }, "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" }, "node_modules/@types/geojson": { - "version": "7946.0.14", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", - "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" + "version": "7946.0.16", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", + "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", + "license": "MIT" }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/luxon": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", - "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==" + "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", + "license": "MIT" }, "node_modules/@types/node": { "version": "22.13.4", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz", "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~6.20.0" } @@ -1802,6 +2672,7 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz", "integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==", "devOptional": true, + "license": "MIT", "dependencies": { "csstype": "^3.0.2" } @@ -1811,6 +2682,7 @@ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.4.tgz", "integrity": "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==", "devOptional": true, + "license": "MIT", "peerDependencies": { "@types/react": "^19.0.0" } @@ -1820,6 +2692,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz", "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.24.1", @@ -1849,6 +2722,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz", "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/scope-manager": "8.24.1", "@typescript-eslint/types": "8.24.1", @@ -1873,6 +2747,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz", "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/types": "8.24.1", "@typescript-eslint/visitor-keys": "8.24.1" @@ -1890,6 +2765,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz", "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "8.24.1", "@typescript-eslint/utils": "8.24.1", @@ -1913,6 +2789,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz", "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1926,6 +2803,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz", "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/types": "8.24.1", "@typescript-eslint/visitor-keys": "8.24.1", @@ -1947,11 +2825,22 @@ "typescript": ">=4.8.4 <5.8.0" } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1962,20 +2851,12 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/@typescript-eslint/utils": { "version": "8.24.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz", "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@typescript-eslint/scope-manager": "8.24.1", @@ -1999,6 +2880,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz", "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/types": "8.24.1", "eslint-visitor-keys": "^4.2.0" @@ -2016,6 +2898,7 @@ "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.8.0.tgz", "integrity": "sha512-T4sHPvS+DIqDP51ifPqa9XIRAz/kIvIi8oXcnOZZgHmMotgmmdxe/DD5tMFlt5nuIRzT0/QuiwmKlH0503Aapw==", "dev": true, + "license": "MIT", "dependencies": { "@swc/core": "^1.10.15" }, @@ -2024,10 +2907,11 @@ } }, "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -2040,6 +2924,7 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -2049,6 +2934,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -2061,9 +2947,10 @@ } }, "node_modules/ansi-regex": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", - "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -2075,6 +2962,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -2088,12 +2976,14 @@ "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "license": "MIT" }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -2105,18 +2995,21 @@ "node_modules/arg": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==" + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "license": "MIT" }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/aria-hidden": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz", - "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz", + "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -2143,6 +3036,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "browserslist": "^4.23.3", "caniuse-lite": "^1.0.30001646", @@ -2164,12 +3058,24 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/baseline-browser-mapping": { + "version": "2.8.25", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.25.tgz", + "integrity": "sha512-2NovHVesVF5TXefsGX1yzx1xgr7+m9JQenvz6FQY3qd+YXkKkYiv+vTCc7OriP9mcDZpTC5mAOYN4ocd29+erA==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "license": "MIT", "engines": { "node": ">=8" }, @@ -2178,10 +3084,11 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2191,6 +3098,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -2199,9 +3107,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", - "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "version": "4.27.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz", + "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==", "dev": true, "funding": [ { @@ -2217,11 +3125,13 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001688", - "electron-to-chromium": "^1.5.73", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.1" + "baseline-browser-mapping": "^2.8.19", + "caniuse-lite": "^1.0.30001751", + "electron-to-chromium": "^1.5.238", + "node-releases": "^2.0.26", + "update-browserslist-db": "^1.1.4" }, "bin": { "browserslist": "cli.js" @@ -2235,6 +3145,7 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2243,14 +3154,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", + "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001703", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001703.tgz", - "integrity": "sha512-kRlAGTRWgPsOj7oARC9m1okJEXdL/8fekFVcxA8Hl7GH4r/sN4OJn/i6Flde373T50KS7Y37oFbMwlE8+F42kQ==", + "version": "1.0.30001753", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001753.tgz", + "integrity": "sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw==", "dev": true, "funding": [ { @@ -2265,13 +3177,15 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -2287,6 +3201,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -2310,6 +3225,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2321,6 +3237,7 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz", "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==", + "license": "Apache-2.0", "dependencies": { "clsx": "^2.1.1" }, @@ -2332,6 +3249,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -2340,6 +3258,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz", "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==", + "license": "MIT", "dependencies": { "@radix-ui/react-compose-refs": "^1.1.1", "@radix-ui/react-dialog": "^1.1.6", @@ -2355,6 +3274,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -2365,12 +3285,14 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "license": "MIT", "engines": { "node": ">= 6" } @@ -2379,12 +3301,14 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cookie": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "license": "MIT", "engines": { "node": ">=18" } @@ -2392,13 +3316,14 @@ "node_modules/country-flag-icons": { "version": "1.5.18", "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.18.tgz", - "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ==" + "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ==", + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -2412,6 +3337,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", "bin": { "cssesc": "bin/cssesc" }, @@ -2422,12 +3348,14 @@ "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" }, "node_modules/d3-array": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "license": "ISC", "dependencies": { "internmap": "1 - 2" }, @@ -2439,6 +3367,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "license": "ISC", "engines": { "node": ">=12" } @@ -2447,6 +3376,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "license": "BSD-3-Clause", "engines": { "node": ">=12" } @@ -2455,6 +3385,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "license": "ISC", "engines": { "node": ">=12" } @@ -2463,6 +3394,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz", "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==", + "license": "ISC", "dependencies": { "d3-array": "2.5.0 - 3" }, @@ -2474,6 +3406,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "license": "ISC", "dependencies": { "d3-color": "1 - 3" }, @@ -2485,6 +3418,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", + "license": "ISC", "engines": { "node": ">=12" } @@ -2493,6 +3427,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", + "license": "ISC", "dependencies": { "d3-array": "2.10.0 - 3", "d3-format": "1 - 3", @@ -2508,6 +3443,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", + "license": "ISC", "dependencies": { "d3-path": "^3.1.0" }, @@ -2519,6 +3455,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", + "license": "ISC", "dependencies": { "d3-array": "2 - 3" }, @@ -2530,6 +3467,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "license": "ISC", "dependencies": { "d3-time": "1 - 3" }, @@ -2541,6 +3479,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "license": "ISC", "engines": { "node": ">=12" } @@ -2548,12 +3487,14 @@ "node_modules/dayjs": { "version": "1.11.13", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", + "license": "MIT" }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -2569,38 +3510,45 @@ "node_modules/decimal.js-light": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz", - "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==" + "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==", + "license": "MIT" }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/detect-node-es": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", - "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==" + "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", + "license": "MIT" }, "node_modules/diacritics": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz", - "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==" + "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==", + "license": "MIT" }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==" + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "license": "Apache-2.0" }, "node_modules/dlv": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "license": "MIT" }, "node_modules/dom-helpers": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -2609,18 +3557,21 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.114", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.114.tgz", - "integrity": "sha512-DFptFef3iktoKlFQK/afbo274/XNWD00Am0xa7M8FZUepHlHT8PEuiNBoRfFHbH1okqN58AlhbJ4QTkcnXorjA==", - "dev": true + "version": "1.5.245", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.245.tgz", + "integrity": "sha512-rdmGfW47ZhL/oWEJAY4qxRtdly2B98ooTJ0pdEI4jhVLZ6tNf8fPtov2wS1IRKwFJT92le3x4Knxiwzl7cPPpQ==", + "dev": true, + "license": "ISC" }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" }, "node_modules/esbuild": { "version": "0.24.2", @@ -2628,6 +3579,7 @@ "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -2667,6 +3619,7 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2676,6 +3629,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -2688,6 +3642,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz", "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", @@ -2747,6 +3702,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz", "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -2759,15 +3715,17 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz", "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==", "dev": true, + "license": "MIT", "peerDependencies": { "eslint": ">=8.40" } }, "node_modules/eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -2780,10 +3738,11 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -2794,17 +3753,19 @@ "node_modules/esm-env": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz", - "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==" + "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==", + "license": "MIT" }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" + "eslint-visitor-keys": "^4.2.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2818,6 +3779,7 @@ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -2830,6 +3792,7 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -2842,6 +3805,7 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -2851,6 +3815,7 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -2858,32 +3823,36 @@ "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "license": "MIT" }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-equals": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.0.1.tgz", - "integrity": "sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.2.tgz", + "integrity": "sha512-6rxyATwPCkaFIL3JLqw8qXqMpIZ942pTX/tbQFkRsDGblS8tNGtlUauA/+mt6RUfqn/4MoEr+WDkYoIQbibWuQ==", + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" @@ -2893,6 +3862,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2904,18 +3874,21 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -2925,6 +3898,7 @@ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, + "license": "MIT", "dependencies": { "flat-cache": "^4.0.0" }, @@ -2936,6 +3910,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -2948,6 +3923,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -2964,6 +3940,7 @@ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, + "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" @@ -2973,17 +3950,19 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" }, "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", + "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" }, "engines": { @@ -2993,24 +3972,12 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/foreground-child/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/fraction.js": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", "dev": true, + "license": "MIT", "engines": { "node": "*" }, @@ -3023,6 +3990,7 @@ "version": "12.4.5", "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.4.5.tgz", "integrity": "sha512-9+8wglyIJFeUpVg4U8Ohvoo5x7zmvRqawWXhEUThcYdwL/5A1/OkLvQo68Zz5taUE11HKG/Ex+LPaN2+fMkRdA==", + "license": "MIT", "dependencies": { "motion-dom": "^12.4.5", "motion-utils": "^12.0.0", @@ -3045,10 +4013,25 @@ } } }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3057,6 +4040,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", + "license": "MIT", "engines": { "node": ">=6" } @@ -3065,6 +4049,7 @@ "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", @@ -3084,6 +4069,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -3091,10 +4077,20 @@ "node": ">=10.13.0" } }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/glob/node_modules/minimatch": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3105,19 +4101,12 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/glob/node_modules/minimatch/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/globals": { "version": "15.15.0", "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -3129,13 +4118,15 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3144,6 +4135,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -3155,6 +4147,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz", "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==", + "license": "MIT", "dependencies": { "void-elements": "3.1.0" } @@ -3163,6 +4156,7 @@ "version": "7.14.0", "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.14.0.tgz", "integrity": "sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==", + "license": "MIT", "dependencies": { "diacritics": "1.3.0" }, @@ -3188,6 +4182,7 @@ "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" } ], + "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.2" }, @@ -3205,15 +4200,17 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -3230,6 +4227,7 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -3238,6 +4236,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", + "license": "ISC", "engines": { "node": ">=12" } @@ -3246,6 +4245,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -3254,9 +4254,10 @@ } }, "node_modules/is-core-module": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", - "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -3271,6 +4272,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3279,6 +4281,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -3287,6 +4290,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -3298,6 +4302,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -3305,12 +4310,14 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" }, "node_modules/jackspeak": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -3324,12 +4331,14 @@ "node_modules/javascript-natural-sort": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", - "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==" + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", + "license": "MIT" }, "node_modules/jiti": { - "version": "1.21.6", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", - "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", + "version": "1.21.7", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", + "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "license": "MIT", "bin": { "jiti": "bin/jiti.js" } @@ -3337,13 +4346,15 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -3355,6 +4366,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -3366,25 +4378,29 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -3394,6 +4410,7 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -3406,6 +4423,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", + "license": "MIT", "engines": { "node": ">=14" }, @@ -3416,13 +4434,15 @@ "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -3436,18 +4456,21 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "license": "MIT", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -3458,12 +4481,14 @@ "node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" }, "node_modules/lucide-react": { "version": "0.460.0", "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.460.0.tgz", "integrity": "sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==", + "license": "ISC", "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc" } @@ -3472,6 +4497,7 @@ "version": "3.5.0", "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", + "license": "MIT", "engines": { "node": ">=12" } @@ -3480,6 +4506,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "license": "MIT", "engines": { "node": ">= 8" } @@ -3488,6 +4515,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -3501,6 +4529,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -3512,6 +4541,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -3520,6 +4550,7 @@ "version": "12.5.0", "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.5.0.tgz", "integrity": "sha512-uH2PETDh7m+Hjd1UQQ56yHqwn83SAwNjimNPE/kC+Kds0t4Yh7+29rfo5wezVFpPOv57U4IuWved5d1x0kNhbQ==", + "license": "MIT", "dependencies": { "motion-utils": "^12.5.0" } @@ -3527,17 +4558,20 @@ "node_modules/motion-utils": { "version": "12.5.0", "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.5.0.tgz", - "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA==" + "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA==", + "license": "MIT" }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "license": "MIT", "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", @@ -3545,15 +4579,16 @@ } }, "node_modules/nanoid": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", - "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -3565,18 +4600,21 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true + "version": "2.0.27", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", + "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", + "dev": true, + "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3586,6 +4624,7 @@ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3594,6 +4633,7 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/number-flow/-/number-flow-0.5.3.tgz", "integrity": "sha512-iLKyssImNWQmJ41rza9K7P5lHRZTyishi/9FarWPLQHYY2Ydtl6eiXINEjZ1fa8dHeY0O7+YOD+Py3ZsJddYkg==", + "license": "MIT", "dependencies": { "esm-env": "^1.1.4" } @@ -3602,6 +4642,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3610,6 +4651,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "license": "MIT", "engines": { "node": ">= 6" } @@ -3619,6 +4661,7 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, + "license": "MIT", "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -3636,6 +4679,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -3651,6 +4695,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -3664,13 +4709,15 @@ "node_modules/package-json-from-dist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -3683,6 +4730,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3691,6 +4739,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", "engines": { "node": ">=8" } @@ -3698,12 +4747,14 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" }, "node_modules/path-scurry": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -3718,12 +4769,14 @@ "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -3735,14 +4788,16 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", + "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", + "license": "MIT", "engines": { "node": ">= 6" } @@ -3765,6 +4820,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.8", "picocolors": "^1.1.1", @@ -3778,6 +4834,7 @@ "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", @@ -3791,19 +4848,26 @@ } }, "node_modules/postcss-js": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", - "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz", + "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", "dependencies": { "camelcase-css": "^2.0.1" }, "engines": { "node": "^12 || ^14 || >= 16" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, "peerDependencies": { "postcss": "^8.4.21" } @@ -3822,6 +4886,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "lilconfig": "^3.0.0", "yaml": "^2.3.4" @@ -3842,17 +4907,6 @@ } } }, - "node_modules/postcss-load-config/node_modules/lilconfig": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", - "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/antonk52" - } - }, "node_modules/postcss-nested": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", @@ -3867,6 +4921,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.1.1" }, @@ -3881,6 +4936,7 @@ "version": "6.1.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -3892,21 +4948,24 @@ "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "license": "MIT" }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/prettier": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", - "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", + "license": "MIT", "peer": true, "bin": { "prettier": "bin/prettier.cjs" @@ -3922,6 +4981,7 @@ "version": "0.6.11", "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz", "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==", + "license": "MIT", "engines": { "node": ">=14.21.3" }, @@ -3999,6 +5059,7 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "license": "MIT", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -4008,13 +5069,15 @@ "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "license": "MIT" }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4036,12 +5099,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/react": { "version": "19.0.0", "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4050,6 +5115,7 @@ "version": "19.0.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", + "license": "MIT", "dependencies": { "scheduler": "^0.25.0" }, @@ -4061,6 +5127,7 @@ "version": "15.4.1", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz", "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.25.0", "html-parse-stringify": "^3.0.1" @@ -4081,12 +5148,14 @@ "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "license": "MIT" }, "node_modules/react-remove-scroll": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz", - "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz", + "integrity": "sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==", + "license": "MIT", "dependencies": { "react-remove-scroll-bar": "^2.3.7", "react-style-singleton": "^2.2.3", @@ -4111,6 +5180,7 @@ "version": "2.3.8", "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz", "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==", + "license": "MIT", "dependencies": { "react-style-singleton": "^2.2.2", "tslib": "^2.0.0" @@ -4132,6 +5202,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.2.0.tgz", "integrity": "sha512-fXyqzPgCPZbqhrk7k3hPcCpYIlQ2ugIXDboHUzhJISFVy2DEPsmHgN588MyGmkIOv3jDgNfUE3kJi83L28s/LQ==", + "license": "MIT", "dependencies": { "@types/cookie": "^0.6.0", "cookie": "^1.0.1", @@ -4155,6 +5226,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.2.0.tgz", "integrity": "sha512-cU7lTxETGtQRQbafJubvZKHEn5izNABxZhBY0Jlzdv0gqQhCPQt2J8aN5ZPjS6mQOXn5NnirWNh+FpE8TTYN0Q==", + "license": "MIT", "dependencies": { "react-router": "7.2.0" }, @@ -4170,6 +5242,7 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz", "integrity": "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==", + "license": "MIT", "dependencies": { "fast-equals": "^5.0.1", "prop-types": "^15.8.1", @@ -4184,6 +5257,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz", "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==", + "license": "MIT", "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" @@ -4205,6 +5279,7 @@ "version": "4.4.5", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "license": "BSD-3-Clause", "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -4220,6 +5295,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "license": "MIT", "dependencies": { "pify": "^2.3.0" } @@ -4228,6 +5304,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -4239,6 +5316,7 @@ "version": "2.15.1", "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz", "integrity": "sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==", + "license": "MIT", "dependencies": { "clsx": "^2.0.0", "eventemitter3": "^4.0.1", @@ -4261,27 +5339,27 @@ "version": "0.4.5", "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz", "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==", + "license": "MIT", "dependencies": { "decimal.js-light": "^2.4.1" } }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" - }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.11", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", + "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", + "license": "MIT", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4291,26 +5369,29 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" } }, "node_modules/rollup": { - "version": "4.34.6", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz", - "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==", + "version": "4.52.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz", + "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==", "dev": true, + "license": "MIT", "dependencies": { - "@types/estree": "1.0.6" + "@types/estree": "1.0.8" }, "bin": { "rollup": "dist/bin/rollup" @@ -4320,25 +5401,28 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.34.6", - "@rollup/rollup-android-arm64": "4.34.6", - "@rollup/rollup-darwin-arm64": "4.34.6", - "@rollup/rollup-darwin-x64": "4.34.6", - "@rollup/rollup-freebsd-arm64": "4.34.6", - "@rollup/rollup-freebsd-x64": "4.34.6", - "@rollup/rollup-linux-arm-gnueabihf": "4.34.6", - "@rollup/rollup-linux-arm-musleabihf": "4.34.6", - "@rollup/rollup-linux-arm64-gnu": "4.34.6", - "@rollup/rollup-linux-arm64-musl": "4.34.6", - "@rollup/rollup-linux-loongarch64-gnu": "4.34.6", - "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6", - "@rollup/rollup-linux-riscv64-gnu": "4.34.6", - "@rollup/rollup-linux-s390x-gnu": "4.34.6", - "@rollup/rollup-linux-x64-gnu": "4.34.6", - "@rollup/rollup-linux-x64-musl": "4.34.6", - "@rollup/rollup-win32-arm64-msvc": "4.34.6", - "@rollup/rollup-win32-ia32-msvc": "4.34.6", - "@rollup/rollup-win32-x64-msvc": "4.34.6", + "@rollup/rollup-android-arm-eabi": "4.52.5", + "@rollup/rollup-android-arm64": "4.52.5", + "@rollup/rollup-darwin-arm64": "4.52.5", + "@rollup/rollup-darwin-x64": "4.52.5", + "@rollup/rollup-freebsd-arm64": "4.52.5", + "@rollup/rollup-freebsd-x64": "4.52.5", + "@rollup/rollup-linux-arm-gnueabihf": "4.52.5", + "@rollup/rollup-linux-arm-musleabihf": "4.52.5", + "@rollup/rollup-linux-arm64-gnu": "4.52.5", + "@rollup/rollup-linux-arm64-musl": "4.52.5", + "@rollup/rollup-linux-loong64-gnu": "4.52.5", + "@rollup/rollup-linux-ppc64-gnu": "4.52.5", + "@rollup/rollup-linux-riscv64-gnu": "4.52.5", + "@rollup/rollup-linux-riscv64-musl": "4.52.5", + "@rollup/rollup-linux-s390x-gnu": "4.52.5", + "@rollup/rollup-linux-x64-gnu": "4.52.5", + "@rollup/rollup-linux-x64-musl": "4.52.5", + "@rollup/rollup-openharmony-arm64": "4.52.5", + "@rollup/rollup-win32-arm64-msvc": "4.52.5", + "@rollup/rollup-win32-ia32-msvc": "4.52.5", + "@rollup/rollup-win32-x64-gnu": "4.52.5", + "@rollup/rollup-win32-x64-msvc": "4.52.5", "fsevents": "~2.3.2" } }, @@ -4360,6 +5444,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -4367,13 +5452,15 @@ "node_modules/scheduler": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", - "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==" + "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==", + "license": "MIT" }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -4382,14 +5469,16 @@ } }, "node_modules/set-cookie-parser": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", - "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz", + "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==", + "license": "MIT" }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -4401,6 +5490,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", "engines": { "node": ">=8" } @@ -4409,6 +5499,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", "engines": { "node": ">=14" }, @@ -4420,6 +5511,7 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz", "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==", + "license": "MIT", "peerDependencies": { "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" @@ -4429,6 +5521,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -4465,13 +5558,34 @@ "node": ">=8" } }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/string-width-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "license": "MIT" }, - "node_modules/string-width/node_modules/strip-ansi": { + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", @@ -4486,17 +5600,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", @@ -4519,19 +5622,12 @@ "node": ">=8" } }, - "node_modules/strip-ansi/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -4543,6 +5639,7 @@ "version": "3.35.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", + "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", @@ -4565,6 +5662,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -4576,6 +5674,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4587,6 +5686,7 @@ "version": "2.6.0", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" @@ -4596,6 +5696,7 @@ "version": "3.4.17", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz", "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==", + "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -4632,58 +5733,16 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz", "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==", + "license": "MIT", "peerDependencies": { "tailwindcss": ">=3.0.0 || insiders" } }, - "node_modules/tailwindcss/node_modules/postcss": { - "version": "8.4.49", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", - "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/tailwindcss/node_modules/postcss/node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/thenify": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "license": "MIT", "dependencies": { "any-promise": "^1.0.0" } @@ -4692,6 +5751,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "license": "MIT", "dependencies": { "thenify": ">= 3.1.0 < 4" }, @@ -4702,12 +5762,14 @@ "node_modules/tiny-invariant": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", - "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==" + "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", + "license": "MIT" }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -4716,10 +5778,11 @@ } }, "node_modules/ts-api-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz", - "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18.12" }, @@ -4730,23 +5793,27 @@ "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "license": "Apache-2.0" }, "node_modules/tslib": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz", - "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==" + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" }, "node_modules/turbo-stream": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", - "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -4759,6 +5826,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "devOptional": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4772,6 +5840,7 @@ "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz", "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==", "dev": true, + "license": "MIT", "dependencies": { "@typescript-eslint/eslint-plugin": "8.24.1", "@typescript-eslint/parser": "8.24.1", @@ -4793,12 +5862,13 @@ "version": "6.20.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/update-browserslist-db": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", - "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz", + "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==", "dev": true, "funding": [ { @@ -4814,9 +5884,10 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "escalade": "^3.2.0", - "picocolors": "^1.1.0" + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -4830,6 +5901,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -4838,6 +5910,7 @@ "version": "1.3.3", "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz", "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -4858,6 +5931,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz", "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==", + "license": "MIT", "dependencies": { "detect-node-es": "^1.1.0", "tslib": "^2.0.0" @@ -4878,12 +5952,14 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" }, "node_modules/victory-vendor": { "version": "36.9.2", "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz", "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==", + "license": "MIT AND ISC", "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-ease": "^3.0.0", @@ -4906,6 +5982,7 @@ "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz", "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.24.2", "postcss": "^8.5.2", @@ -4976,6 +6053,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4984,6 +6062,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -4999,6 +6078,7 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5038,6 +6118,15 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5058,10 +6147,23 @@ "node": ">=8" } }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -5069,30 +6171,16 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, "node_modules/yaml": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", - "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz", + "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==", + "license": "ISC", "bin": { "yaml": "bin.mjs" }, "engines": { - "node": ">= 14" + "node": ">= 14.6" } }, "node_modules/yocto-queue": { @@ -5100,6 +6188,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix index 83e311d551c8..5204944764dd 100644 --- a/pkgs/by-name/ne/nezha-theme-user/package.nix +++ b/pkgs/by-name/ne/nezha-theme-user/package.nix @@ -27,7 +27,7 @@ buildNpmPackage rec { --replace-fail '/commit/' '/tree/' ''; - npmDepsHash = "sha256-hlCZqeMkqLgtRpN1+zKhcNK4ECSC4q8XPxzL6jVziqQ="; + npmDepsHash = "sha256-nILKXXFOp+Ix6gYpCgcKpAPiLAV9sgMqZ+oTfWZhSIs="; npmPackFlags = [ "--ignore-scripts" ]; From 1d209567ab3f0edeae9612d05371e7d04a49de9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 14:32:10 +0000 Subject: [PATCH 1068/2279] python3Packages.amaranth: 0.5.7 -> 0.5.8 --- pkgs/development/python-modules/amaranth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index e10b9c306d17..6ba46d5f90b2 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "amaranth"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "amaranth-lang"; repo = "amaranth"; tag = "v${version}"; - hash = "sha256-E/PJrvBmlS39KgzDz9sArq4BXwk/JmIMtdxL7MdrWlc="; + hash = "sha256-hqMgyQJRz1/5C9KB3nAI2RKPZXZUl3zhfZbk9M1hTxs="; }; postPatch = '' From 6e6f134701b18132960eb4839bccc341b5bd9fdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 14:58:09 +0000 Subject: [PATCH 1069/2279] python3Packages.docling-core: 2.49.0 -> 2.50.1 --- pkgs/development/python-modules/docling-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index e50704fd8598..9c5cac247c5f 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.49.0"; + version = "2.50.1"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-c/uU5qeoCXNuMJwsG/Z2+M4N+M8j66fuiSr461on8Aw="; + hash = "sha256-pLIWskl5nXdOC5UwvfJ3Yhl8qV6jg42P89gLj7ASpTA="; }; build-system = [ From 6c9fbdf5f21516f0a72ed1b668aaf49e2822f1b4 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Tue, 28 Oct 2025 22:13:31 +0100 Subject: [PATCH 1070/2279] platformio: fix missing pyparsing --- pkgs/by-name/pl/platformio-core/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix index f0afbb6b5642..9edb8ce9c8a3 100644 --- a/pkgs/by-name/pl/platformio-core/package.nix +++ b/pkgs/by-name/pl/platformio-core/package.nix @@ -79,6 +79,7 @@ buildPythonApplication rec { marshmallow pip pyelftools + pyparsing pyserial pyyaml requests From 8129c42267c0798c755df9d6d2ecf3de47c91b19 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 5 Nov 2025 07:51:18 -0800 Subject: [PATCH 1071/2279] tailscale: 1.90.4 -> 1.90.6 Changelog: https://tailscale.com/changelog#2025-10-31 - 1.90.6 (Oct 31, 2025): App connectors: Fixed an issue where routes would stall and fail to apply when updated repeatedly in a short time period - 1.90.5 (Oct 30, 2025) Tailscale SSH: Fixed a bug where SSH connections would hang for 10 seconds when connecting to `tsrecorder` (this affected tailnets using Tailscale SSH recording) --- pkgs/by-name/ta/tailscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 814ab17f72cc..590fdc997d6f 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.90.4"; + version = "1.90.6"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-0d6NwGH79TFqOpbu8EUw/lhk+1gF7TupVxFW18pqRmc="; + hash = "sha256-Uy5HDhZTO/lydVzT/dzp8OWgaZ8ZVQo0b7lvvzXyysI="; }; - vendorHash = "sha256-rV3C2Vi48FCifGt58OdEO4+Av0HRIs8sUJVvp/gEBLw="; + vendorHash = "sha256-AUOjLomba75qfzb9Vxc0Sktyeces6hBSuOMgboWcDnE="; nativeBuildInputs = [ makeWrapper From cdc8050f8e0cac215457b27869ff039c76f5b540 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 12:45:59 -0300 Subject: [PATCH 1072/2279] treewide: mark as broken on darwin (last successful Hydra build in 2024) --- pkgs/applications/science/misc/tulip/default.nix | 2 ++ pkgs/by-name/av/avfs/package.nix | 2 ++ pkgs/by-name/co/coan/package.nix | 2 ++ pkgs/by-name/em/emboss/package.nix | 2 ++ pkgs/by-name/eu/eureka-ideas/package.nix | 3 +++ pkgs/by-name/fi/finalfrontier/package.nix | 2 ++ pkgs/by-name/ga/garmintools/package.nix | 3 ++- pkgs/by-name/jo/jose/package.nix | 2 ++ pkgs/by-name/li/libinfinity/package.nix | 2 ++ pkgs/by-name/pa/packet-sd/package.nix | 3 +++ pkgs/by-name/si/sic-image-cli/package.nix | 3 +++ pkgs/by-name/te/telepathy-mission-control/package.nix | 2 ++ pkgs/development/compilers/chicken/5/overrides.nix | 3 ++- pkgs/development/compilers/polyml/5.7.nix | 3 ++- pkgs/os-specific/linux/firmware/ath9k/default.nix | 2 ++ pkgs/tools/filesystems/encfs/default.nix | 2 ++ 16 files changed, 35 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 1fa111378329..39a7b666e042 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -77,5 +77,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/av/avfs/package.nix b/pkgs/by-name/av/avfs/package.nix index 4effeb22b398..d2c21467567c 100644 --- a/pkgs/by-name/av/avfs/package.nix +++ b/pkgs/by-name/av/avfs/package.nix @@ -32,5 +32,7 @@ stdenv.mkDerivation rec { description = "Virtual filesystem that allows browsing of compressed files"; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/co/coan/package.nix b/pkgs/by-name/co/coan/package.nix index 4d8b95642712..4c29315ea0c2 100644 --- a/pkgs/by-name/co/coan/package.nix +++ b/pkgs/by-name/co/coan/package.nix @@ -46,5 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://coan2.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix index fd0d2cac3192..128aab262e39 100644 --- a/pkgs/by-name/em/emboss/package.nix +++ b/pkgs/by-name/em/emboss/package.nix @@ -50,5 +50,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2; homepage = "https://emboss.sourceforge.net/"; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix index 36f0fa92b93a..4f52ec1aab42 100644 --- a/pkgs/by-name/eu/eureka-ideas/package.nix +++ b/pkgs/by-name/eu/eureka-ideas/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, rustPlatform, fetchFromGitHub, @@ -36,5 +37,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = [ ]; mainProgram = "eureka"; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/fi/finalfrontier/package.nix b/pkgs/by-name/fi/finalfrontier/package.nix index a35b50c2eb31..cd092e77cc99 100644 --- a/pkgs/by-name/fi/finalfrontier/package.nix +++ b/pkgs/by-name/fi/finalfrontier/package.nix @@ -50,5 +50,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/finalfusion/finalfrontier/"; license = licenses.asl20; maintainers = [ ]; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ga/garmintools/package.nix b/pkgs/by-name/ga/garmintools/package.nix index 34dddd4a60c3..ee0de59d75aa 100644 --- a/pkgs/by-name/ga/garmintools/package.nix +++ b/pkgs/by-name/ga/garmintools/package.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/jo/jose/package.nix b/pkgs/by-name/jo/jose/package.nix index 921334d07910..000bcba502b1 100644 --- a/pkgs/by-name/jo/jose/package.nix +++ b/pkgs/by-name/jo/jose/package.nix @@ -48,5 +48,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = lib.licenses.asl20; platforms = lib.platforms.all; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/li/libinfinity/package.nix b/pkgs/by-name/li/libinfinity/package.nix index f2fe5897e98f..a61ff397ba9d 100644 --- a/pkgs/by-name/li/libinfinity/package.nix +++ b/pkgs/by-name/li/libinfinity/package.nix @@ -83,6 +83,8 @@ let license = lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; }; in diff --git a/pkgs/by-name/pa/packet-sd/package.nix b/pkgs/by-name/pa/packet-sd/package.nix index 053aceffa748..c8b98687cf2b 100644 --- a/pkgs/by-name/pa/packet-sd/package.nix +++ b/pkgs/by-name/pa/packet-sd/package.nix @@ -1,4 +1,5 @@ { + stdenv, buildGoModule, fetchFromGitHub, fetchpatch2, @@ -45,5 +46,7 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ ]; mainProgram = "prometheus-packet-sd"; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix index 9511263d55b6..f9dc473ef60a 100644 --- a/pkgs/by-name/si/sic-image-cli/package.nix +++ b/pkgs/by-name/si/sic-image-cli/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, rustPlatform, fetchFromGitHub, @@ -43,5 +44,7 @@ rustPlatform.buildRustPackage rec { ]; maintainers = [ ]; mainProgram = "sic"; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/by-name/te/telepathy-mission-control/package.nix b/pkgs/by-name/te/telepathy-mission-control/package.nix index e09780096df0..0e460038debe 100644 --- a/pkgs/by-name/te/telepathy-mission-control/package.nix +++ b/pkgs/by-name/te/telepathy-mission-control/package.nix @@ -61,5 +61,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = [ ]; platforms = platforms.unix; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 5ea7a8bd71e6..44e306b83f41 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -98,7 +98,6 @@ in ] old ) // (addToBuildInputs pkgs.libglut old); - iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv); icu = addToBuildInputsWithPkgConfig pkgs.icu; imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2; inotify = @@ -306,6 +305,8 @@ in # mark broken darwin + # The last successful Darwin Hydra build was in 2024 + iconv = brokenOnDarwin; # fatal error: 'mqueue.h' file not found posix-mq = brokenOnDarwin; # Undefined symbols for architecture arm64: "_pthread_setschedprio" diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index b9f280fbeac0..3444b08ae241 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix index 5c9660968579..2111b2403d21 100644 --- a/pkgs/os-specific/linux/firmware/ath9k/default.nix +++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix @@ -186,5 +186,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw"; downloadPage = "https://github.com/qca/open-ath9k-htc-firmware"; changelog = "https://github.com/qca/open-ath9k-htc-firmware/tags"; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 08e14c7624d6..abd5279b69d6 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -67,5 +67,7 @@ stdenv.mkDerivation rec { lgpl3Plus ]; platforms = platforms.unix; + # The last successful Darwin Hydra build was in 2024 + broken = stdenv.hostPlatform.isDarwin; }; } From 1e7d8a4584abc39dbe1034c6f4efced03752400e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Nov 2025 17:10:12 +0100 Subject: [PATCH 1073/2279] python3Packages.django_4: 4.2.25 -> 4.2.26 https://docs.djangoproject.com/en/4.2/releases/4.2.26/ https://www.djangoproject.com/weblog/2025/nov/05/security-releases/ Fixes: CVE-2025-64458, CVE-2025-64459 --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index a661b22f939f..570ee2e03b8b 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.25"; + version = "4.2.26"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-HUNKvLDLZ1VmcyIN0QVMUJZgmd1zBulhzGzGgkZ/84E="; + hash = "sha256-2NkkQcsY+BDvLGtvjYfGwgAK2S6LDbbcl7CwbwuF5a0="; }; patches = [ From 47c254258d1e006365dacf89e262fac1d821925d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 16:12:34 +0000 Subject: [PATCH 1074/2279] python3Packages.kestra: 0.23.0 -> 1.1.0 --- pkgs/development/python-modules/kestra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix index 73df35cd2b36..d0e007c4b698 100644 --- a/pkgs/development/python-modules/kestra/default.nix +++ b/pkgs/development/python-modules/kestra/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "kestra"; - version = "0.23.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "kestra-io"; repo = "libs"; tag = "v${version}"; - hash = "sha256-WtwvOSgAcN+ly0CnkL0Y7lrO4UhSSiXmoAyGXP/hFtE="; + hash = "sha256-cDJ5c4HgwmBnRtAFp8gxCqpo8AYJcuI2tthQOXaSOmU="; }; sourceRoot = "${src.name}/python"; From 81b673c8d1d31fe5841fced3011959ffd01e8c45 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 31 Oct 2025 08:56:38 -0400 Subject: [PATCH 1075/2279] fractal: 12.1 -> 13 Changelog: https://gitlab.gnome.org/World/fractal/-/releases/13 --- pkgs/by-name/fr/fractal/package.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index 1f182654142c..57e2d580238e 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -15,7 +15,6 @@ gtksourceview5, lcms2, libadwaita, - libglycin, gst_all_1, desktop-file-utils, appstream-glib, @@ -23,6 +22,8 @@ pipewire, libshumate, wrapGAppsHook4, + blueprint-compiler, + bubblewrap, sqlite, xdg-desktop-portal, libseccomp, @@ -32,19 +33,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "fractal"; - version = "12.1"; + version = "13"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = finalAttrs.version; - hash = "sha256-xeB6N4ljXGzysy5RnDRK1wPiIRUSDcl+5BIdp6NO5ZA="; + hash = "sha256-zIB04OIhMSm6OWHalnLO9Ng87dsvsmYurrro3hKwoYU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-CHduzW++BYzasFv/x0Q1T7EaTlo1EqYY2gxQJv+ek0A="; + hash = "sha256-5wI74sKytewbRs0T/IQZFEaRTgJcF6HyDEK0mpjy0LU="; }; patches = [ @@ -55,16 +56,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/meson.build --replace-fail \ - "'src' / rust_target / meson.project_name()" \ - "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" - ''; - - # Dirty approach to add patches after cargoSetupPostUnpackHook - # We should eventually use a cargo vendor patch hook instead - preConfigure = '' - pushd ../$(stripHash $cargoDeps)/glycin-2.* - patch -p3 < ${libglycin.passthru.glycinPathsPatch} - popd + "target_dir / rust_target / meson.project_name()" \ + "target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" ''; nativeBuildInputs = [ @@ -81,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils appstream-glib wrapGAppsHook4 + blueprint-compiler ]; buildInputs = [ @@ -108,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + --prefix PATH : "${lib.makeBinPath [ bubblewrap ]}" ) ''; From e49048e1f0e7106d301b4cb4d917e17839e8a895 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 16:54:39 +0000 Subject: [PATCH 1076/2279] buildkit: 0.25.1 -> 0.25.2 --- pkgs/by-name/bu/buildkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index 42df5efb43ba..7e920fcc4b65 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-h9XkvgYa7m7LxeUuQ8aFFxNcTULfjQ5gR7vRN9Y89rI="; + hash = "sha256-yW75G96Ca27FB2EzAt77640aDVWYZEFA5NcAnZMPOLg="; }; vendorHash = null; From 3bf3043dd8212f55d66584f0e0025dd0f4d88131 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 16:55:47 +0000 Subject: [PATCH 1077/2279] taze: 19.8.1 -> 19.9.0 --- pkgs/by-name/ta/taze/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index 65579ac321c4..6ad11e238957 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.8.1"; + version = "19.9.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-xIObsjuHXOr/oSaPI+WDax057IT5Wk4+MuDPHWb9dEU="; + hash = "sha256-Xpi5Wc8YP3hUSbEnfEM6uNvdlNiVMRz0oqZAJCBkLHQ="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-XhXqp0eBR5BKtHdJ1JNcZDCHtQA1AEw/aeHIZgA9raQ="; + hash = "sha256-g1LGiCb2NESywYN4tTVf8sXbuJla2whCm5amvPsdmRc="; }; nativeBuildInputs = [ From 0c32e0215b3f4f41910e835058cb12d352c36f0d Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 5 Nov 2025 18:40:15 +0100 Subject: [PATCH 1078/2279] gfn-electron: remove as it's abandoned --- pkgs/by-name/gf/gfn-electron/package.nix | 88 ------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/by-name/gf/gfn-electron/package.nix diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix deleted file mode 100644 index ccddb1b12b05..000000000000 --- a/pkgs/by-name/gf/gfn-electron/package.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - lib, - buildNpmPackage, - fetchFromGitHub, - electron_35, - nix-update-script, - makeBinaryWrapper, - python3, -}: -let - electron = electron_35; - version = "2.2.0"; -in -buildNpmPackage { - pname = "gfn-electron"; - inherit version; - - src = fetchFromGitHub { - owner = "hmlendea"; - repo = "gfn-electron"; - tag = "v${version}"; - hash = "sha256-DwrNCgBp0CD+HYXRMDsu0aKEKzG7k/tk7oATJc30DlE="; - }; - - npmDepsHash = "sha256-2v5qTTGhdG1EEK8v50LLYz5jE/36lBm1PKQl6HfqhCU="; - - nativeBuildInputs = [ - makeBinaryWrapper - # node_modules/node-gyp/gyp/pylib/gyp/input.py - # from distutils.version import StrictVersion - # ModuleNotFoundError: No module named 'distutils' - (python3.withPackages (ps: with ps; [ setuptools ])) - ]; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = true; - - # FIXME: Git dependency node_modules/register-scheme contains install scripts, - # but has no lockfile, which is something that will probably break. - forceGitDeps = true; - - makeCacheWritable = true; - - buildPhase = '' - runHook preBuild - - # NOTE: Upstream explicitly opts to not build an ASAR as it would cause all - # text to disappear in the app. - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r dist/*-unpacked $out/dist - - install -Dm644 com.github.hmlendea.geforcenow-electron.desktop -t $out/share/applications - install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/geforcenow-electron.png - - runHook postInstall - ''; - - postFixup = '' - makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \ - --add-flags "--no-sandbox --disable-gpu-sandbox" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - - substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \ - --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \ - --replace-fail "Icon=nvidia" "Icon=geforcenow-electron" - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Linux Desktop client for Nvidia's GeForce NOW game streaming service"; - homepage = "https://github.com/hmlendea/gfn-electron"; - license = with lib.licenses; [ gpl3Only ]; - platforms = lib.intersectLists lib.platforms.linux electron.meta.platforms; - maintainers = with lib.maintainers; [ pluiedev ]; - mainProgram = "geforcenow-electron"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e4071c5bcc9..b8bf405997b2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -612,6 +612,7 @@ mapAliases { gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08 gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08 geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21 + gfn-electron = throw "gfn-electron has been removed from Nixpkgs as it's abandoned upstream"; # Added 2025-11-05 gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08 From 933d435464d61189a5762785f0dc375b8402bdcf Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 5 Nov 2025 18:44:45 +0100 Subject: [PATCH 1079/2279] electron_35-bin: remove --- pkgs/development/tools/electron/binary/info.json | 11 ----------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index b79efa230aec..3a8bb1719453 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -1,15 +1,4 @@ { - "35": { - "hashes": { - "aarch64-darwin": "2fe3a3cfad607a8c1627f6f2bb9834f959c665ef575b663206db11929634b92f", - "aarch64-linux": "35c4c30aed2639a38fafa6bd1a6a97b3af89a681afbd5c7a0f40673859040ea3", - "armv7l-linux": "350e80638b5ba8a1b56e2463fa55de25f8ee595c0496ef833b07fb4dc65e0c22", - "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59", - "x86_64-darwin": "48a426bb5df999dd46c0700261a1a7f572b17581c4c0d1c28afade5ae600cdc9", - "x86_64-linux": "368d155a2189e1056d111d334b712779e77066fce1f5ab935b22c4ef544eaa29" - }, - "version": "35.7.5" - }, "36": { "hashes": { "aarch64-darwin": "73eb08fd541e6105d448735f2f820a7e0f63ff07e836ca05462dc2c01028e7df", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b8bf405997b2..031702efa9ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -518,6 +518,8 @@ mapAliases { edid-decode = v4l-utils; # Added 2025-06-20 eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28 eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27 + electron_35 = throw "electron_35 has been removed in favor of newer versions"; # added 2025-11-06 + electron_35-bin = throw "electron_35-bin has been removed in favor of newer versions"; # added 2025-11-06 elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04 elixir_ls = throw "'elixir_ls' has been renamed to/replaced by 'elixir-ls'"; # Converted to throw 2025-10-27 elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23ace9a0a66b..d0f3c4e7cac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6141,7 +6141,6 @@ with pkgs; electron-source = callPackage ../development/tools/electron { }; inherit (callPackages ../development/tools/electron/binary { }) - electron_35-bin electron_36-bin electron_37-bin electron_38-bin @@ -6156,7 +6155,6 @@ with pkgs; electron-chromedriver_39 ; - electron_35 = electron_35-bin; electron_36 = electron_36-bin; electron_37 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then From 545c359642424e8778b397dc5e166435b2781f15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 18:07:59 +0000 Subject: [PATCH 1080/2279] foxglove-studio: 2.39.0 -> 2.39.1 --- pkgs/by-name/fo/foxglove-studio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix index 187e405004c0..0e724c6b9361 100644 --- a/pkgs/by-name/fo/foxglove-studio/package.nix +++ b/pkgs/by-name/fo/foxglove-studio/package.nix @@ -20,11 +20,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "foxglove-studio"; - version = "2.39.0"; + version = "2.39.1"; src = fetchurl { url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb"; - hash = "sha256-bEvlgFCDt1b/bZhqJeeMMIDq8qjga5pwRlo/fTa3QKs="; + hash = "sha256-7HVYzKphdpXuKL6e5zD540L5MPFKg0RNZSvW0FCD75k="; }; nativeBuildInputs = [ From 576dae8c49a4e5e98a28f8324f8b827632064c05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 18:16:08 +0000 Subject: [PATCH 1081/2279] langgraph-cli: 0.4.5 -> 0.4.7 --- pkgs/development/python-modules/langgraph-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 8fde1a853412..d3a285ec519a 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.4.5"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "cli==${version}"; - hash = "sha256-YGO1eq1IEKkxuH/9ZsaeaWpQ2vD97du32iopdXFqZf8="; + hash = "sha256-VvxY5fXK/f1aCdIB0XPGTsWgEe/cA797kK6eLmb0vtg="; }; sourceRoot = "${src.name}/libs/cli"; From a13bd1f06428d4cd1b2e49bcc81c4bda40461db7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 18:56:00 +0000 Subject: [PATCH 1082/2279] grafanaPlugins.ventura-psychrometric-panel: 5.0.3 -> 5.0.4 --- .../grafana/plugins/ventura-psychrometric-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix index 0290ba43d438..650816940857 100644 --- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "ventura-psychrometric-panel"; - version = "5.0.3"; - zipHash = "sha256-uGrLxbGNQa82dDhImZHaPAv0GbgV1SwgCHq6q4BjTUs="; + version = "5.0.4"; + zipHash = "sha256-bBPESByCux0X711UjmT5bQrJDz1BC9+9EGOOJ4jqcj0="; meta = with lib; { description = "Grafana plugin to display air conditions on a psychrometric chart"; license = licenses.bsd3Lbnl; From d803c09a7d1a465e10a39dff3f0a6706b1671c75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 19:09:21 +0000 Subject: [PATCH 1083/2279] promtail: 3.5.7 -> 3.5.8 --- pkgs/by-name/gr/grafana-loki/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index 1cc40b5af48b..c7bfe7fbae66 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -12,14 +12,14 @@ }: buildGoModule rec { - version = "3.5.7"; + version = "3.5.8"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-9Aq4ZZuvhTSVTSk1l+DpEo+e5HffrRXJr1DfjJBmBng="; + hash = "sha256-BTAjlA8jk75tkgUpSJrEe4m9aVUav3eeTk7IjT2AYlY="; }; vendorHash = null; From 03805a22b4b869246deb6ccba0b85bf7c11926bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 19:23:37 +0000 Subject: [PATCH 1084/2279] okteto: 3.12.1 -> 3.13.0 --- pkgs/by-name/ok/okteto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index e4d05a1fc448..b03b5ec37c7d 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.12.1"; + version = "3.13.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-TtRLTZ/CnhJZYFrMUYAvRksSbQywP5P0dlYhT74yju8="; + hash = "sha256-B5znl9MV9XAhgesq9jLYn6mLF0/o2eY0RXoA2mjNNwQ="; }; - vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8="; + vendorHash = "sha256-/gB/7NCzoZhaKUIkPaABGrKNoruHuAwTIcH75SBBAMg="; postPatch = '' # Disable some tests that need file system & network access. From c1901d1e18ed0b1137c7acab435c6d99e8f398d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Nov 2025 21:17:46 +0100 Subject: [PATCH 1085/2279] python310Packages.ruff-api: remove disabled --- pkgs/development/python-modules/ruff-api/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index a5e194e2ca11..5b067b9b0c1f 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -5,7 +5,6 @@ cargo, fetchFromGitHub, libiconv, - pythonOlder, rustc, rustPlatform, }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "amyreese"; repo = "ruff-api"; From b7087e47ab0d71a0b98aa719485ae2d788059eae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Nov 2025 21:20:32 +0100 Subject: [PATCH 1086/2279] python313Packages.usort: modernize --- pkgs/development/python-modules/usort/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 1e3dcaea1b3d..2420884befc2 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -8,7 +8,6 @@ hatchling, libcst, moreorless, - pythonOlder, stdlibs, toml, trailrunner, @@ -19,9 +18,7 @@ buildPythonPackage rec { pname = "usort"; version = "1.1.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "facebook"; @@ -30,12 +27,12 @@ buildPythonPackage rec { hash = "sha256-QnhpnuEt6j/QPmX29A0523QDh4o2QfaCoDI0YJpTc8Y="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs click libcst @@ -54,10 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Safe, minimal import sorting for Python projects"; - mainProgram = "usort"; homepage = "https://github.com/facebook/usort"; - changelog = "https://github.com/facebook/usort/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/facebook/usort/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "usort"; }; } From 6c6e04931176d70748540f6d177e25e343b9f44d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 20:22:52 +0000 Subject: [PATCH 1087/2279] vscode-extensions.redhat.java: 1.46.0 -> 1.47.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 1a5b850fe551..8ee66e48355b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3846,8 +3846,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.46.0"; - hash = "sha256-i7Nac47aJVdxxRgM8KCCI8zmwTCGxxy0PrejgjOCYXE="; + version = "1.47.0"; + hash = "sha256-zxhNZJWi4mjENzHsO74FjOrztl5uZbVU3aMPO5DwGRo="; }; buildInputs = [ jdk ]; meta = { From fee9bdcd79273d322c178ccb7519cfbb8c745e83 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Wed, 5 Nov 2025 21:24:01 +0100 Subject: [PATCH 1088/2279] kitty: exclude more tests on darwin to allow building --- pkgs/by-name/ki/kitty/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 62e5b0e9f53d..95dcc43a47c9 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -218,9 +218,13 @@ buildPythonApplication rec { substituteInPlace kitty_tests/ssh.py \ --replace test_ssh_connection_data no_test_ssh_connection_data \ + --replace test_ssh_shell_integration no_test_ssh_shell_integration \ + --replace test_ssh_copy no_test_ssh_copy \ + --replace test_ssh_env_vars no_test_ssh_env_vars substituteInPlace kitty_tests/shell_integration.py \ - --replace test_fish_integration no_test_fish_integration + --replace test_fish_integration no_test_fish_integration \ + --replace test_zsh_integration no_test_zsh_integration substituteInPlace kitty_tests/fonts.py \ --replace test_fallback_font_not_last_resort no_test_fallback_font_not_last_resort @@ -236,7 +240,6 @@ buildPythonApplication rec { # Fontconfig error: Cannot load default config file: No such file: (null) export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf - # Required for `test_ssh_shell_integration` to pass. export TERM=kitty From 3dba3f55bc661d5981744823fa16bb4d5c1e8c6d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 00:03:09 +0300 Subject: [PATCH 1089/2279] switchfin: pin fmt_11 --- pkgs/by-name/sw/switchfin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix index bc4323401687..3bdcf7309b7c 100644 --- a/pkgs/by-name/sw/switchfin/package.nix +++ b/pkgs/by-name/sw/switchfin/package.nix @@ -7,7 +7,7 @@ curl, dbus, ffmpeg, - fmt, + fmt_11, libwebp, mpv, SDL2, @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { curl dbus ffmpeg - fmt + fmt_11 libwebp mpv SDL2 From a5018da1e614e65a254a80cca43f913a245d7015 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 00:03:16 +0300 Subject: [PATCH 1090/2279] python313Packages.elastic-transport: cherry-pick fix for pytest-asyncio 1.2.0 compatibility --- .../python-modules/elastic-transport/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index fe29e2841651..f083603fd0c7 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, certifi, fetchFromGitHub, + fetchpatch, mock, opentelemetry-api, opentelemetry-sdk, @@ -34,6 +35,14 @@ buildPythonPackage rec { hash = "sha256-LWSvE88wEwMxRi6IZsMkIRP8UTRfImC9QZnuka1oiso="; }; + # FIXME: backport fix for pytest-asyncio 1.2.0, as updating this entire ecosystem is painful + patches = [ + (fetchpatch { + url = "https://github.com/elastic/elastic-transport-python/commit/d749d0be54821e81979888ff34b1451354548863.patch"; + hash = "sha256-FrabqeLn3Sr1sg/lWWYsMPd0CZS/6BZYLnaK66T93BQ="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ From 1efe5c9a8b2b4d527eec48cdfd64987b0f0e4722 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 00:03:29 +0300 Subject: [PATCH 1091/2279] python313Packages.sanic: skip more tests Please tell me no one is actually using this thing. --- pkgs/development/python-modules/sanic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 3c79d8a8785f..27b0137014c8 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -95,7 +95,15 @@ buildPythonPackage rec { # Racy, e.g. Address already in use "test_logger_vhosts" # Event loop is closed + "test_asyncio_server_no_start_serving" + "test_asyncio_server_start_serving" + "test_create_asyncio_server" + "test_create_server_main_convenience" + "test_create_server_main" + "test_create_server_no_startup" "test_create_server_trigger_events" + "test_multiple_uvloop_configs_display_warning" + "test_uvloop_cannot_never_called_with_create_server" ]; disabledTestPaths = [ From 8ea6d8cbff2ce4224549de77a75e79220fcf0c62 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 00:22:31 +0300 Subject: [PATCH 1092/2279] python313Packages.pproxy: fix optional dependencies This is more correct and the uvloop glue is broken with latest uvloop, which makes psycopg tests and probably more things to fail randomly. --- .../development/python-modules/pproxy/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix index 8d355218a0cc..e3d26f1b90d7 100644 --- a/pkgs/development/python-modules/pproxy/default.nix +++ b/pkgs/development/python-modules/pproxy/default.nix @@ -4,6 +4,9 @@ fetchFromGitHub, pycryptodome, uvloop, + asyncssh, + aioquic, + python-daemon, setuptools, pythonOlder, }: @@ -24,10 +27,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - pycryptodome - uvloop - ]; + optional-dependencies = { + accelerated = [ pycryptodome uvloop ]; + sshtunnel = [ asyncssh ]; + quic = [ aioquic ]; + daemon = [ python-daemon ]; + }; + + nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pproxy" ]; From c29e218745bd9efa98db192100853fed69046b02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 21:33:55 +0000 Subject: [PATCH 1093/2279] dbeaver-bin: 25.2.3 -> 25.2.4 --- pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 6747d9a99b6a..7d4a5137d335 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "25.2.3"; + version = "25.2.4"; src = let @@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-tOUOZP+A3vB73xvAj+OEvCR+APbwlKLwZN9iJYi/W7c="; - aarch64-linux = "sha256-yQ6+kZP22CtdaKQiRgWoYvUDMLz1mdlV3AWC+nKQVBI="; - x86_64-darwin = "sha256-tIkAkBcnF37sZV2ZHSgqe3PnAqSoU7iYRu8tNZ8fhfE="; - aarch64-darwin = "sha256-imkW4Dz8qWjIKLT6CvdjhIjWpEmfKk1MWVh5+NGujb4="; + x86_64-linux = "sha256-5mBk3HO5BqcydxDhancQ8YzfNjZ0bMAuNM9lf8fm4ks="; + aarch64-linux = "sha256-i9hQJ01G+Jy18bkYD9e6wAhufH87r/9qwxzzVd0K8LU="; + x86_64-darwin = "sha256-zSLLNOP+miG71/LCjNHanDbeRr986wwdb7x5q3gDUZs="; + aarch64-darwin = "sha256-njKjBXxv5tpaStiLHfL3Cs4FwtKBsLOCA4ASPggVhnY="; }; in fetchurl { From 6f14a69d4ebcb8a50e905b5e2c5f1d15de6cc298 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 00:38:41 +0300 Subject: [PATCH 1094/2279] python313Packages.pproxy: nixfmt --- pkgs/development/python-modules/pproxy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix index e3d26f1b90d7..f652fa2b13ac 100644 --- a/pkgs/development/python-modules/pproxy/default.nix +++ b/pkgs/development/python-modules/pproxy/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; optional-dependencies = { - accelerated = [ pycryptodome uvloop ]; + accelerated = [ + pycryptodome + uvloop + ]; sshtunnel = [ asyncssh ]; quic = [ aioquic ]; daemon = [ python-daemon ]; From 885e216aea74df191d5f30e03dff12e03f78aa11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 21:59:19 +0000 Subject: [PATCH 1095/2279] python3Packages.pystiebeleltron: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/pystiebeleltron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystiebeleltron/default.nix b/pkgs/development/python-modules/pystiebeleltron/default.nix index e8f5af98d316..de0c3d509770 100644 --- a/pkgs/development/python-modules/pystiebeleltron/default.nix +++ b/pkgs/development/python-modules/pystiebeleltron/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pystiebeleltron"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "ThyMYthOS"; repo = "python-stiebel-eltron"; tag = "v${version}"; - hash = "sha256-36KEE1GvdXUjF6V3V5d+0hvUb4/cVKNfTI6xyc4/aLM="; + hash = "sha256-irZmtsGcbmr5+aniBofDg0fhkP646h3mpRyTdWndOyY="; }; build-system = [ hatchling ]; From 85ca7f0e532b88266e48696131d393cd88525631 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 4 Nov 2025 09:40:18 +0000 Subject: [PATCH 1096/2279] python3Packages.hive-metastore-client: init at 1.0.9 --- .../hive-metastore-client/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/hive-metastore-client/default.nix diff --git a/pkgs/development/python-modules/hive-metastore-client/default.nix b/pkgs/development/python-modules/hive-metastore-client/default.nix new file mode 100644 index 000000000000..14f89f05ef4a --- /dev/null +++ b/pkgs/development/python-modules/hive-metastore-client/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + thrift, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "hive-metastore-client"; + version = "1.0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "quintoandar"; + repo = "hive-metastore-client"; + tag = version; + hash = "sha256-IejsiC1eDNa6fjpQPhLNkMvZpyr9QsQdGBfhev1jEyg="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "thrift" + ]; + dependencies = [ + thrift + ]; + + pythonImportsCheck = [ "hive_metastore_client" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Client for connecting and running DDLs on hive metastore"; + homepage = "https://github.com/quintoandar/hive-metastore-client"; + changelog = "https://github.com/quintoandar/hive-metastore-client/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f22805eed7cc..5d607940e2e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6710,6 +6710,8 @@ self: super: with self; { histoprint = callPackage ../development/python-modules/histoprint { }; + hive-metastore-client = callPackage ../development/python-modules/hive-metastore-client { }; + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; hjson = callPackage ../development/python-modules/hjson { }; From 25961a9e31c8ef7337773b7bde6eaf97e55ea6ae Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 4 Nov 2025 09:40:53 +0000 Subject: [PATCH 1097/2279] python3Packages.lance-namespace-urllib3-client: init at 0.0.20 --- .../default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix new file mode 100644 index 000000000000..112793ef4722 --- /dev/null +++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + pydantic, + python-dateutil, + typing-extensions, + urllib3, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "lance-namespace"; + version = "0.0.20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lancedb"; + repo = "lance-namespace"; + tag = "v${version}"; + hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4="; + }; + + sourceRoot = "${src.name}/python/lance_namespace_urllib3_client"; + + build-system = [ + hatchling + ]; + + dependencies = [ + pydantic + python-dateutil + typing-extensions + urllib3 + ]; + + pythonImportsCheck = [ "lance_namespace_urllib3_client" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Lance namespace OpenAPI specification"; + homepage = "https://github.com/lancedb/lance-namespace/tree/main/python/lance_namespace_urllib3_client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d607940e2e2..a0909cc2a4fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8000,6 +8000,10 @@ self: super: with self; { lammps = callPackage ../development/python-modules/lammps { inherit (pkgs) lammps; }; + lance-namespace-urllib3-client = + callPackage ../development/python-modules/lance-namespace-urllib3-client + { }; + lancedb = callPackage ../development/python-modules/lancedb { inherit (pkgs) protobuf; }; langchain = callPackage ../development/python-modules/langchain { }; From 5f020222a0ef3d5361811715da14609aacc2b341 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 4 Nov 2025 10:19:42 +0000 Subject: [PATCH 1098/2279] python3Packages.opendal: init at 0.46.0 --- .../python-modules/opendal/Cargo.lock | 6324 +++++++++++++++++ .../python-modules/opendal/default.nix | 57 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 6383 insertions(+) create mode 100644 pkgs/development/python-modules/opendal/Cargo.lock create mode 100644 pkgs/development/python-modules/opendal/default.nix diff --git a/pkgs/development/python-modules/opendal/Cargo.lock b/pkgs/development/python-modules/opendal/Cargo.lock new file mode 100644 index 000000000000..afbc051f6e56 --- /dev/null +++ b/pkgs/development/python-modules/opendal/Cargo.lock @@ -0,0 +1,6324 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.16", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.4", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "pin-project-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.5.0", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" +dependencies = [ + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix 1.1.2", + "slab", + "windows-sys 0.61.2", +] + +[[package]] +name = "async-lock" +version = "3.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +dependencies = [ + "event-listener 5.4.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-recursion" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "async-std" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-tls" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ae3c9eba89d472a0e4fe1dea433df78fbbe63d2b764addaf2ba3a6bde89a5e" +dependencies = [ + "futures-core", + "futures-io", + "rustls 0.21.12", + "rustls-pemfile", + "webpki-roots 0.22.6", +] + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "awaitable" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70af449c9a763cb655c6a1e5338b42d99c67190824ff90658c1e30be844c0775" +dependencies = [ + "awaitable-error", + "cfg-if", +] + +[[package]] +name = "awaitable-error" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5b3469636cdf8543cceab175efca534471f36eee12fb8374aba00eb5e7e7f8a" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 0.1.2", + "tower 0.4.13", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backon" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0" +dependencies = [ + "fastrand", + "futures-core", + "pin-project", + "tokio", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" + +[[package]] +name = "bb8" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" +dependencies = [ + "async-trait", + "futures-util", + "parking_lot 0.12.5", + "tokio", +] + +[[package]] +name = "bb8-postgres" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ac82c42eb30889b5c4ee4763a24b8c566518171ebea648cd7e3bc532c60680" +dependencies = [ + "async-trait", + "bb8", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "bigdecimal" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.108", + "which", +] + +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.1", + "shlex", + "syn 2.0.108", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +dependencies = [ + "async-channel 2.5.0", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "borsh" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" +dependencies = [ + "once_cell", + "proc-macro-crate 3.4.0", + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "bson" +version = "2.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969a9ba84b0ff843813e7249eed1678d9b6607ce5a3b8f0a47af3fcf7978e6e" +dependencies = [ + "ahash 0.8.12", + "base64 0.22.1", + "bitvec", + "getrandom 0.2.16", + "getrandom 0.3.4", + "hex", + "indexmap 2.12.0", + "js-sys", + "once_cell", + "rand 0.9.2", + "serde", + "serde_bytes", + "serde_json", + "time", + "uuid", +] + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytecount" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "bzip2-sys" +version = "0.1.13+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "cacache" +version = "13.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b" +dependencies = [ + "digest", + "either", + "futures", + "hex", + "libc", + "memmap2", + "miette", + "reflink-copy", + "serde", + "serde_derive", + "serde_json", + "sha1", + "sha2", + "ssri", + "tempfile", + "thiserror 1.0.69", + "tokio", + "tokio-stream", + "walkdir", +] + +[[package]] +name = "camino" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" +dependencies = [ + "serde_core", +] + +[[package]] +name = "cargo-platform" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.27", + "serde", + "serde_json", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.2.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +dependencies = [ + "find-msvc-tools", + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "cmake" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +dependencies = [ + "cc", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "concurrent_arena" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a07f0a549fe58f8477a15f0f1c3aa8ced03a3cdeaa38a661530572f21ea963a0" +dependencies = [ + "arc-swap", + "parking_lot 0.12.5", + "triomphe", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.16", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc16" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" + +[[package]] +name = "crc32c" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" +dependencies = [ + "rustc_version 0.4.1", +] + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.108", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core 0.13.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core 0.20.11", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.12", +] + +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive-new" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_destructure2" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b697ac90ff296f0fc031ee5a61c7ac31fb9fff50e3fb32873b09223613fc0c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "derive_more" +version = "0.99.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.1", + "syn 2.0.108", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "dlv-list" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "enum-as-inner" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "etcd-client" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae697f3928e8c89ae6f4dcf788059f49fd01a76dc53e63628f5a33881f5715e" +dependencies = [ + "http 0.2.12", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tonic", + "tonic-build", + "tower 0.4.13", + "tower-service", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener 5.4.1", + "pin-project-lite", +] + +[[package]] +name = "fail" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6" +dependencies = [ + "lazy_static", + "log", + "rand 0.7.3", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flagset" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "foundationdb" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8696fd1be198f101eb58aeecf0f504fc02b28c7afcc008b4e4a998a91b305108" +dependencies = [ + "async-recursion 1.1.1", + "async-trait", + "foundationdb-gen", + "foundationdb-macros", + "foundationdb-sys", + "futures", + "memchr", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_json", + "static_assertions", + "uuid", +] + +[[package]] +name = "foundationdb-gen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62239700f01b041b6372aaeb847c52f960e1a69fd2b1025dc995ea3dd90e3308" +dependencies = [ + "xml-rs", +] + +[[package]] +name = "foundationdb-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", + "try_map", +] + +[[package]] +name = "foundationdb-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98e49545f5393d276b7b888c77e3f9519fd33727435f8244344be72c3284256f" +dependencies = [ + "bindgen 0.65.1", +] + +[[package]] +name = "frunk" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28aef0f9aa070bce60767c12ba9cb41efeaf1a2bc6427f87b7d83f11239a16d7" +dependencies = [ + "frunk_core", + "frunk_derives", + "frunk_proc_macros", + "serde", +] + +[[package]] +name = "frunk_core" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "476eeaa382e3462b84da5d6ba3da97b5786823c2d0d3a0d04ef088d073da225c" +dependencies = [ + "serde", +] + +[[package]] +name = "frunk_derives" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b4095fc99e1d858e5b8c7125d2638372ec85aa0fe6c807105cf10b0265ca6c" +dependencies = [ + "frunk_proc_macro_helpers", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "frunk_proc_macro_helpers" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1952b802269f2db12ab7c0bd328d0ae8feaabf19f352a7b0af7bb0c5693abfce" +dependencies = [ + "frunk_core", + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "frunk_proc_macros" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3462f590fa236005bd7ca4847f81438bd6fe0febd4d04e11968d4c2e96437e78" +dependencies = [ + "frunk_core", + "frunk_proc_macro_helpers", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-lite" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasip2", + "wasm-bindgen", +] + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "h2" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.12.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.12", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.12", + "allocator-api2", +] + +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "hdfs-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e2d5cefba2d51a26b44d2a493f963a32725a0f6593c91be4a610ad449c49cb" +dependencies = [ + "cc", + "java-locator", +] + +[[package]] +name = "hdrs" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c42a693bfe5dc8fcad1f24044c5ec355c5f157b8ce63c7d62f51cecbc7878d" +dependencies = [ + "blocking", + "errno", + "futures", + "hdfs-sys", + "libc", + "log", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "hrana-client-proto" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f16b4e41e289da3fd60e64f245246a97e78fab7b3788c6d8147b3ae7d9f5e533" +dependencies = [ + "anyhow", + "base64 0.21.7", + "serde", + "serde_json", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.3.1", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http 1.3.1", + "hyper 1.7.0", + "hyper-util", + "rustls 0.23.34", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.4", + "tower-service", + "webpki-roots 1.0.4", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper 0.14.32", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-util" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "hyper 1.7.0", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2 0.6.1", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +dependencies = [ + "equivalent", + "hashbrown 0.16.0", +] + +[[package]] +name = "indoc" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] + +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.10", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "java-locator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c46c1fe465c59b1474e665e85e1256c3893dd00927b8d55f63b09044c1e64f" +dependencies = [ + "glob", +] + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "9.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" +dependencies = [ + "base64 0.22.1", + "js-sys", + "pem 3.0.6", + "ring 0.17.14", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lazy-regex" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "191898e17ddee19e60bccb3945aa02339e81edd4a8c50e21fd4d48cdecda7b29" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35dc8b0da83d1a9507e12122c80dea71a9c7c613014347392483a83ea593e04" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.108", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin 0.9.8", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lexical" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" +dependencies = [ + "lexical-core", +] + +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.177" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" + +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] + +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "libredox" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +dependencies = [ + "bitflags 2.10.0", + "libc", + "redox_syscall 0.5.18", +] + +[[package]] +name = "librocksdb-sys" +version = "0.11.0+8.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" +dependencies = [ + "bindgen 0.65.1", + "bzip2-sys", + "cc", + "glob", + "libc", + "libz-sys", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +dependencies = [ + "value-bag", +] + +[[package]] +name = "lru" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +dependencies = [ + "hashbrown 0.13.2", +] + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +dependencies = [ + "miette-derive", + "once_cell", + "thiserror 1.0.69", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mini-moka" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803" +dependencies = [ + "crossbeam-channel", + "crossbeam-utils", + "dashmap", + "skeptic", + "smallvec", + "tagptr", + "triomphe", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", +] + +[[package]] +name = "moka" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077" +dependencies = [ + "async-lock", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "equivalent", + "event-listener 5.4.1", + "futures-util", + "parking_lot 0.12.5", + "portable-atomic", + "rustc_version 0.4.1", + "smallvec", + "tagptr", + "uuid", +] + +[[package]] +name = "mongodb" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef206acb1b72389b49bc9985efe7eb1f8a9bb18e5680d262fac26c07f44025f1" +dependencies = [ + "async-trait", + "base64 0.13.1", + "bitflags 1.3.2", + "bson", + "chrono", + "derivative", + "derive_more", + "futures-core", + "futures-executor", + "futures-io", + "futures-util", + "hex", + "hmac", + "lazy_static", + "md-5", + "pbkdf2 0.11.0", + "percent-encoding", + "rand 0.8.5", + "rustc_version_runtime", + "rustls 0.21.12", + "rustls-pemfile", + "serde", + "serde_bytes", + "serde_with", + "sha-1", + "sha2", + "socket2 0.4.10", + "stringprep", + "strsim 0.10.0", + "take_mut", + "thiserror 1.0.69", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "trust-dns-proto", + "trust-dns-resolver", + "typed-builder", + "uuid", + "webpki-roots 0.25.4", +] + +[[package]] +name = "multimap" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" + +[[package]] +name = "mysql-common-derive" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" +dependencies = [ + "darling 0.20.11", + "heck 0.4.1", + "num-bigint", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.108", + "termcolor", + "thiserror 1.0.69", +] + +[[package]] +name = "mysql_async" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a" +dependencies = [ + "bytes", + "crossbeam", + "flate2", + "futures-core", + "futures-sink", + "futures-util", + "lazy_static", + "lru", + "mio 0.8.11", + "mysql_common", + "once_cell", + "pem 2.0.1", + "percent-encoding", + "pin-project", + "priority-queue", + "rustls 0.21.12", + "rustls-pemfile", + "serde", + "serde_json", + "socket2 0.5.10", + "thiserror 1.0.69", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "twox-hash", + "url", + "webpki", + "webpki-roots 0.23.1", +] + +[[package]] +name = "mysql_common" +version = "0.30.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" +dependencies = [ + "base64 0.21.7", + "bigdecimal", + "bindgen 0.72.1", + "bitflags 2.10.0", + "bitvec", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "frunk", + "lazy_static", + "lexical", + "mysql-common-derive", + "num-bigint", + "num-traits", + "rand 0.8.5", + "regex", + "rust_decimal", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "subprocess", + "thiserror 1.0.69", + "time", + "uuid", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c79c15c05d4bf82b6f5ef163104cc81a760d8e874d38ac50ab67c8877b647b" +dependencies = [ + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "opendal" +version = "0.46.0" +dependencies = [ + "anyhow", + "async-tls", + "async-trait", + "backon", + "base64 0.22.1", + "bb8", + "bb8-postgres", + "bytes", + "cacache", + "chrono", + "crc32c", + "dashmap", + "etcd-client", + "flagset", + "foundationdb", + "futures", + "getrandom 0.2.16", + "hdrs", + "hmac", + "hrana-client-proto", + "http 1.3.1", + "log", + "md-5", + "mini-moka", + "moka", + "mongodb", + "mysql_async", + "once_cell", + "openssh", + "openssh-sftp-client", + "percent-encoding", + "persy", + "prost 0.11.9", + "quick-xml", + "r2d2", + "redb", + "redis", + "reqsign", + "reqwest", + "rocksdb", + "rusqlite", + "serde", + "serde_json", + "sha1", + "sha2", + "sled", + "suppaftp", + "tikv-client", + "tokio", + "tokio-postgres", + "uuid", +] + +[[package]] +name = "opendal-python" +version = "0.45.2" +dependencies = [ + "bytes", + "futures", + "opendal", + "pyo3", + "pyo3-asyncio", + "tokio", +] + +[[package]] +name = "openssh" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330f4b61092456dc0aaa0cf9a205d956cae07d8127a69ffeff6760a72549c77f" +dependencies = [ + "libc", + "once_cell", + "shell-escape", + "tempfile", + "thiserror 1.0.69", + "tokio", + "tokio-pipe", +] + +[[package]] +name = "openssh-sftp-client" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f472c9c38ea60bc161f8b5df4d04c79057003cdc12572eaad7f6dcc74e6fca5" +dependencies = [ + "bytes", + "derive_destructure2", + "futures-core", + "once_cell", + "openssh", + "openssh-sftp-client-lowlevel", + "openssh-sftp-error", + "pin-project", + "scopeguard", + "tokio", + "tokio-io-utility", + "tokio-util", + "tracing", +] + +[[package]] +name = "openssh-sftp-client-lowlevel" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a84f1a52761901fcf5b10885544085348a872e57294531ec9188145d9a83042" +dependencies = [ + "awaitable", + "bytes", + "concurrent_arena", + "derive_destructure2", + "openssh-sftp-error", + "openssh-sftp-protocol", + "pin-project", + "tokio", + "tokio-io-utility", +] + +[[package]] +name = "openssh-sftp-error" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a5aea093d714df10186f481a6003e3f906f6fc8360c026737a841f4f182996" +dependencies = [ + "awaitable-error", + "openssh", + "openssh-sftp-protocol-error", + "ssh_format_error", + "thiserror 1.0.69", + "tokio", +] + +[[package]] +name = "openssh-sftp-protocol" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c862e0c56553146306507f55958c11ff554e02c46de287e6976e50d815b350" +dependencies = [ + "bitflags 2.10.0", + "num-derive", + "num-traits", + "openssh-sftp-protocol-error", + "serde", + "ssh_format", + "vec-strings", +] + +[[package]] +name = "openssh-sftp-protocol-error" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42b54df62ccfd9a7708a83a9d60c46293837e478f9f4c0829360dcfa60ede8d2" +dependencies = [ + "serde", + "thiserror 2.0.17", + "vec-strings", +] + +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "ordered-multimap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +dependencies = [ + "dlv-list", + "hashbrown 0.14.5", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.12", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.18", + "smallvec", + "windows-link", +] + +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] +name = "pem" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +dependencies = [ + "base64 0.22.1", + "serde_core", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "persy" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bce6ad02b7ddcdd9978d99d17bb2c717c8e15b94801785a262641cbdf10c5a5" +dependencies = [ + "crc", + "data-encoding", + "fs2", + "linked-hash-map", + "rand 0.9.2", + "thiserror 2.0.17", + "unsigned-varint", + "zigzag", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.12.0", +] + +[[package]] +name = "phf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" +dependencies = [ + "phf_shared", + "serde", +] + +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" +dependencies = [ + "aes", + "cbc", + "der", + "pbkdf2 0.12.2", + "scrypt", + "sha2", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "pkcs5", + "rand_core 0.6.4", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "polling" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 1.1.2", + "windows-sys 0.61.2", +] + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "postgres-protocol" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4" +dependencies = [ + "base64 0.22.1", + "byteorder", + "bytes", + "fallible-iterator", + "hmac", + "md-5", + "memchr", + "rand 0.9.2", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4605b7c057056dd35baeb6ac0c0338e4975b1f2bef0f65da953285eb007095" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", +] + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.108", +] + +[[package]] +name = "priority-queue" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" +dependencies = [ + "autocfg", + "indexmap 1.9.3", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +dependencies = [ + "toml_edit 0.23.7", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prometheus" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot 0.12.5", + "thiserror 1.0.69", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost 0.12.6", + "prost-types", + "regex", + "syn 2.0.108", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost 0.12.6", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.10.0", + "memchr", + "unicase", +] + +[[package]] +name = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot 0.12.5", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "tokio", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls 0.23.34", + "socket2 0.6.1", + "thiserror 2.0.17", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring 0.17.14", + "rustc-hash 2.1.1", + "rustls 0.23.34", + "rustls-pki-types", + "slab", + "thiserror 2.0.17", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.1", + "tracing", + "windows-sys 0.60.2", +] + +[[package]] +name = "quote" +version = "1.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot 0.12.5", + "scheduled-thread-pool", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "redb" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17a0b35b8077c954324cc3504bea8d35e27a2f5d07c0ba41052a35d92f020f84" +dependencies = [ + "libc", +] + +[[package]] +name = "redis" +version = "0.23.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "combine", + "crc16", + "futures", + "futures-util", + "itoa", + "log", + "percent-encoding", + "pin-project-lite", + "rand 0.8.5", + "rustls 0.21.12", + "rustls-native-certs", + "ryu", + "sha1_smol", + "socket2 0.4.10", + "tokio", + "tokio-retry", + "tokio-rustls 0.24.1", + "tokio-util", + "url", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "reflink-copy" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bbed272e39c47a095a5242218a67412a220006842558b03fe2935e8f3d7b92" +dependencies = [ + "cfg-if", + "libc", + "rustix 1.1.2", + "windows", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqsign" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70fe66d4cd0b5ed9b1abbfe639bf6baeaaf509f7da2d51b31111ba945be59286" +dependencies = [ + "anyhow", + "async-trait", + "base64 0.22.1", + "chrono", + "form_urlencoded", + "getrandom 0.2.16", + "hex", + "hmac", + "home", + "http 1.3.1", + "jsonwebtoken", + "log", + "once_cell", + "percent-encoding", + "quick-xml", + "rand 0.8.5", + "reqwest", + "rsa", + "rust-ini", + "serde", + "serde_json", + "sha1", + "sha2", +] + +[[package]] +name = "reqwest" +version = "0.12.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.7.0", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.34", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.2", + "tokio", + "tokio-rustls 0.26.4", + "tokio-util", + "tower 0.5.2", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 1.0.4", +] + +[[package]] +name = "resolv-conf" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.16", + "libc", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rkyv" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rocksdb" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "rsa" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "sha2", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +dependencies = [ + "bitflags 2.10.0", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust-ini" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rust_decimal" +version = "1.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver 1.0.27", +] + +[[package]] +name = "rustc_version_runtime" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" +dependencies = [ + "rustc_version 0.2.3", + "semver 0.9.0", +] + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring 0.17.14", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +dependencies = [ + "once_cell", + "ring 0.17.14", + "rustls-pki-types", + "rustls-webpki 0.103.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pki-types" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.14", + "untrusted 0.9.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +dependencies = [ + "ring 0.17.14", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "saturating" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" + +[[package]] +name = "schannel" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot 0.12.5", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "pbkdf2 0.12.2", + "salsa20", + "sha2", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.14", + "untrusted 0.9.0", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.10.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +dependencies = [ + "serde", + "serde_core", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8" +dependencies = [ + "serde", + "serde_core", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "serde_json" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +dependencies = [ + "indexmap 2.12.0", + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling 0.13.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "simple_asn1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror 2.0.17", + "time", +] + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "sled" +version = "0.34.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot 0.11.2", +] + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "socket2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "ssh_format" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ab31081d1c9097c327ec23550858cb5ffb4af6b866c1ef4d728455f01f3304" +dependencies = [ + "bytes", + "serde", + "ssh_format_error", +] + +[[package]] +name = "ssh_format_error" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be3c6519de7ca611f71ef7e8a56eb57aa1c818fecb5242d0a0f39c83776c210c" +dependencies = [ + "serde", +] + +[[package]] +name = "ssri" +version = "9.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082" +dependencies = [ + "base64 0.21.7", + "digest", + "hex", + "miette", + "serde", + "sha-1", + "sha2", + "thiserror 1.0.69", + "xxhash-rust", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subprocess" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "suppaftp" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb79a5b76543d896dbec5c0fd9a28c0ca9a0d4e764c438c37f8463c96e4a8bf2" +dependencies = [ + "async-std", + "async-tls", + "async-trait", + "chrono", + "futures-lite", + "lazy-regex", + "log", + "pin-project", + "rustls 0.21.12", + "thiserror 1.0.69", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] +name = "take_mut" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix 1.1.2", + "windows-sys 0.61.2", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thin-vec" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d" + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tikv-client" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048968e4e3d04db472346770cc19914c6b5ae206fa44677f6a0874d54cd05940" +dependencies = [ + "async-recursion 0.3.2", + "async-trait", + "derive-new", + "either", + "fail", + "futures", + "lazy_static", + "log", + "pin-project", + "prometheus", + "prost 0.12.6", + "rand 0.8.5", + "regex", + "semver 1.0.27", + "serde", + "serde_derive", + "thiserror 1.0.69", + "tokio", + "tonic", +] + +[[package]] +name = "time" +version = "0.3.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +dependencies = [ + "bytes", + "libc", + "mio 1.1.0", + "parking_lot 0.12.5", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.6.1", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-io-utility" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263" +dependencies = [ + "bytes", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tokio-pipe" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f213a84bffbd61b8fa0ba8a044b4bbe35d471d0b518867181e82bd5c15542784" +dependencies = [ + "libc", + "tokio", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b40d66d9b2cfe04b628173409368e58247e8eddbbd3b0e6c6ba1d09f20f6c9e" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot 0.12.5", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "rand 0.9.2", + "socket2 0.6.1", + "tokio", + "tokio-util", + "whoami", +] + +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls 0.23.34", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" + +[[package]] +name = "toml_datetime" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.12.0", + "toml_datetime 0.6.11", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.23.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" +dependencies = [ + "indexmap 2.12.0", + "toml_datetime 0.7.3", + "toml_parser", + "winnow 0.7.13", +] + +[[package]] +name = "toml_parser" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +dependencies = [ + "winnow 0.7.13", +] + +[[package]] +name = "tonic" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.32", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.6", + "rustls 0.21.12", + "rustls-pemfile", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand 0.8.5", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 1.0.2", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +dependencies = [ + "bitflags 2.10.0", + "bytes", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "iri-string", + "pin-project-lite", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "tracing-core" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +dependencies = [ + "once_cell", +] + +[[package]] +name = "triomphe" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39" +dependencies = [ + "arc-swap", + "serde", + "stable_deref_trait", +] + +[[package]] +name = "trust-dns-proto" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "log", + "rand 0.8.5", + "smallvec", + "thiserror 1.0.69", + "tinyvec", + "tokio", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "log", + "lru-cache", + "parking_lot 0.12.5", + "resolv-conf", + "smallvec", + "thiserror 1.0.69", + "tokio", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "try_map" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand 0.8.5", + "static_assertions", +] + +[[package]] +name = "typed-builder" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "unicase" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" + +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-normalization" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unindent" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna 1.1.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +dependencies = [ + "getrandom 0.3.4", + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "value-bag" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec-strings" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8509489e2a7ee219522238ad45fd370bec6808811ac15ac6b07453804e77659" +dependencies = [ + "serde", + "thin-vec", +] + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.108", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +dependencies = [ + "ring 0.17.14", + "untrusted 0.9.0", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.3", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.44", +] + +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections", + "windows-core", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core", + "windows-link", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core", + "windows-link", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xml-rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" + +[[package]] +name = "xxhash-rust" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + +[[package]] +name = "zigzag" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf" +dependencies = [ + "num-traits", +] diff --git a/pkgs/development/python-modules/opendal/default.nix b/pkgs/development/python-modules/opendal/default.nix new file mode 100644 index 000000000000..81ea8ccc691a --- /dev/null +++ b/pkgs/development/python-modules/opendal/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + + # tests + pytest-asyncio, + pytestCheckHook, + python-dotenv, +}: +buildPythonPackage rec { + pname = "opendal"; + version = "0.46.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "opendal"; + tag = "v${version}"; + hash = "sha256-OQGpz6o4R0Yp+1vAgFtik/l7wvHwJNcB1BhZLk+BFPg="; + }; + + sourceRoot = "${src.name}/bindings/python"; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + env = { + PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + pythonImportsCheck = [ "opendal" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + python-dotenv + ]; + + meta = { + description = "native Python binding for Apache OpenDAL"; + homepage = "https://github.com/apache/opendal/blob/main/bindings/python"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0909cc2a4fc..a271c4f89dac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11070,6 +11070,8 @@ self: super: with self; { } ); + opendal = callPackage ../development/python-modules/opendal { }; + openerz-api = callPackage ../development/python-modules/openerz-api { }; openevsewifi = callPackage ../development/python-modules/openevsewifi { }; From 1b80404731003c35c0fa217f000b0f9fc3e453d6 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Nov 2025 23:28:47 +0100 Subject: [PATCH 1099/2279] logrotate: Enable tests --- pkgs/by-name/lo/logrotate/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index 3f454af211ab..9db688ab8ac1 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -7,6 +7,7 @@ autoreconfHook, aclSupport ? stdenv.hostPlatform.isLinux, acl, + coreutils, nixosTests, }: @@ -30,6 +31,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ]; + preCheck = '' + sed -i 's#/bin/date#${lib.getExe' coreutils "date"}#' test/*.sh + # Skip this test because it depends on a working root user, which we don't have in the sandbox + # Exiting with 77 signals that the test is skipped, and we only place it on line 2 because the shebang is on line 1 + sed -i '2iexit 77' test/test-0110.sh + ''; + doCheck = true; + passthru.tests = { nixos-logrotate = nixosTests.logrotate; }; From e7e1c05387647e83e4e08597504f1ee3ed213425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:09:45 -0300 Subject: [PATCH 1100/2279] lxqt.libfm-qt: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/libfm-qt/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 1bbec0fcda3b..16c946f919be 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, libXdmcp, libexif, @@ -16,7 +15,7 @@ qttools, wrapQtAppsHook, gitUpdater, - version ? "2.2.0", + version ? "2.3.0", qtx11extras ? null, }: @@ -31,21 +30,11 @@ stdenv.mkDerivation (finalAttrs: { hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; - "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q="; + "2.3.0" = "sha256-A0kBwLiPvHIsJWQvg6lwb5lrojU8oDDQYHuC2pTXdPc="; } ."${finalAttrs.version}"; }; - patches = lib.optionals (finalAttrs.version == "2.2.0") [ - # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060) - # TODO: drop when upgrading beyond version 2.2.0 - (fetchpatch { - name = "cmake-fix-build-with-Qt-6.10.patch"; - url = "https://github.com/lxqt/libfm-qt/commit/3bcbae5831f5ce3d2f06dc370f0c2ad0026ae82a.patch"; - hash = "sha256-nTuPXlkP7AzC8R4OHfQx6/kxPsDjaw7tGzQGyiYqQSQ="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config From 5076aba35cb86a055655d9d93db530e56d4c7515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:09:50 -0300 Subject: [PATCH 1101/2279] lxqt.liblxqt: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/liblxqt/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 77e9be0f687f..a859514c9b7d 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "liblxqt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "liblxqt"; rev = version; - hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494="; + hash = "sha256-KAteTQRJ7xfh21tYcNoZjvLfWSiUYboasqL5D4YKARo="; }; nativeBuildInputs = [ From 2d827c5ddf6783d251394061069499d54dfc3901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:09:53 -0300 Subject: [PATCH 1102/2279] lxqt.libqtxdg: 4.2.0 -> 4.3.0 Diff: https://github.com/lxqt/libqtxdg/compare/4.2.0...4.3.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 891ab5149f5a..ab9038c110fb 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -2,14 +2,13 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, qtbase, qtsvg, lxqt-build-tools, wrapQtAppsHook, gitUpdater, - version ? "4.2.0", + version ? "4.3.0", }: stdenv.mkDerivation (finalAttrs: { @@ -23,21 +22,11 @@ stdenv.mkDerivation (finalAttrs: { hash = { "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; - "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI="; + "4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI="; } ."${finalAttrs.version}"; }; - patches = lib.optionals (finalAttrs.version == "4.2.0") [ - # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313) - # TODO: drop when upgrading beyond version 4.2.0 - (fetchpatch { - name = "cmake-fix-build-with-Qt-6.10.patch"; - url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch"; - hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU="; - }) - ]; - nativeBuildInputs = [ cmake lxqt-build-tools From 29bbbe8edb5122e20e024290fd940ef9c954efa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:03 -0300 Subject: [PATCH 1103/2279] lxqt.lximage-qt: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lximage-qt/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 3bd04943d3e0..ea2e137cdad0 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lximage-qt"; rev = version; - hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog="; + hash = "sha256-RJKXcaZJe5gyDubdglOmzmJ9XCH0gAW4fc7OR3anCoU="; }; nativeBuildInputs = [ From 75315741d15c57a1ca7b0ccc20914a49e0b59e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:07 -0300 Subject: [PATCH 1104/2279] lxqt.lxqt-about: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-about/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 868b41f1033a..8f54b81c124d 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-about"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-about"; rev = version; - hash = "sha256-StPepm6XWaK1kDAspnBJ4X1/QGqHmSj48RBobJ46Sao="; + hash = "sha256-EP0Sd/VvLufqtn/7ZQwdI/h+BJhkGks7jTlEoEqYWgk="; }; nativeBuildInputs = [ From 319b7a4b711b026bda88bf88f3d9179831e6b46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:12 -0300 Subject: [PATCH 1105/2279] lxqt.lxqt-admin: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-admin/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index e3fd0d11679f..6aadcee69e73 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lxqt-admin"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-admin"; rev = version; - hash = "sha256-Yne4EWP/bgWXa4XNP8oyUtkOfxBRcT4iuV8CpSq2ooY="; + hash = "sha256-FzYKmqCd61jLfbyPknsWuf7KpdF+SoAMqeSEZPOYc8w="; }; nativeBuildInputs = [ From 517f73ab8b6717b0ca3eb7d07f41a50685c36d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:17 -0300 Subject: [PATCH 1106/2279] lxqt.lxqt-archiver: 1.2.0 -> 1.3.0 Diff: https://github.com/lxqt/lxqt-archiver/compare/1.2.0...1.3.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index a2c56c066b66..e3fbd1845239 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lxqt-archiver"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - hash = "sha256-4xGP/3ft29PFzJ3ty/9wJbv/hqcdTw9U+4xDneKHF8g="; + hash = "sha256-57ufvirD1YYEVoFtX/JY8EnMRWZ4ouhbxNm8przg5XA="; }; nativeBuildInputs = [ From 8142ce46f499899cf61038399a18d329fff81d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:22 -0300 Subject: [PATCH 1107/2279] lxqt.lxqt-build-tools: 2.2.1 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-build-tools/compare/2.2.1...2.3.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index e08032f99160..32cf1a6aabd1 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -9,7 +9,7 @@ perl, wrapQtAppsHook, gitUpdater, - version ? "2.2.1", + version ? "2.3.0", }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { hash = { "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; - "2.2.1" = "sha256-dewsmkma8QHgb3LzRGvfntI48bOaFFsrEDrOznaC8eg="; + "2.3.0" = "sha256-lbDcIOrOkGU/n0bPPAlZSsdBYMlBh3afXwwTkTWQLpo="; } ."${version}"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ --replace-fail AppleClang Clang '' - + lib.optionalString (lib.versionOlder version "2.2.1") '' + + lib.optionalString (lib.versionOlder version "2.3.0") '' substituteInPlace CMakeLists.txt \ --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" ''; From 49e413f4f073e04cfd97df626dd9fea31f83c85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:29 -0300 Subject: [PATCH 1108/2279] lxqt.lxqt-config: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-config/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index e5fe0ca54639..60ffcdf745a9 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-config"; rev = version; - hash = "sha256-iyAqdAWcg94a65lPjq412slvSKdP3W62LTyyvYdWipA="; + hash = "sha256-2CAQeX2X0DPmgOaAEJoCLtgjFT+Z6epc/dUCbaEIlB0="; }; nativeBuildInputs = [ From 7c9b8753589d31c1224c4a0647d27cad59b4b9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:32 -0300 Subject: [PATCH 1109/2279] lxqt.lxqt-globalkeys: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-globalkeys/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index c6b75a2f0ed4..4fffc7cfcacf 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-globalkeys"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-globalkeys"; rev = version; - hash = "sha256-xVirPi0UD4lzOA1+Gw7SgUvFRIc1KYFUJtljNA7xAWo="; + hash = "sha256-ahRKkWmr6BkSByE5Vm5oqkkgQQ0Hyh4Ka7PYI8Es7AY="; }; nativeBuildInputs = [ From a108b6dc10e08686b677f5de61d507d94b847efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:40 -0300 Subject: [PATCH 1110/2279] lxqt.lxqt-menu-data: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-menu-data/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix index 1a55737e7e44..9a01fd5dc1a4 100644 --- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix +++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lxqt-menu-data"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-menu-data"; rev = version; - hash = "sha256-kFgrR7BSl08REC9SgBvLYFhJ9H++FCDQdqQaoAm5Oyw="; + hash = "sha256-9TYW3VA4qGlrkUzgZGkxf8RkIW2cTLkY6H8JHGDnoLg="; }; nativeBuildInputs = [ From ad4b56b3ff43f60abd65e1e31401a3178d4abe07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:45 -0300 Subject: [PATCH 1111/2279] lxqt.lxqt-notificationd: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-notificationd/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 693e065083d2..dfa381ece604 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-notificationd"; rev = version; - hash = "sha256-pMBshwqfG/8tvpwuR3wCQ/N5IT1rXJl+nZfcSqxMjM0="; + hash = "sha256-VmPVGqCmkTkib2T5ysov1hUY3J74GTuXdJsn5Sivreo="; }; nativeBuildInputs = [ From 7d7ec43ed5b541fe850024b8f57e77f0870dc69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:10:51 -0300 Subject: [PATCH 1112/2279] lxqt.lxqt-openssh-askpass: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-openssh-askpass/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 01d02e823405..9d4c22452038 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-openssh-askpass"; rev = version; - hash = "sha256-ktB8zlrK3ymnwoGSnWNHM6EGcwn4btdlyBQzBLQdqmY="; + hash = "sha256-f8v9HBuL78YOauipCnMRIEydudFilpFJz+KgMlnJWGU="; }; nativeBuildInputs = [ From d89c86b0201492750c22eec74037eb78f803bfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:02 -0300 Subject: [PATCH 1113/2279] lxqt.lxqt-panel: 2.2.2 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-panel/compare/2.2.2...2.3.0 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index b5893196071a..74072939347d 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, alsa-lib, @@ -36,25 +35,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxqt-panel"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-panel"; tag = finalAttrs.version; - hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY="; + hash = "sha256-cwemHe092vNRDeseXkGoWAEXawNTVbSiB87owfaLeAo="; }; - patches = [ - # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-panel/pull/2306) - # TODO: drop when upgrading beyond version 2.2.2 - (fetchpatch { - name = "cmake-fix-build-with-Qt-6.10.patch"; - url = "https://github.com/lxqt/lxqt-panel/commit/fce8cd99a1de0e637e8539c4d8ac68832a40fa6d.patch"; - hash = "sha256-KXxV6SZqdpvZSn+zbBZ32Qs6XKfFXEej1F4qBt+MzxA="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config From b3f282bd701cb4aaf39a6bbaa1babcefa12849e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:07 -0300 Subject: [PATCH 1114/2279] lxqt.lxqt-policykit: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-policykit/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 6866e0508b69..fda806a7b9ac 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-policykit"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-policykit"; rev = version; - hash = "sha256-TVgrr+Qakkk0rr7qwQPQNO7p5Wx6eVW8lK2gJ/HysZY="; + hash = "sha256-Hk8ig9x1UIKpugbJ2x16DsbCmRT0I1AnX/Y5lvP5u4Q="; }; nativeBuildInputs = [ From f1d6a2ac4bb58c2f5e6a4b8095e2339f1ba3addf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:11 -0300 Subject: [PATCH 1115/2279] lxqt.lxqt-powermanagement: 2.2.1 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-powermanagement/compare/2.2.1...2.3.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index f467a2f42158..f34466040617 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-powermanagement"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-powermanagement"; rev = version; - hash = "sha256-Awk/NlYd8HldmEL0G/LUgj101Y1BTQBrDJfG56Y/aX4="; + hash = "sha256-1TA9v2zrPoHiKUy6P4enmzvxWTD+/rGjrChE5WGMt3c="; }; nativeBuildInputs = [ From 01e1f5e1d1c59dac14a292efedeecce09112f57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:15 -0300 Subject: [PATCH 1116/2279] lxqt.lxqt-qtplugin: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-qtplugin/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index db6a8b2ae8bb..4765a792c437 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, libdbusmenu-lxqt, libfm-qt, @@ -17,25 +16,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxqt-qtplugin"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-qtplugin"; tag = finalAttrs.version; - hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q="; + hash = "sha256-3rY9VpZKnl1E3ma1ioiKECpazeymQYVuXrLXhRL407o="; }; - patches = [ - # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-qtplugin/pull/100) - # TODO: drop when upgrading beyond version 2.2.0 - (fetchpatch { - name = "cmake-fix-build-with-Qt-6.10.patch"; - url = "https://github.com/lxqt/lxqt-qtplugin/commit/90473945206dbf21816a00dfba27426a5b5a9e25.patch"; - hash = "sha256-cCghOJHsveR5IYisEFv3h8WreRDi0kuyj/2YBD+ATsc="; - }) - ]; - nativeBuildInputs = [ cmake lxqt-build-tools From c64220f167afc909e9074783408bc338c55e4e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:20 -0300 Subject: [PATCH 1117/2279] lxqt.lxqt-runner: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-runner/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 7135a93c32f9..4c53248cac49 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lxqt-runner"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-runner"; rev = version; - hash = "sha256-lvJuqwBqR/OqDsk2XdjIakxIrnOZjgWrY5DtMUV5XEM="; + hash = "sha256-h+pZiSuCdQknsyfUb9Ve1yxVyOUqNgYhIpO7kD5z3pQ="; }; nativeBuildInputs = [ From 0e6bfc23c276e10a76c397cf1e5c79a56fa4318f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:27 -0300 Subject: [PATCH 1118/2279] lxqt.lxqt-session: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-session/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index eabe94b4b2bb..647d3889e166 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "lxqt-session"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-session"; rev = version; - hash = "sha256-AwL7X8ygBkVINMCEcyImUrbwmk/T6/fwk0PEEu6iBb8="; + hash = "sha256-5VJxRho6qdPvBFr0RkYaajvVZRwhc1emzqpII+lUyOQ="; }; nativeBuildInputs = [ From cfa02911722c412ab60de565cbe1703a066afd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:11:32 -0300 Subject: [PATCH 1119/2279] lxqt.lxqt-sudo: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-sudo/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index f98f7c43fdc9..0f56e6889df8 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lxqt-sudo"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-sudo"; rev = version; - hash = "sha256-H2uprArYfiX1KyoWx3RRHkLcA0z9LKGDeghD+085VC4="; + hash = "sha256-skxPI6KEHXJReadxQinBArkCx/FjpTYDFdEpRRiqx8E="; }; nativeBuildInputs = [ From b26f17d7ef929e22d40bce5c391984a21eafd0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:13:53 -0300 Subject: [PATCH 1120/2279] lxqt.lxqt-themes: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/lxqt-themes/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f64395c948f9..d004f4d19d32 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lxqt-themes"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-themes"; rev = version; - hash = "sha256-oarj+byRfe9xHvtw80kifA2AspXHfigbuDwvi5xqrMQ="; + hash = "sha256-sdfLwLYE29Qh0QCU6t5pKIyW2RYx32WRNvNV46nCaXo="; }; nativeBuildInputs = [ From 44b7c55d5cc7d59d00ab8229a8a638e527c07038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:15:14 -0300 Subject: [PATCH 1121/2279] lxqt.lxqt-wayland-session: 0.2.0 -> 0.3.0 Diff: https://github.com/lxqt/lxqt-wayland-session/compare/0.2.0...0.3.0 --- pkgs/desktops/lxqt/lxqt-wayland-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix index 1a4fe48c72e2..20ba7d6d4426 100644 --- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-wayland-session"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-wayland-session"; rev = version; - hash = "sha256-VjOLw6ByS0se9jy1VY4xhBSs26yvoffFVAc1v0gMyYk="; + hash = "sha256-MmiYPclMW8Y9VMZsY8wx52S3fN3RzUVrhQAGs5qSTfI="; }; nativeBuildInputs = [ From 35acc7b8d35644f10c1c27ec1a5a076645e6526e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:15:24 -0300 Subject: [PATCH 1122/2279] lxqt.pavucontrol-qt: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/pavucontrol-qt/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 74937bcfb22d..35de208fb41c 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pavucontrol-qt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "pavucontrol-qt"; rev = version; - hash = "sha256-D8x3CqzttlNqQgy6k4hfjJkD/MjAG4eeCn68TQA8NSM="; + hash = "sha256-6t7nbuC/13S+Q9mINP1WuyaDqZUKp4s9LObcbSRuJ1c="; }; nativeBuildInputs = [ From ac3dd39a3c223e18d7442fdced346efe77d7cb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:15:32 -0300 Subject: [PATCH 1123/2279] lxqt.pcmanfm-qt: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/pcmanfm-qt/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 2d6f3094be2c..0e64b9e10c79 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "pcmanfm-qt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "pcmanfm-qt"; rev = version; - hash = "sha256-mYjbOb9c7Qc3qhVYt1EHy50YOVguLnwg0NJg2zBgwOM="; + hash = "sha256-Pv3N/JfUbLyCBpnmnEHL7i2du1q8vSKxTR1uIEsEe/U="; }; nativeBuildInputs = [ From 3f06d90c6bb32ca29e7bca17a2192ee7d2fb14c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:16:12 -0300 Subject: [PATCH 1124/2279] lxqt.qps: 2.11.1 -> 2.12.0 Diff: https://github.com/lxqt/qps/compare/2.11.1...2.12.0 --- pkgs/desktops/lxqt/qps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 7fa62fb0c3e5..bc21f9b95447 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qps"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "qps"; rev = version; - hash = "sha256-uWKTcFO5CoTU5jXB9x5tQ0goEvUpMaeUlMlTG2/xvYg="; + hash = "sha256-npTkPcjcxi/hAxUtyayEZeUnVx41iRJThKzhidC+4bQ="; }; nativeBuildInputs = [ From 17d9feb8672b3408cf1a0a8e502632e3baf40cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:16:21 -0300 Subject: [PATCH 1125/2279] lxqt.qterminal: 2.2.1 -> 2.3.0 Diff: https://github.com/lxqt/qterminal/compare/2.2.1...2.3.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index d3bdb38a5c04..502f13516799 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "qterminal"; rev = version; - hash = "sha256-H1UmPIZG8KiVNPW3GqgnSq39JsZeowiAVwwEKwCkWoM="; + hash = "sha256-HwWgVcO9swywei8Z3ifoGJjZ785gdF2A/kBHm4zgzFc="; }; nativeBuildInputs = [ From 315f14d5dde4e68f83f971608e98e868ec906048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:16:35 -0300 Subject: [PATCH 1126/2279] lxqt.qtermwidget: 2.2.0 -> 2.3.0 Diff: https://github.com/lxqt/qtermwidget/compare/2.2.0...2.3.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 594665c1b20a..75aaee511936 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -8,7 +8,7 @@ lxqt-build-tools, wrapQtAppsHook, gitUpdater, - version ? "2.2.0", + version ? "2.3.0", }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = { "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; - "2.2.0" = "sha256-tzgHNGB063rgFB15lHTKQplNhwJZtrRprUhMm5H62AA="; + "2.3.0" = "sha256-l+IFXiUst9PDNuD/KGzxYCUjymhWvcpMY9CF60gIfKg="; } ."${version}"; }; From c12f1c63a6515895f79a42fcc52cbd80114f3454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:16:40 -0300 Subject: [PATCH 1127/2279] lxqt.qtxdg-tools: 4.2.0 -> 4.3.0 Diff: https://github.com/lxqt/qtxdg-tools/compare/4.2.0...4.3.0 --- pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index ec94d18a1710..eb7c1261fa5a 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "qtxdg-tools"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "qtxdg-tools"; rev = version; - hash = "sha256-hVX1UfPWa1KHMhjazSopAc1/Kk3tnUQzwtG4P7K32eE="; + hash = "sha256-v6mIpGuZ3YFb+P9FLlgNp5xf0ceAaVnMxRG+sQLP72Y="; }; nativeBuildInputs = [ From c39bc84a30811d30aa56bc771d695383519ed7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:16:58 -0300 Subject: [PATCH 1128/2279] lxqt.xdg-desktop-portal-lxqt: 1.2.0 -> 1.3.0 Diff: https://github.com/lxqt/xdg-desktop-portal-lxqt/compare/1.2.0...1.3.0 --- .../lxqt/xdg-desktop-portal-lxqt/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 2836344f6ddc..9a45f570dbf7 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, kwindowsystem, libexif, @@ -17,25 +16,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-lxqt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "xdg-desktop-portal-lxqt"; tag = finalAttrs.version; - hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg="; + hash = "sha256-DNlvqZzTzZURuHTURBUXaLvMKy2HxVpgI9JwJq6A5Sw="; }; - patches = [ - # fix build against Qt >= 6.10 (https://github.com/lxqt/xdg-desktop-portal-lxqt/pull/50) - # TODO: drop when upgrading beyond version 1.2.0 - (fetchpatch { - name = "cmake-fix-build-with-Qt-6.10.patch"; - url = "https://github.com/lxqt/xdg-desktop-portal-lxqt/commit/15fae3c57a8e8149ef19a8c919f5728016390e3f.patch"; - hash = "sha256-oReYMEr+tBDHtnFDZahBwTtzgtL/BABZO64yob9tem4="; - }) - ]; - nativeBuildInputs = [ cmake wrapQtAppsHook From ed676ede30ed91f43c44cfcb6ee46e01f5a9819b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:17:50 -0300 Subject: [PATCH 1129/2279] lxqt.screengrab: 3.0.0 -> 3.1.0 Diff: https://github.com/lxqt/screengrab/compare/3.0.0...3.1.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index e93d0afce933..292985ceb2db 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, autoPatchelfHook, gitUpdater, @@ -23,25 +22,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "screengrab"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "screengrab"; tag = finalAttrs.version; - hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk="; + hash = "sha256-LORWv3qLgQF2feKodOg72g5DCfWZvB8vi0bw9jbr+tQ="; }; - patches = [ - # fix build against Qt >= 6.10 (https://github.com/lxqt/screengrab/pull/434) - # TODO: drop when upgrading beyond version 3.0.0 - (fetchpatch { - name = "cmake-fix-build-with-Qt-6.10.patch"; - url = "https://github.com/lxqt/screengrab/commit/1621ef5df9461cdd1dcef3faee36e9419f1ca08c.patch"; - hash = "sha256-+rpCDLnHmgy/1PME3QaN+978W+jR6PDmiZ/5hAx8Djg="; - }) - ]; - nativeBuildInputs = [ cmake lxqt-build-tools From 758557d74b60c09607984d8b190d6a5cf9de2993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 5 Nov 2025 18:18:10 -0300 Subject: [PATCH 1130/2279] lxqt.qlipper: 5.1.2-unstable-2025-10-29 -> 5.1.2 Diff: https://github.com/pvanek/qlipper/compare/4e9fcfe6684c465944baa153aeb7603ec27728b1...4e9fcfe6684c465944baa153aeb7603ec27728b1 --- pkgs/desktops/lxqt/qlipper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index 325864cd98df..ff55554a5335 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "qlipper"; - version = "5.1.2-unstable-2025-10-29"; + version = "5.1.2"; src = fetchFromGitHub { owner = "pvanek"; From bc905dffb221b5795f4dfe32cbf9278ba5154ddb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 5 Nov 2025 22:22:11 +0000 Subject: [PATCH 1131/2279] doctest: disable tests on `isStatic` platforms Without the change `doctest` can't be built as https://hydra.nixos.org/build/311427996: [ 80%] Linking CXX shared library libimplementation.so ld: crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object ld: failed to set dynamic section sizes: bad value collect2: error: ld returned 1 exit status Thus is fail `nixStatic` and `lixStatic` packages in `master`. Let's disable tests that require stared libraries. ZHF: #457852 --- pkgs/by-name/do/doctest/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix index 590252b0fdad..d9d8769f102b 100644 --- a/pkgs/by-name/do/doctest/package.nix +++ b/pkgs/by-name/do/doctest/package.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ + # One of the examples tests shared library support + # and fails linking. + "-DDOCTEST_WITH_TESTS=OFF" + ]; + doCheck = true; # Fix the build with LLVM 21 / GCC 15. From 37c785f3ed57c9bbd724b319eeee35b9aa77e860 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 01:48:39 +0300 Subject: [PATCH 1132/2279] python313Packages.moonraker-api: add missing dependency --- pkgs/development/python-modules/moonraker-api/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index f45195078d38..0e7e4cbb1b7e 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + async-timeout, buildPythonPackage, fetchFromGitHub, pytest-aiohttp, @@ -28,7 +29,10 @@ buildPythonPackage rec { --replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",' ''; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; nativeCheckInputs = [ pytest-aiohttp From 941f87c4fdc25170b6c0ced21cb4528c98e775f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 23:04:56 +0000 Subject: [PATCH 1133/2279] python3Packages.rigour: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/rigour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index d70d39d7b379..e3ada1bcfcff 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rigour"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-PxlYJQN2y+mqS48Cbd3/dCubzNzMVL+Q+MR5YJmAVtI="; + hash = "sha256-714kmNVPreGsl8Kh70nD+zGzDVMZQg5vEjehPH7V5I8="; }; build-system = [ From d923ac4fdc432ccd98be1b6681128a1ec9f0a442 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 4 Nov 2025 09:41:26 +0000 Subject: [PATCH 1134/2279] python3Packages.lance-namespace: init at 0.0.20 --- .../lance-namespace/default.nix | 111 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 113 insertions(+) create mode 100644 pkgs/development/python-modules/lance-namespace/default.nix diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix new file mode 100644 index 000000000000..f19307f524a3 --- /dev/null +++ b/pkgs/development/python-modules/lance-namespace/default.nix @@ -0,0 +1,111 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + lance-namespace-urllib3-client, + pyarrow, + # pylance, + typing-extensions, + + # optional-dependencies + # dir + opendal, + # glue + boto3, + botocore, + # hive2 + hive-metastore-client, + thrift, + + # tests + pylance, + pytestCheckHook, + lance-namespace, +}: + +buildPythonPackage rec { + pname = "lance-namespace"; + version = "0.0.20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lancedb"; + repo = "lance-namespace"; + tag = "v${version}"; + hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4="; + }; + + sourceRoot = "${src.name}/python/lance_namespace"; + + build-system = [ + hatchling + ]; + + pythonRemoveDeps = [ + "pylance" + ]; + dependencies = [ + lance-namespace-urllib3-client + typing-extensions + # pylance + pyarrow + ]; + + optional-dependencies = { + dir = [ opendal ]; + glue = [ + boto3 + botocore + ]; + hive2 = [ + hive-metastore-client + thrift + ]; + }; + + pythonImportsCheck = [ "lance_namespace" ]; + + nativeCheckInputs = [ + pylance + pytestCheckHook + ] + ++ lib.flatten (lib.attrValues optional-dependencies); + + # Tests require pylance, which is a circular dependency + doCheck = false; + + passthru.tests.pytest = lance-namespace.overridePythonAttrs { + disabledTests = [ + # AttributeError: 'function' object has no attribute 'write_dataset' + "test_create_table" + "test_describe_table" + "test_drop_table" + "test_list_tables" + + # RuntimeError: Failed to list tables: Operator.list() got an unexpected keyword argument 'recursive' + "test_create_empty_table" + "test_empty_list_tables" + + # lance_namespace.unity.LanceNamespaceException: Failed to drop namespace: BehaviorEnum + "test_drop_namespace" + + # pydantic_core._pydantic_core.ValidationError: 1 validation error for ListNamespacesResponse namespaces + "test_list_namespaces_schemas" + "test_list_namespaces_top_level" + ]; + + doCheck = true; + }; + + meta = { + description = "Open specification on top of the storage-based Lance table and file format to standardize access to a collection of Lance tables"; + homepage = "https://github.com/lancedb/lance-namespace/tree/main/python/lance_namespace"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a271c4f89dac..86cfe536f474 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8000,6 +8000,8 @@ self: super: with self; { lammps = callPackage ../development/python-modules/lammps { inherit (pkgs) lammps; }; + lance-namespace = callPackage ../development/python-modules/lance-namespace { }; + lance-namespace-urllib3-client = callPackage ../development/python-modules/lance-namespace-urllib3-client { }; From c21883307f297d38469bd12c950a1c825df95228 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 4 Nov 2025 09:23:17 +0000 Subject: [PATCH 1135/2279] python3Packages.pylance: 0.38.3 -> 0.39.0 Diff: https://github.com/lancedb/lance/compare/v0.38.3...v0.39.0 Changelog: https://github.com/lancedb/lance/releases/tag/v0.39.0 --- pkgs/development/python-modules/pylance/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 8cb5cbefaa39..08d47fda0d57 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -13,6 +13,7 @@ protobuf, # dependencies + lance-namespace, numpy, pyarrow, @@ -32,14 +33,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.38.3"; + version = "0.39.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-R/JO8Q/8g3jxnPgzq5KnvTNNzg46bODNHWmgonS7ChY="; + hash = "sha256-e0ZpuC0ezk+ZwmCrWkdD2MnCvnjHVVPsN01JWUNyPf4="; }; sourceRoot = "${src.name}/python"; @@ -51,7 +52,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-F2HwWVXwmydQtyr02l/ydv1zhkvjVM5zEUenWKkMfyw="; + hash = "sha256-bvnmlUSnZolwesGtIrWve0a8yQXeYDuaP7mCh3KDd5U="; }; nativeBuildInputs = [ @@ -73,6 +74,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pyarrow" ]; dependencies = [ + lance-namespace numpy pyarrow ]; From 938f6da79d6d28a2edd20f81506f2056b4204691 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Nov 2025 23:43:11 +0000 Subject: [PATCH 1136/2279] v2ray-domain-list-community: 20251028154325 -> 20251105132907 --- pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 38166cc31d10..d53309d6d1c4 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20251028154325"; + version = "20251105132907"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-ugNLlCfAhXvIPQTae3Z22rlpNG32RmIrIt/iilIj+iA="; + hash = "sha256-yH3vykMcxxlGXRUlZm6kKBkvsaQrTrnv+bYnZywu3go="; }; vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU="; meta = with lib; { From c42a041a7a0ed87653732832df35745908767769 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 00:00:53 +0000 Subject: [PATCH 1137/2279] python3Packages.environs: 14.4.0 -> 14.5.0 --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 91ec68a0a511..22a6b0bb9735 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "environs"; - version = "14.4.0"; + version = "14.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; tag = version; - hash = "sha256-901TvjY5VzWLzQGBmTQ/K0giPt010+GH5eVWk58Pqng="; + hash = "sha256-g9n4GuVSHB2VourVYlzp3zKO7MnJK4IAakbYV5tM8Uc="; }; nativeBuildInputs = [ flit-core ]; From 2bb0ff7f6cd0d95f41a70690c8089c3d8833afb6 Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 6 Nov 2025 09:19:21 +0900 Subject: [PATCH 1138/2279] process-compose: 1.76.0 -> 1.76.1 https://github.com/F1bonacc1/process-compose/releases/tag/v1.76.1 Signed-off-by: misilelab --- pkgs/by-name/pr/process-compose/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index f3594c4de5d6..54d909645368 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule (finalAttrs: { pname = "process-compose"; - version = "1.76.0"; + version = "1.76.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = "process-compose"; tag = "v${finalAttrs.version}"; - hash = "sha256-DYWMtW2JLUbt2Bk/dSBjRc4GHpav0dr8sQOYeBkL/3c="; + hash = "sha256-WdTvOBp9UiuCMNdi80jEWwkAhS4zoli4tf8JERPN3Nk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. From d40336ac678729af86964112066a97ad6d9791bc Mon Sep 17 00:00:00 2001 From: thesn10 <38666407+thesn10@users.noreply.github.com> Date: Sun, 13 Jul 2025 21:17:32 +0200 Subject: [PATCH 1139/2279] maintainers: add thesn --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index abe14e72f668..eedff36b5640 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25956,6 +25956,11 @@ githubId = 91203390; name = "Felix Kimmel"; }; + thesn = { + github = "thesn10"; + githubId = 38666407; + name = "TheSN"; + }; thesola10 = { email = "me@thesola.io"; github = "Thesola10"; From 3761916b05b72c28074fd7471ea3b9809884bdcb Mon Sep 17 00:00:00 2001 From: thesn10 <38666407+thesn10@users.noreply.github.com> Date: Sun, 13 Jul 2025 22:18:57 +0200 Subject: [PATCH 1140/2279] gpac: add ffmpeg support & refactor --- pkgs/by-name/gp/gpac/package.nix | 102 +++++++++++++++++++++++++------ pkgs/top-level/all-packages.nix | 13 ++++ 2 files changed, 96 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix index 44da242fca32..3b86c7fe2043 100644 --- a/pkgs/by-name/gp/gpac/package.nix +++ b/pkgs/by-name/gp/gpac/package.nix @@ -5,35 +5,98 @@ cctools, pkg-config, zlib, + ffmpeg, + freetype, + libjpeg, + libpng, + libmad, + faad2, + libogg, + libvorbis, + libtheora, + a52dec, + nghttp2, + openjpeg, + libcaca, + libXv, + mesa, + mesa_glu, + xvidcore, + openssl, + jack2, + alsa-lib, + pulseaudio, + SDL2, + curl, + + withFullDeps ? false, + withFfmpeg ? withFullDeps, + releaseChannel ? "stable", }: stdenv.mkDerivation rec { pname = "gpac"; - version = "2.4.0"; + version = if releaseChannel == "nightly" then "2.4-unstable-2025-07-11" else "2.4.0"; - src = fetchFromGitHub { - owner = "gpac"; - repo = "gpac"; - rev = "v${version}"; - hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM="; - }; + src = + if releaseChannel == "nightly" then + fetchFromGitHub { + owner = "gpac"; + repo = "gpac"; + rev = "fe88c3545aadd597b250ccf23271d5d3de50ccc8"; + hash = "sha256-c6B9Y19ZZ3PLz82GCcjkWzcUQSEK7ufVNEzqHQqOvrI="; + } + else + fetchFromGitHub { + owner = "gpac"; + repo = "gpac"; + rev = "v${version}"; + hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM="; + }; - # this is the bare minimum configuration, as I'm only interested in MP4Box - # For most other functionality, this should probably be extended - nativeBuildInputs = [ - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ]; + nativeBuildInputs = + [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ] + ++ lib.optionals withFfmpeg [ + ffmpeg + ]; + # ref: https://wiki.gpac.io/Build/build/GPAC-Build-Guide-for-Linux/#gpac-easy-build-recommended-for-most-users buildInputs = [ zlib + ] + ++ lib.optionals withFullDeps [ + freetype + libjpeg + libpng + libmad + faad2 + libogg + libvorbis + libtheora + a52dec + nghttp2 + openjpeg + libcaca + libXv + mesa + mesa_glu + xvidcore + openssl + jack2 + alsa-lib + pulseaudio + SDL2 + curl ]; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Open Source multimedia framework for research and academic purposes"; longDescription = '' GPAC is an Open Source multimedia framework for research and academic purposes. @@ -48,10 +111,11 @@ stdenv.mkDerivation rec { And some server tools included in MP4Box and MP42TS applications. ''; homepage = "https://gpac.wp.imt.fr"; - license = licenses.lgpl21; - maintainers = with maintainers; [ + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ mgdelacroix + thesn ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcd95dbaf55d..aaa4994a3284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14539,4 +14539,17 @@ with pkgs; davis = callPackage ../by-name/da/davis/package.nix { php = php83; # https://github.com/tchapi/davis/issues/195 }; + + gpac = callPackage ../by-name/gp/gpac/package.nix { + ffmpeg = ffmpeg.override { + version = "7.0.2"; + hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs="; + ffmpegVariant = "headless"; + }; + }; + + gpac_nightly = callPackage ../by-name/gp/gpac/package.nix { + ffmpeg = ffmpeg-headless; + releaseChannel = "nightly"; + }; } From 10bd45330a66da2a5d8af4c3c52175a23ab72e63 Mon Sep 17 00:00:00 2001 From: thesn10 <38666407+thesn10@users.noreply.github.com> Date: Sun, 26 Oct 2025 15:16:13 +0100 Subject: [PATCH 1141/2279] gpac: 2.4-unstable-2025-07-11 -> 2.4-unstable-2025-10-26 --- pkgs/by-name/gp/gpac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix index 3b86c7fe2043..ea9f1df7280d 100644 --- a/pkgs/by-name/gp/gpac/package.nix +++ b/pkgs/by-name/gp/gpac/package.nix @@ -36,15 +36,15 @@ stdenv.mkDerivation rec { pname = "gpac"; - version = if releaseChannel == "nightly" then "2.4-unstable-2025-07-11" else "2.4.0"; + version = if releaseChannel == "nightly" then "2.4-unstable-2025-10-26" else "2.4.0"; src = if releaseChannel == "nightly" then fetchFromGitHub { owner = "gpac"; repo = "gpac"; - rev = "fe88c3545aadd597b250ccf23271d5d3de50ccc8"; - hash = "sha256-c6B9Y19ZZ3PLz82GCcjkWzcUQSEK7ufVNEzqHQqOvrI="; + rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3"; + hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4="; } else fetchFromGitHub { From ccf31c556a8c00416097c207092d5088a0e4786e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 00:48:59 +0000 Subject: [PATCH 1142/2279] sdl_gamecontrollerdb: 0-unstable-2025-10-26 -> 0-unstable-2025-11-04 --- pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index fcb51f9dcfcd..a23c318ca5b3 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2025-10-26"; + version = "0-unstable-2025-11-04"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "e40b8910f859cd988124def50dcdb63b2f2ff48b"; - hash = "sha256-mSTRTtoFaYXS2ywe7g68dKuJD6FG3436HDip4cm8MeM="; + rev = "958e252520ece96cd1b03d5ff0d835db2f048991"; + hash = "sha256-xM/hdwLsNLisXKXLP2Np5enmL/q27xsV4OHSsM5vsuw="; }; dontBuild = true; From 62d9589af359626a841841e8f991bf9bd57cc1bf Mon Sep 17 00:00:00 2001 From: thesn10 <38666407+thesn10@users.noreply.github.com> Date: Thu, 6 Nov 2025 00:55:23 +0100 Subject: [PATCH 1143/2279] gpac: libjpegturbo, x11, updateScript & refactor --- pkgs/by-name/gp/gpac/package.nix | 98 +++++++++++++++++++++----------- pkgs/top-level/all-packages.nix | 13 +---- 2 files changed, 66 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix index ea9f1df7280d..5603ae754edf 100644 --- a/pkgs/by-name/gp/gpac/package.nix +++ b/pkgs/by-name/gp/gpac/package.nix @@ -2,12 +2,14 @@ lib, stdenv, fetchFromGitHub, + gitUpdater, + unstableGitUpdater, cctools, pkg-config, zlib, - ffmpeg, + ffmpeg-headless, freetype, - libjpeg, + libjpeg_turbo, libpng, libmad, faad2, @@ -18,7 +20,6 @@ nghttp2, openjpeg, libcaca, - libXv, mesa, mesa_glu, xvidcore, @@ -28,42 +29,67 @@ pulseaudio, SDL2, curl, + xorg, withFullDeps ? false, withFfmpeg ? withFullDeps, releaseChannel ? "stable", }: -stdenv.mkDerivation rec { +let + stable = rec { + version = "2.4.0"; # See below TODO. + src = fetchFromGitHub { + owner = "gpac"; + repo = "gpac"; + rev = "v${version}"; + hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM="; + }; + updateScript = gitUpdater { + odd-unstable = true; + rev-prefix = "v"; + ignoredVersions = "^(abi|test)"; + }; + } + // { + # ffmpeg 7.0.2 works, but 7.1.1 (which is packaged in nixpkgs) doesn't + # because v2.4.0 of this package relies on internal private ffmpeg fields. + # TODO: remove this, and switch to simply using ffmpeg-headless, + # when updating stable to 2.6 + ffmpeg-headless = ffmpeg-headless.override { + version = "7.0.2"; + hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs="; + }; + }; + unstable = { + version = "2.4-unstable-2025-10-26"; + src = fetchFromGitHub { + owner = "gpac"; + repo = "gpac"; + rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3"; + hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4="; + }; + updateScript = unstableGitUpdater { + tagFormat = "v*"; + tagPrefix = "v"; + }; + inherit ffmpeg-headless; + }; + channelToUse = if releaseChannel == "unstable" then unstable else stable; +in +stdenv.mkDerivation (finalAttrs: { pname = "gpac"; - version = if releaseChannel == "nightly" then "2.4-unstable-2025-10-26" else "2.4.0"; + inherit (channelToUse) version src; - src = - if releaseChannel == "nightly" then - fetchFromGitHub { - owner = "gpac"; - repo = "gpac"; - rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3"; - hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4="; - } - else - fetchFromGitHub { - owner = "gpac"; - repo = "gpac"; - rev = "v${version}"; - hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM="; - }; - - nativeBuildInputs = - [ - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ] - ++ lib.optionals withFfmpeg [ - ffmpeg - ]; + nativeBuildInputs = [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ] + ++ lib.optionals withFfmpeg [ + channelToUse.ffmpeg-headless + ]; # ref: https://wiki.gpac.io/Build/build/GPAC-Build-Guide-for-Linux/#gpac-easy-build-recommended-for-most-users buildInputs = [ @@ -71,7 +97,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withFullDeps [ freetype - libjpeg + libjpeg_turbo libpng libmad faad2 @@ -82,7 +108,9 @@ stdenv.mkDerivation rec { nghttp2 openjpeg libcaca - libXv + xorg.libX11 + xorg.libXv + xorg.xorgproto mesa mesa_glu xvidcore @@ -96,6 +124,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = channelToUse.updateScript; + meta = { description = "Open Source multimedia framework for research and academic purposes"; longDescription = '' @@ -118,4 +148,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaa4994a3284..1f983ac7f56a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14540,16 +14540,7 @@ with pkgs; php = php83; # https://github.com/tchapi/davis/issues/195 }; - gpac = callPackage ../by-name/gp/gpac/package.nix { - ffmpeg = ffmpeg.override { - version = "7.0.2"; - hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs="; - ffmpegVariant = "headless"; - }; - }; - - gpac_nightly = callPackage ../by-name/gp/gpac/package.nix { - ffmpeg = ffmpeg-headless; - releaseChannel = "nightly"; + gpac-unstable = callPackage ../by-name/gp/gpac/package.nix { + releaseChannel = "unstable"; }; } From 1efdfd67b43188b7638864756359dc6eb5a26cdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 01:06:10 +0000 Subject: [PATCH 1144/2279] poliedros: 1.5.0 -> 1.5.2 --- pkgs/by-name/po/poliedros/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poliedros/package.nix b/pkgs/by-name/po/poliedros/package.nix index 8ac5093b4f09..184f06e4cae0 100644 --- a/pkgs/by-name/po/poliedros/package.nix +++ b/pkgs/by-name/po/poliedros/package.nix @@ -14,7 +14,7 @@ nix-update-script, }: let - version = "1.5.0"; + version = "1.5.2"; in python3Packages.buildPythonApplication { pname = "poliedros"; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication { owner = "kriptolix"; repo = "Poliedros"; tag = "v${version}"; - hash = "sha256-1itBovF5xGB8zMedtKKcQ2FJeOd5gT1COrJtwEOgdbk="; + hash = "sha256-1xrXR0kY4zq2cafhVgPvWcJD7pEEiZX7tW1/T3Mfe+A="; }; nativeBuildInputs = [ From 5da3cfa457421f14bd656e154715c1deada26f7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 01:18:43 +0000 Subject: [PATCH 1145/2279] mirrord: 3.170.0 -> 3.171.0 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 52c5c48ae386..ce4129d59089 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.170.0", + "version": "3.171.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_x86_64", - "hash": "sha256-q5A4KELOl/rbWxrlBk2XjCOq4A/tFySx46FNhDanTsE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_linux_x86_64", + "hash": "sha256-Xzy8Qvsw/nVTa6PRRdsBbOZHfPGKzRimbOVDa6qqVXc=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_aarch64", - "hash": "sha256-G8xrksOIqJ//kXYY7tdL9GzKFrt4ttPnviRnCUuyvuk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_linux_aarch64", + "hash": "sha256-7h7eRqypiqv0Ri9Bc61+AkYVm12GPwsPQKYYtMoyLho=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal", - "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_mac_universal", + "hash": "sha256-rvlU8erkgb/Sdythejl02w76gaZXB8CmfiW0FMadcA4=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal", - "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_mac_universal", + "hash": "sha256-rvlU8erkgb/Sdythejl02w76gaZXB8CmfiW0FMadcA4=" } } } From 40412c4c7c477abc7ae6e3610074dcb2e5b3c7bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 01:45:15 +0000 Subject: [PATCH 1146/2279] comaps: 2025.10.20-1 -> 2025.11.01-7 --- pkgs/by-name/co/comaps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix index 5667c5231ed1..74944ce825ef 100644 --- a/pkgs/by-name/co/comaps/package.nix +++ b/pkgs/by-name/co/comaps/package.nix @@ -36,14 +36,14 @@ let in organicmaps.overrideAttrs (oldAttrs: rec { pname = "comaps"; - version = "2025.10.20-1"; + version = "2025.11.01-7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "comaps"; repo = "comaps"; tag = "v${version}"; - hash = "sha256-9L7wyIXieKkKSrudnmPyiLPu4Jfp10xWi5o5lGslLWc="; + hash = "sha256-qmIL8VIjHYivFCR5lAYY55aeQgsYsvzBwpSVxc74EC8="; fetchSubmodules = true; }; From dc8bfca3e7b457d8cca4036f033f348ec01318de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 02:00:59 +0000 Subject: [PATCH 1147/2279] plantuml-server: 1.2025.8 -> 1.2025.10 --- pkgs/by-name/pl/plantuml-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix index e2fc1900f9c1..1036d73e1973 100644 --- a/pkgs/by-name/pl/plantuml-server/package.nix +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "plantuml-server"; - version = "1.2025.8"; + version = "1.2025.10"; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - hash = "sha256-O0hH2cWf8V5RwcdUlzNO8HLSghhTbdC/1mAenxrXB6s="; + hash = "sha256-GbFbQRVTQsGstu61FKpAypvopP6peHHMzxFA8yGtRp4="; }; dontUnpack = true; From 77eb3eaf3589f7bf9096944e01865a45d4a5b637 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 02:11:34 +0000 Subject: [PATCH 1148/2279] rusty-psn: 0.5.9 -> 0.5.10 --- pkgs/by-name/ru/rusty-psn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 3a3304f5f956..4ce2c02cd5ce 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "rusty-psn"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "RainbowCookie32"; repo = "rusty-psn"; tag = "v${version}"; - hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I="; + hash = "sha256-3sy3PBiV7ioRnYwI2vF6lGVj3Q/Ls6GmENyGePCgQ3k="; }; - cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw="; + cargoHash = "sha256-orsCExYx9ZGtda13mmFk7665WFwZ7E7rr5wEcDxc+vY="; # Tests require network access doCheck = false; From 1a24b14b4fd3adfa79751a3445fb2e0e74eefaf1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 28 Oct 2025 12:16:03 +0800 Subject: [PATCH 1149/2279] sing-box: 1.12.11 -> 1.12.12 --- pkgs/by-name/si/sing-box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index d6762c1fae33..8a29e6815716 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.12.11"; + version = "1.12.12"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-K28Lf5WOd0RNpk7nRettrJLc5WrGgqki5Dj4zxfmZ+4="; + hash = "sha256-4TQLaDjZYcm8FVBo06c4rKuXEO2xRGm6cIzpkPwtL/g="; }; - vendorHash = "sha256-+p2esP5sKNSPJ2ig9R58PflsMPlrGv+MJCwX0ESMmbc="; + vendorHash = "sha256-R9dN2/MmuAeYB9UkNDbhc48SelBMR80nMnptNKD0y9c="; tags = [ "with_quic" From 708fd6dd0afb261a52f53edf713f781bfcb39f1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 02:41:49 +0000 Subject: [PATCH 1150/2279] vacuum-tube: 1.3.21 -> 1.3.23 --- pkgs/by-name/va/vacuum-tube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix index b3dcc291ae01..227f35f3d2d9 100644 --- a/pkgs/by-name/va/vacuum-tube/package.nix +++ b/pkgs/by-name/va/vacuum-tube/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "vacuum-tube"; - version = "1.3.21"; + version = "1.3.23"; src = fetchFromGitHub { owner = "shy1132"; repo = "VacuumTube"; tag = "v${version}"; - hash = "sha256-0PX9GJsG3jCiARO4ZmchrPo4s5mWodwbgNtKOa801O0="; + hash = "sha256-/gxMhUkGtImSdye/mEzUGG62Lv2mKXeWbOMlZ2sXOLE="; }; - npmDepsHash = "sha256-jI+0vrxnOTjckhoF0l4cuv95Yu9HvL1g/HS65ktYxWk="; + npmDepsHash = "sha256-9D1vve10vuwakfSbthI/FUI4OVM0s96msjrEEFT49A8="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; From 4b3545e8abb738ee1cb2bdd96c468cf4b4d3b10f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 03:43:34 +0000 Subject: [PATCH 1151/2279] python3Packages.pyairtable: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/pyairtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyairtable/default.nix b/pkgs/development/python-modules/pyairtable/default.nix index e3ece5ad3233..75a314bb50ed 100644 --- a/pkgs/development/python-modules/pyairtable/default.nix +++ b/pkgs/development/python-modules/pyairtable/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pyairtable"; - version = "3.2.0"; + version = "3.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9v0eOr3CgBTb7N6FkcgmVgxctaLTieUYZHwuXsuIR40="; + hash = "sha256-1tO3f2/regKoR3nCI103pGYF82AwzyDtmbCLq3MQiow="; }; build-system = [ From b04921293d2d1b5ade239e1aeb1ed618d10f1988 Mon Sep 17 00:00:00 2001 From: iamanaws <78835633+Iamanaws@users.noreply.github.com> Date: Wed, 5 Nov 2025 19:45:58 -0800 Subject: [PATCH 1152/2279] textcompare: 0.1.6 -> 0.1.7 --- pkgs/by-name/te/textcompare/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix index 6d023297bc15..2a1612a6fb8c 100644 --- a/pkgs/by-name/te/textcompare/package.nix +++ b/pkgs/by-name/te/textcompare/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "textcompare"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "josephmawa"; repo = "TextCompare"; tag = "v${finalAttrs.version}"; - hash = "sha256-KWW83866dZRpuJzzYwk2X1/6OoD4gPnm2LD6IlP3fps="; + hash = "sha256-d+P5Vf1WQCNCTXUl6yK2dYp8HhwTj1Wjf8puFKHuFtw="; }; strictDeps = true; From 002065db7965f66be1c7fa61101ac0ee3553cd9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 03:51:28 +0000 Subject: [PATCH 1153/2279] python3Packages.torchio: 0.20.23 -> 0.21.0 --- pkgs/development/python-modules/torchio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index fd08e25f76a1..8411f4438727 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.20.23"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "TorchIO-project"; repo = "torchio"; tag = "v${version}"; - hash = "sha256-OSqXV8aINqi7MstUy4RfIWLH4NxJB+r1tdzMrSgo7pg="; + hash = "sha256-y3p5LdBC/O82GVroA5B0PNC5qRwVjNbiNroJrV1iU/A="; }; build-system = [ From f720bb2492750ec820dc50f595e94e36954704ff Mon Sep 17 00:00:00 2001 From: kyehn <228304369+kyehn@users.noreply.github.com> Date: Thu, 6 Nov 2025 09:50:19 +0800 Subject: [PATCH 1154/2279] clash-rs: 0.9.1 -> 0.9.2 --- pkgs/by-name/cl/clash-rs/Cargo.patch | 26 +++++++++++++------------- pkgs/by-name/cl/clash-rs/package.nix | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch index 9c1141bdb9e9..dac558bce3e0 100644 --- a/pkgs/by-name/cl/clash-rs/Cargo.patch +++ b/pkgs/by-name/cl/clash-rs/Cargo.patch @@ -1,24 +1,24 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -1250,7 +1250,7 @@ +@@ -1249,7 +1249,7 @@ "sha2", "shadowquic", "shadowsocks", - "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)", -+ "smoltcp 0.12.0", - "socket2 0.6.0", ++ "smoltcp", + "sock2proc", + "socket2 0.6.1", "tempfile", - "thiserror 2.0.17", -@@ -4096,7 +4096,7 @@ +@@ -4234,7 +4234,7 @@ "etherparse 0.16.0", "futures", "rand 0.8.5", - "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smoltcp 0.12.0", ++ "smoltcp", "spin 0.9.8", "tokio", "tokio-util", -@@ -6487,20 +6487,6 @@ +@@ -6632,20 +6632,6 @@ ] [[package]] @@ -36,15 +36,15 @@ -] - -[[package]] - name = "socket2" - version = "0.4.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -8792,7 +8778,7 @@ + name = "sock2proc" + version = "0.1.0" + source = "git+https://github.com/Watfaq/sock2proc.git?rev=1097e6b#1097e6ba692025f80567446e0035af1222f5231f" +@@ -8964,7 +8950,7 @@ "netstack-lwip", "netstack-smoltcp", "rand 0.9.2", - "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smoltcp 0.12.0", - "socket2 0.6.0", ++ "smoltcp", + "socket2 0.6.1", "tokio", "tracing", diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index 05a379a7fb13..4ce8bb9bbd8f 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-asD7veAYdIF5biCbSXYvAyW/qBra3tvON9TQYCw6nB8="; + hash = "sha256-FFbRopIaAOpfb+Wbj+EUXRr89EQE108h8OMn+fpL+ew="; }; - cargoHash = "sha256-9zCQKxkjiskkBGxfnq2ANpqWobs+UJ5qCsbME2Z7GY4="; + cargoHash = "sha256-JYvITscH1K6xLE6XZpMrEFZWcbue7x7xuPxVQW/Vjb0="; cargoPatches = [ ./Cargo.patch ]; From e538beb4aca2c075da5ca5824378e037625db2b4 Mon Sep 17 00:00:00 2001 From: qzylinra <225773816+qzylinra@users.noreply.github.com> Date: Thu, 6 Nov 2025 01:24:23 +0000 Subject: [PATCH 1155/2279] libcef: drop --- .../applications/video/obs-studio/default.nix | 39 ++-- pkgs/by-name/bo/bolt-launcher/package.nix | 15 +- pkgs/by-name/ce/cef-binary/package.nix | 111 +++++++++++- .../ce/cef-binary}/update.sh | 6 +- .../li/linux-wallpaperengine/package.nix | 16 +- .../compilers/jetbrains-jdk/jcef.nix | 91 ++-------- pkgs/development/libraries/libcef/default.nix | 168 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 9 files changed, 167 insertions(+), 282 deletions(-) rename pkgs/{development/libraries/libcef => by-name/ce/cef-binary}/update.sh (86%) delete mode 100644 pkgs/development/libraries/libcef/default.nix diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 64938df8bbbd..ba5818198996 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -7,6 +7,7 @@ nv-codec-headers-12, fetchFromGitHub, fetchpatch2, + fetchurl, addDriverRunpath, autoAddDriverRunpath, cudaSupport ? config.cudaSupport, @@ -68,19 +69,33 @@ let inherit (lib) optional optionals; - cef = cef-binary.overrideAttrs (oldAttrs: { - version = "138.0.17"; - __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD - gitRevision = "ac9b751"; - chromiumVersion = "138.0.7204.97"; + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); - srcHash = - { - aarch64-linux = "sha256-kdO7c9oUfv0HK8wTmvYzw9S6EapnSGEQNCGN9D1JSL0="; - x86_64-linux = "sha256-3qgIhen6l/kxttyw0z78nmwox62riVhlmFSGPkUot7g="; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }); + cef = cef-binary.overrideAttrs ( + oldAttrs: + let + version = "6533"; + revision = "6"; + in + { + inherit version; + + src = fetchurl { + url = "https://cdn-fastly.obsproject.com/downloads/cef_binary_${version}_linux_${ + selectSystem { + aarch64-linux = "aarch64"; + x86_64-linux = "x86_64"; + } + }_v${revision}.tar.xz"; + hash = selectSystem { + aarch64-linux = "sha256-ZCUURp6qKaXIh4kQhNLnP33C10Bfffp3JrLbwkswmZk="; + x86_64-linux = "sha256-eWMzVRmhnM3FIz9zNMWrAjAm4vPpoMxBcAfAnYZggUY="; + }; + }; + } + ); in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index acedcd6ca3a8..e9a0f451b99d 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -23,19 +23,16 @@ enableRS3 ? false, }: let - cef = cef-binary.overrideAttrs (oldAttrs: { + cef = cef-binary.override { version = "126.2.18"; - __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD gitRevision = "3647d39"; chromiumVersion = "126.0.6478.183"; - srcHash = - { - aarch64-linux = "sha256-Ni5aEbI+WuMnbT8gPWMONN5NkTySw7xJvnM6U44Njao="; - x86_64-linux = "sha256-YwND4zsndvmygJxwmrCvaFuxjJO704b6aDVSJqpEOKc="; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }); + srcHashes = { + aarch64-linux = "sha256-Ni5aEbI+WuMnbT8gPWMONN5NkTySw7xJvnM6U44Njao="; + x86_64-linux = "sha256-YwND4zsndvmygJxwmrCvaFuxjJO704b6aDVSJqpEOKc="; + }; + }; in let bolt = stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/ce/cef-binary/package.nix b/pkgs/by-name/ce/cef-binary/package.nix index 060e935cfe88..35bb0309cdaf 100644 --- a/pkgs/by-name/ce/cef-binary/package.nix +++ b/pkgs/by-name/ce/cef-binary/package.nix @@ -1,15 +1,118 @@ { - libcef, + lib, + stdenv, + fetchurl, + glib, + nss, + nspr, + atk, + at-spi2-atk, + libdrm, + expat, + libxkbcommon, + libgbm, + gtk3, + pango, + cairo, + alsa-lib, + dbus, + at-spi2-core, + cups, + libGL, + udev, + systemdLibs, + xorg, + version ? "141.0.7", + gitRevision ? "a5714cc", + chromiumVersion ? "141.0.7390.108", + buildType ? "Release", + srcHashes ? { + aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE="; + x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk="; + }, }: -libcef.overrideAttrs (oldAttrs: { +let + gl_rpath = lib.makeLibraryPath [ stdenv.cc.cc ]; + + rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + expat + libxkbcommon + libgbm + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + libGL + udev + systemdLibs + xorg.libxcb + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + ]; + + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); +in +stdenv.mkDerivation { pname = "cef-binary"; + inherit version; + + src = fetchurl { + url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${ + selectSystem { + aarch64-linux = "linuxarm64"; + x86_64-linux = "linux64"; + } + }_minimal.tar.bz2"; + hash = selectSystem srcHashes; + }; + + dontStrip = true; + + dontPatchELF = true; installPhase = '' runHook preInstall - cp -r .. $out + sed 's/-O0/-O2/' -i cmake/cef_variables.cmake + patchelf --set-rpath "${rpath}" --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${buildType}/chrome-sandbox + patchelf --add-needed libudev.so --set-rpath "${rpath}" ${buildType}/libcef.so + patchelf --set-rpath "${gl_rpath}" ${buildType}/libEGL.so + patchelf --add-needed libGL.so.1 --set-rpath "${gl_rpath}" ${buildType}/libGLESv2.so + patchelf --set-rpath "${gl_rpath}" ${buildType}/libvk_swiftshader.so + patchelf --set-rpath "${gl_rpath}" ${buildType}/libvulkan.so.1 + cp --recursive . $out runHook postInstall ''; -}) + + passthru = { + inherit buildType; + updateScript = ./update.sh; + }; + + meta = { + description = "Simple framework for embedding Chromium-based browsers in other applications"; + homepage = "https://cef-builds.spotifycdn.com/index.html"; + maintainers = with lib.maintainers; [ puffnfresh ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.bsd3; + platforms = builtins.attrNames srcHashes; + }; +} diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/by-name/ce/cef-binary/update.sh similarity index 86% rename from pkgs/development/libraries/libcef/update.sh rename to pkgs/by-name/ce/cef-binary/update.sh index 556337c5333d..2aa4e0155d60 100755 --- a/pkgs/development/libraries/libcef/update.sh +++ b/pkgs/by-name/ce/cef-binary/update.sh @@ -3,7 +3,7 @@ set -euo pipefail -current_version=$(nix-instantiate --eval -E "with import ./. {}; libcef.version or (lib.getVersion libcef)" | tr -d '"') +current_version=$(nix-instantiate --eval -E "with import ./. {}; cef-binary or (lib.getVersion cef-binary)" | tr -d '"') ROOT="$(dirname "$(realpath "${BASH_SOURCE[0]}")")" @@ -23,7 +23,7 @@ fi update_nix_value() { local key="$1" local value="${2:-}" - sed -i "s|$key = \".*\"|$key = \"$value\"|" $ROOT/default.nix + sed -i "s|$key ? \".*\"|$key ? \"$value\"|" $ROOT/package.nix } update_nix_value version "$cef_version" @@ -39,5 +39,5 @@ for platform in "${platforms[@]}"; do read -r system arch <<< "$platform" url="https://cef-builds.spotifycdn.com/cef_binary_${cef_version}+g${git_revision}+chromium-${chromium_version}_linux${arch}_minimal.tar.bz2" hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")") - update-source-version libcef "$cef_version" "$hash" --system="$system" --ignore-same-version + update-source-version cef-binary "$cef_version" "$hash" --system="$system" --ignore-same-version done diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 7c4c2e924119..f68566c65e9a 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -38,19 +38,16 @@ }: let - cef = cef-binary.overrideAttrs (oldAttrs: { + cef = cef-binary.override { version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47 - __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD gitRevision = "cbc1c5b"; chromiumVersion = "135.0.7049.52"; - srcHash = - { - aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs="; - x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY="; - } - .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }); + srcHashes = { + aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs="; + x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY="; + }; + }; in stdenv.mkDerivation (finalAttrs: { pname = "linux-wallpaperengine"; @@ -102,7 +99,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${cef.buildType}" "-DCEF_ROOT=${cef}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/linux-wallpaperengine" ]; diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 516dd447affc..e0154b3bcae9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, fetchurl, - fetchzip, stdenv, cmake, python3, @@ -16,66 +15,16 @@ debugBuild ? false, - glib, nss, nspr, - atk, - at-spi2-atk, - libdrm, - libGL, - expat, - libxcb, - libxkbcommon, libX11, - libXcomposite, libXdamage, - libXext, - libXfixes, - libXrandr, - libgbm, - gtk3, - pango, - cairo, - alsa-lib, - dbus, - at-spi2-core, - cups, - libxshmfence, - udev, boost, thrift, + cef-binary, }: let - rpath = lib.makeLibraryPath [ - glib - nss - nspr - atk - at-spi2-atk - libdrm - libGL - expat - libxcb - libxkbcommon - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libgbm - gtk3 - pango - cairo - alsa-lib - dbus - at-spi2-core - cups - libxshmfence - udev - ]; - buildType = if debugBuild then "Debug" else "Release"; platform = { @@ -99,6 +48,19 @@ let .${platform}; inherit (arches) depsArch projectArch targetArch; + # `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt + cef-name = "cef_binary_137.0.17+gf354b0e+chromium-137.0.7151.104_${platform}_minimal"; + + cef-bin = cef-binary.override { + version = "137.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47 + gitRevision = "f354b0e"; + chromiumVersion = "137.0.7151.104"; + srcHashes = { + aarch64-linux = "sha256-C9P4+TpzjyMD5z2qLbzubbrIr66usFjRx7QqiAxI2D8="; + x86_64-linux = "sha256-iDC3a/YN0NqjX/b2waKvUAZCaR0lkLmUPqBJphE037Q="; + }; + }; + thrift20 = thrift.overrideAttrs (old: { version = "0.20.0"; @@ -149,22 +111,7 @@ stdenv.mkDerivation rec { inherit rev; hash = "sha256-BHmGEhfkrUWDfrUFR8d5AgIq8qkAr+blX9n7ZVg8mtc="; }; - cef-bin = - let - # `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt - name = "cef_binary_137.0.17+gf354b0e+chromium-137.0.7151.104_${platform}_minimal"; - hash = - { - "linuxarm64" = "sha256-QKkJwLtYS3o7lf4T31jIww2LGuAJT3sNTeI3Jq0VEYQ="; - "linux64" = "sha256-qE5SOi0/6dPsewyemarTbWG9MbWCQUlng8TgqU+4Tak="; - } - .${platform}; - urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name; - in - fetchzip { - url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; - inherit name hash; - }; + # Find the hash in tools/buildtools/linux64/clang-format.sha1 clang-fmt = fetchurl { url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; @@ -176,12 +123,8 @@ stdenv.mkDerivation rec { patchShebangs . - cp -r ${cef-bin} third_party/cef/${cef-bin.name} - chmod +w -R third_party/cef/${cef-bin.name} - patchelf third_party/cef/${cef-bin.name}/${buildType}/libcef.so --set-rpath "${rpath}" --add-needed libudev.so - patchelf third_party/cef/${cef-bin.name}/${buildType}/libGLESv2.so --set-rpath "${rpath}" --add-needed libGL.so.1 - patchelf third_party/cef/${cef-bin.name}/${buildType}/chrome-sandbox --set-interpreter $(cat $NIX_BINTOOLS/nix-support/dynamic-linker) - sed 's/-O0/-O2/' -i third_party/cef/${cef-bin.name}/cmake/cef_variables.cmake + cp -r ${cef-bin} third_party/cef/${cef-name} + chmod +w -R third_party/cef/${cef-name} sed \ -e 's|os.path.isdir(os.path.join(path, \x27.git\x27))|True|' \ diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix deleted file mode 100644 index 51033edff513..000000000000 --- a/pkgs/development/libraries/libcef/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - glib, - nss, - nspr, - atk, - at-spi2-atk, - libdrm, - expat, - libxcb, - libxkbcommon, - libX11, - libXcomposite, - libXdamage, - libXext, - libXfixes, - libXrandr, - libgbm, - gtk3, - pango, - cairo, - alsa-lib, - dbus, - at-spi2-core, - cups, - libxshmfence, - libGL, - udev, - systemd, - obs-studio, - xorg, -}: - -let - gl_rpath = lib.makeLibraryPath [ stdenv.cc.cc ]; - - rpath = lib.makeLibraryPath [ - glib - nss - nspr - atk - at-spi2-atk - libdrm - expat - libxcb - libxkbcommon - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libgbm - gtk3 - pango - cairo - alsa-lib - dbus - at-spi2-core - cups - libxshmfence - libGL - udev - systemd - xorg.libxcb - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - ]; - - selectSystem = - attrs: - attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); - - platformInfo = selectSystem { - aarch64-linux = { - platformStr = "linuxarm64"; - projectArch = "arm64"; - }; - x86_64-linux = { - platformStr = "linux64"; - projectArch = "x86_64"; - }; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "libcef"; - version = "141.0.7"; - gitRevision = "a5714cc"; - chromiumVersion = "141.0.7390.108"; - buildType = "Release"; - - srcHash = selectSystem { - aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE="; - x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk="; - }; - - src = fetchurl { - url = "https://cef-builds.spotifycdn.com/cef_binary_${finalAttrs.version}+g${finalAttrs.gitRevision}+chromium-${finalAttrs.chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; - hash = finalAttrs.srcHash; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ]; - - makeFlags = [ "libcef_dll_wrapper" ]; - - dontStrip = true; - - dontPatchELF = true; - - preInstall = '' - patchelf --set-rpath "${rpath}" --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ../${finalAttrs.buildType}/chrome-sandbox - patchelf --add-needed libudev.so --set-rpath "${rpath}" ../${finalAttrs.buildType}/libcef.so - patchelf --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libEGL.so - patchelf --add-needed libGL.so.1 --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libGLESv2.so - patchelf --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libvk_swiftshader.so - patchelf --set-rpath "${gl_rpath}" ../${finalAttrs.buildType}/libvulkan.so.1 - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/ $out/share/cef/ $out/libexec/cef/ - cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ - cp ../${finalAttrs.buildType}/libcef.so $out/lib/ - cp ../${finalAttrs.buildType}/libEGL.so $out/lib/ - cp ../${finalAttrs.buildType}/libGLESv2.so $out/lib/ - cp ../${finalAttrs.buildType}/libvk_swiftshader.so $out/lib/ - cp ../${finalAttrs.buildType}/libvulkan.so.1 $out/lib/ - cp ../${finalAttrs.buildType}/chrome-sandbox $out/libexec/cef/ - cp ../${finalAttrs.buildType}/*.bin ../${finalAttrs.buildType}/*.json $out/share/cef/ - cp -r ../Resources/* $out/share/cef/ - cp -r ../include $out/ - - runHook postInstall - ''; - - passthru = { - updateScript = ./update.sh; - tests = { - inherit obs-studio; # frequently breaks on CEF updates - }; - }; - - meta = { - description = "Simple framework for embedding Chromium-based browsers in other applications"; - homepage = "https://cef-builds.spotifycdn.com/index.html"; - maintainers = with lib.maintainers; [ puffnfresh ]; - sourceProvenance = with lib.sourceTypes; [ - fromSource - binaryNativeCode - ]; - license = lib.licenses.bsd3; - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b4bfc2093dee..790834411528 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -782,6 +782,7 @@ mapAliases { libbencodetools = throw "'libbencodetools' has been renamed to/replaced by 'bencodetools'"; # Converted to throw 2025-10-27 libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27 libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27 + libcef = throw "'libcef' has been removed, as no packages depend on it"; # Added 2025-11-06 libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbf01694873f..60f9b3ce6973 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7694,8 +7694,6 @@ with pkgs; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; - libcef = callPackage ../development/libraries/libcef { }; - libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; From dc89f760bbc7d2269796aef303a2ec8882a19a15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 04:15:50 +0000 Subject: [PATCH 1156/2279] kibi: 0.3.0 -> 0.3.1 --- pkgs/by-name/ki/kibi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix index 268ba30f54a7..8daf15c17682 100644 --- a/pkgs/by-name/ki/kibi/package.nix +++ b/pkgs/by-name/ki/kibi/package.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kibi"; - version = "0.3.0"; + version = "0.3.1"; - cargoHash = "sha256-gXkwqmmFGNEJY7an3KWlRuLL5WuCH4P0n7BrLNsZ9/A="; + cargoHash = "sha256-IF7pcatGJDcwTmBziB8hVWJkleoV+pXXRQnbYfQtBJE="; src = fetchFromGitHub { owner = "ilai-deutel"; repo = "kibi"; tag = "v${finalAttrs.version}"; - hash = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc="; + hash = "sha256-EXobpuVob4RD37LK0RlpCGXACfemm+e+JczYYPNDhrc="; }; nativeBuildInputs = [ makeWrapper ]; From 19be0948e1c0c1c1202d29a58c229f8e50f05aed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 04:17:57 +0000 Subject: [PATCH 1157/2279] xdg-ninja: 0.2.0.2-unstable-2025-08-07 -> 0.2.0.2-unstable-2025-11-01 --- pkgs/by-name/xd/xdg-ninja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix index e1efbdea7299..6b7c410ce889 100644 --- a/pkgs/by-name/xd/xdg-ninja/package.nix +++ b/pkgs/by-name/xd/xdg-ninja/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation { pname = "xdg-ninja"; - version = "0.2.0.2-unstable-2025-08-07"; + version = "0.2.0.2-unstable-2025-11-01"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "xdg-ninja"; - rev = "854929e5413e8d2cf84e90c5cc3ccb0188ab5d22"; - hash = "sha256-Kgu+LEU1SeB3ODyLihYG+IaQ2TMEFf3gxtjNM1FZz98="; + rev = "cb09ebd6479e276070a55fcffae9a5320bc52ed5"; + hash = "sha256-VpMSMWwYD0GIPtAuSkdG417RxSx6XCRh09IMrLDOi6A="; }; nativeBuildInputs = [ makeWrapper ]; From 639af2499d349abb2edca6dc96470a9e0bf29620 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 04:44:47 +0000 Subject: [PATCH 1158/2279] python3Packages.scikit-misc: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/scikit-misc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index bb834dac7c77..fc400697a2d0 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "scikit-misc"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "scikit-misc"; tag = "v${version}"; - hash = "sha256-w6RHmVxJjLx9ov2LxXvicxmY8jixfkIRfbfVnV2yhOU="; + hash = "sha256-G0zK13upo0tPd8x87X8cTBKWK63E5JPmAr1IVEijtaw="; }; postPatch = '' From 1aec18ceab2910e66331ccdc6cbf61780a89d46c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 05:02:19 +0000 Subject: [PATCH 1159/2279] python3Packages.great-tables: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/great-tables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix index 73aae4900de8..224559694d4f 100644 --- a/pkgs/development/python-modules/great-tables/default.nix +++ b/pkgs/development/python-modules/great-tables/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "great-tables"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "great-tables"; tag = "v${version}"; - hash = "sha256-bxeVVBGLS1yUaEnySCu1Ty1+bmoygMwQzBHMmtzm/+U="; + hash = "sha256-3SyY3mI5fd0S5pi1vG+BQaWHv/qB2L6vlIXxjO4UO1E="; }; build-system = [ From b23cbb148ada6b4ada16622e5be8e95ee5244db9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 05:03:47 +0000 Subject: [PATCH 1160/2279] python3Packages.legacy-api-wrap: 1.4.1 -> 1.5 --- pkgs/development/python-modules/legacy-api-wrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/legacy-api-wrap/default.nix b/pkgs/development/python-modules/legacy-api-wrap/default.nix index ce286a520803..b373984b6683 100644 --- a/pkgs/development/python-modules/legacy-api-wrap/default.nix +++ b/pkgs/development/python-modules/legacy-api-wrap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "legacy-api-wrap"; - version = "1.4.1"; + version = "1.5"; pyproject = true; src = fetchFromGitHub { owner = "flying-sheep"; repo = "legacy-api-wrap"; tag = "v${version}"; - hash = "sha256-ySkhfUyRBd4QS3f46KlaA5NrHxHr+dlkgmD4fGk2KsA="; + hash = "sha256-UvOkVNtH3MbD+ExF0dQ+XAfDx9v7YD3GCNUsEaH7zzM="; }; build-system = [ From 0fe76d21bdc7c8fa992c359d2bec3b65b1f4661c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 05:19:10 +0000 Subject: [PATCH 1161/2279] typescript-language-server: 5.1.0 -> 5.1.1 --- pkgs/by-name/ty/typescript-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix index 04a997db0805..018988573a3e 100644 --- a/pkgs/by-name/ty/typescript-language-server/package.nix +++ b/pkgs/by-name/ty/typescript-language-server/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "typescript-language-server"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "typescript-language-server"; repo = "typescript-language-server"; rev = "v${finalAttrs.version}"; - hash = "sha256-MpcTyjew/SgmWrpeqXLjQPPdwUuMTWQYyyM9TG5jNbQ="; + hash = "sha256-wYpW/HHuMetxnwEgGeQ8ptT6Kd5wp2kqUXnjWSkoDQY="; }; patches = [ From e8e59291230fccb1061ae32968ff2ab6889b7612 Mon Sep 17 00:00:00 2001 From: Quag Date: Wed, 5 Nov 2025 21:25:45 -0800 Subject: [PATCH 1162/2279] python3Packages.segments: fix build (remove clldutils) segments 2.3.0 removed dependency on clldutils (broken). https://github.com/cldf/segments/commit/82bc9bde99fd9f5be468b9aaa4d46995cef9050b --- pkgs/development/python-modules/segments/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 94063cfdcaf9..58c6d711cbba 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -6,7 +6,6 @@ setuptools, regex, csvw, - clldutils, pytestCheckHook, pytest-cov-stub, pytest-mock, @@ -30,7 +29,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ regex csvw - clldutils ]; nativeCheckInputs = [ From 61c9e6942f65c87623621c6a9511206209e50441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 05:46:58 +0000 Subject: [PATCH 1163/2279] all-the-package-names: 2.0.2250 -> 2.0.2257 --- pkgs/by-name/al/all-the-package-names/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index cd619c8ef3a4..e698cc15e9e6 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2250"; + version = "2.0.2257"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-Txh+ijQwl2x2FBQp5oWtmGdDRvDnmQoQYc1QShsFEo8="; + hash = "sha256-CtNbv7PAUAdUuUQsEzOlg/oykGgWe+NPUWWeucTVajw="; }; - npmDepsHash = "sha256-V3Zm1vy333WfarVVUbnpeEKkXW3HBwVDO3JltRLVNSk="; + npmDepsHash = "sha256-9rGaeLl4Mq5oo+XKBU54wNtK6F+2Bndr2EORITo1moo="; passthru.updateScript = nix-update-script { }; From 9f2260a0c2f53ba5b3bbd343071d2bbcd9e1e9f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 06:12:06 +0000 Subject: [PATCH 1164/2279] python3Packages.libtmux: 0.46.2 -> 0.47.0 --- pkgs/development/python-modules/libtmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 588e6af5127d..836447ae1b4c 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.46.2"; + version = "0.47.0"; pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = "libtmux"; tag = "v${version}"; - hash = "sha256-M3su+bDFuvmNEDVK+poWfxwbpsw/0L1/R6Z4CL0mvZ4="; + hash = "sha256-yrz9fMr33yj/u0uGUNHYv0zOTvtfJ2u0TKToBO8ha6U="; }; postPatch = '' From 909ea46d37a483c80632a955abc20075dc500918 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 06:13:46 +0000 Subject: [PATCH 1165/2279] python3Packages.pycrdt: 0.12.42 -> 0.12.43 --- pkgs/development/python-modules/pycrdt/Cargo.lock | 6 +++--- pkgs/development/python-modules/pycrdt/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 481c87c59d33..50cef0f46620 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -241,7 +241,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.42" +version = "0.12.43" dependencies = [ "pyo3", "serde_json", @@ -405,9 +405,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "syn" -version = "2.0.108" +version = "2.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 1a4c9dce6af4..dc805a7304f8 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.12.42"; + version = "0.12.43"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; tag = version; - hash = "sha256-TEuP6mkd4phic2vJv0BYD50GvlrNj4Z4/jMknLfnYI8="; + hash = "sha256-yMl+bLnREvuyVhMvR0TM+IKTPpJlgBCgE4M4NJp9k/M="; }; postPatch = '' From 1548b7527ada1376f6bf400e0b644a2af7636c1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 06:31:19 +0000 Subject: [PATCH 1166/2279] libsidplayfp: 2.15.1 -> 2.15.2 --- pkgs/by-name/li/libsidplayfp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index 233d65da68de..e4d6d581d0b6 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-wnbQy0PHHpkgNm3SC7GZyxSAUYd5eexVY9Dg1oiCjRo="; + hash = "sha256-/GXRqLt2wPCUiOKlaEq52APOOYWgbaejzJcppZgMgfA="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; From f9f9399c63ec810a7527aed020a8f061a858375c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 06:48:37 +0000 Subject: [PATCH 1167/2279] tektoncd-cli-pac: 0.38.0 -> 0.39.0 --- pkgs/by-name/te/tektoncd-cli-pac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tektoncd-cli-pac/package.nix b/pkgs/by-name/te/tektoncd-cli-pac/package.nix index 718643366ae2..22ace41e9b2f 100644 --- a/pkgs/by-name/te/tektoncd-cli-pac/package.nix +++ b/pkgs/by-name/te/tektoncd-cli-pac/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "tektoncd-cli-pac"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "openshift-pipelines"; repo = "pipelines-as-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-ti2IVI6ECXOhSxeeW7ufD1XjsOtr1R2J5Beq/ADRHaA="; + hash = "sha256-39jVFnLEUQHakVcSkrjrTRANp6D8FAoy+kIGi/QL5gk="; }; vendorHash = null; From e5cd81a22edc0078a39d61d4f11d3bf1ad74c3da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 06:49:57 +0000 Subject: [PATCH 1168/2279] python3Packages.radish-bdd: 0.18.2 -> 0.18.3 --- pkgs/development/python-modules/radish-bdd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index 8abe78c1ac54..c2635f27e993 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "radish-bdd"; - version = "0.18.2"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = pname; repo = "radish"; tag = "v${version}"; - hash = "sha256-SSrEKGs4q4rcnQM03/gc0/vEb7gmTmpfgeNp3e+Hyvg="; + hash = "sha256-UjJz9ysejz5DBewMwoVof1+JU8tbGbBa3z1quuN1TWg="; }; propagatedBuildInputs = [ From 8f8fce52d44fa8298448c70f24bbd0565c6d6fa6 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 5 Nov 2025 20:02:13 +0100 Subject: [PATCH 1169/2279] python3Packages.pipenv-poetry-migrate: fix test Signed-off-by: Florian Brandes --- pkgs/by-name/pi/pipenv-poetry-migrate/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix index 05a05d9ab39a..18635abe379b 100644 --- a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix +++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix @@ -18,16 +18,16 @@ python3Packages.buildPythonApplication rec { build-system = [ python3Packages.poetry-core ]; - pythonRelaxDeps = [ - "typer" - ]; - dependencies = with python3Packages; [ setuptools # for pkg_resources tomlkit typer ]; + # typer for Click >= 8.2 removed "mix_stderr", upstream pins to 8.1.8 + # https://typer.tiangolo.com/release-notes/#0160 + disabledTestPaths = [ "tests/test_cli.py" ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = { From 68818b7dd30fd5d74bf50fb1298bf216a85a7544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 07:05:56 +0000 Subject: [PATCH 1170/2279] python3Packages.lsassy: 3.1.13 -> 3.1.15 --- pkgs/development/python-modules/lsassy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index 12e1e6f8352d..aca4663df5ee 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.13"; + version = "3.1.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = "lsassy"; tag = "v${version}"; - hash = "sha256-DdIEDseGLI+hUIaUNPBqpkGGe+F+Z+jZ0g/JzXB8pf8="; + hash = "sha256-cQfyRCZv0ZTaj7Ay7zTzFnU7PQluP3VweeFof8+W70M="; }; pythonRelaxDeps = [ From ca6bb4761f248949c9e9d1c7d5d53168fc90f508 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Thu, 6 Nov 2025 12:59:14 +0530 Subject: [PATCH 1171/2279] tidy-viewer: add phanirithvij as maintainer Signed-off-by: phanirithvij --- pkgs/by-name/ti/tidy-viewer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 44d7f7e4aba2..3175210a15f3 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/alexhallam/tv"; changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md"; license = lib.licenses.unlicense; - maintainers = [ ]; + maintainers = with lib.maintainers; [ phanirithvij ]; }; } From a9fe3a48ca6fade79c30970e77e2028b1765525a Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Thu, 6 Nov 2025 13:00:02 +0530 Subject: [PATCH 1172/2279] tidy-viewer: refactor to use finalAttrs Signed-off-by: phanirithvij --- pkgs/by-name/ti/tidy-viewer/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 3175210a15f3..653159bf8d12 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tidy-viewer"; version = "1.8.93"; src = fetchFromGitHub { owner = "alexhallam"; repo = "tv"; - rev = version; + tag = finalAttrs.version; sha256 = "sha256-wiVcdTnjEFh5kSyxmK+ab0LkEAbQaygmLdrFfM12DyM="; }; @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { ]; meta = { + changelog = "https://github.com/alexhallam/tv/blob/${finalAttrs.version}/CHANGELOG.md"; description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment"; - mainProgram = "tidy-viewer"; homepage = "https://github.com/alexhallam/tv"; - changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md"; license = lib.licenses.unlicense; + mainProgram = "tidy-viewer"; maintainers = with lib.maintainers; [ phanirithvij ]; }; -} +}) From 719cee4d9d1e7a2cb82dc996e1dc3b09b16580c5 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Thu, 6 Nov 2025 13:00:37 +0530 Subject: [PATCH 1173/2279] tidy-viewer: enable skipped test seems to work fine on x86_64-linux Signed-off-by: phanirithvij --- pkgs/by-name/ti/tidy-viewer/package.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 653159bf8d12..c6e26ee7606a 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -17,12 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-HF7M4s2OHCAyVkbCIBxGButAxbxrhjmY3YE/do8et1s="; - # this test parses command line arguments - # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context - checkFlags = [ - "--skip=build_reader_can_create_reader_without_file_specified" - ]; - meta = { changelog = "https://github.com/alexhallam/tv/blob/${finalAttrs.version}/CHANGELOG.md"; description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment"; From 7d368a954b07dbfd82db98a50d22c5ed1789699a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Nov 2025 08:49:10 +0100 Subject: [PATCH 1174/2279] python313Packages.lsassy: modernize --- pkgs/development/python-modules/lsassy/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index aca4663df5ee..00bdd5e17fdd 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -6,7 +6,6 @@ netaddr, poetry-core, pypykatz, - pythonOlder, rich, }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "3.1.15"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Hackndo"; repo = "lsassy"; @@ -47,8 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; homepage = "https://github.com/Hackndo/lsassy"; - changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/Hackndo/lsassy/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "lsassy"; }; From 43d582016a763837e0bd101f7b85093e554d0e05 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 5 Nov 2025 09:49:39 +0800 Subject: [PATCH 1175/2279] taplo: fix completion generation on darwin --- pkgs/by-name/ta/taplo/package.nix | 41 +- pkgs/by-name/ta/taplo/update-reqwest.patch | 1291 ++++++++++++++++++++ 2 files changed, 1312 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/ta/taplo/update-reqwest.patch diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 9bd4a899fb35..aafc29f7a8a1 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -2,7 +2,7 @@ stdenv, lib, rustPlatform, - fetchCrate, + fetchFromGitHub, pkg-config, openssl, withLsp ? true, @@ -15,13 +15,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "taplo"; version = "0.10.0"; - src = fetchCrate { - inherit (finalAttrs) version; - pname = "taplo-cli"; - hash = "sha256-iKc4Nu7AZE1LSuqXffi3XERbOqZMOkI3PV+6HaJzh4c="; + src = fetchFromGitHub { + owner = "tamasfe"; + repo = "taplo"; + tag = "release-taplo-cli-${finalAttrs.version}"; + hash = "sha256-FW8OQ5TRUuQK8M2NDmp4c6p22jsHodxKqzOMrcdiqXU="; }; - cargoHash = "sha256-tvijtB5fwOzQnnK/ClIvTbjCcMeqZpXcRdWWKZPIulM="; + cargoPatches = [ + # Update reqwest to fix darwin sandboxing issues + # See also: https://github.com/tamasfe/taplo/pull/669 + ./update-reqwest.patch + ]; + + cargoHash = "sha256-FMpGo+kRcNgDj4qwYvdQKGwGazUKKMIVq0HCYMrTql0="; + + buildAndTestSubdir = "crates/taplo-cli"; nativeBuildInputs = [ installShellFiles @@ -32,20 +41,12 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = lib.optional withLsp "lsp"; - postInstall = - lib.optionalString - ( - stdenv.buildPlatform.canExecute stdenv.hostPlatform - && - # Creation of the completions fails on Darwin platforms. - !stdenv.hostPlatform.isDarwin - ) - '' - installShellCompletion --cmd taplo \ - --bash <($out/bin/taplo completions bash) \ - --fish <($out/bin/taplo completions fish) \ - --zsh <($out/bin/taplo completions zsh) - ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd taplo \ + --bash <($out/bin/taplo completions bash) \ + --fish <($out/bin/taplo completions fish) \ + --zsh <($out/bin/taplo completions zsh) + ''; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/ta/taplo/update-reqwest.patch b/pkgs/by-name/ta/taplo/update-reqwest.patch new file mode 100644 index 000000000000..078469baad12 --- /dev/null +++ b/pkgs/by-name/ta/taplo/update-reqwest.patch @@ -0,0 +1,1291 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ea88fad..01ecbb1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -24,11 +24,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" + dependencies = [ + "cfg-if", +- "getrandom", ++ "getrandom 0.2.12", + "once_cell", + "serde", + "version_check", +- "zerocopy", ++ "zerocopy 0.7.32", + ] + + [[package]] +@@ -168,7 +168,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -179,7 +179,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -218,6 +218,12 @@ version = "0.21.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + ++[[package]] ++name = "base64" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" ++ + [[package]] + name = "beef" + version = "0.5.2" +@@ -290,9 +296,9 @@ checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" + + [[package]] + name = "bytes" +-version = "1.5.0" ++version = "1.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" ++checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + + [[package]] + name = "cast" +@@ -315,6 +321,12 @@ version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + ++[[package]] ++name = "cfg_aliases" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" ++ + [[package]] + name = "ciborium" + version = "0.2.2" +@@ -382,7 +394,7 @@ dependencies = [ + "heck", + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -591,15 +603,6 @@ version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +-[[package]] +-name = "encoding_rs" +-version = "0.8.34" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +-dependencies = [ +- "cfg-if", +-] +- + [[package]] + name = "equator" + version = "0.2.2" +@@ -617,7 +620,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -773,7 +776,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -829,6 +832,20 @@ dependencies = [ + "wasm-bindgen", + ] + ++[[package]] ++name = "getrandom" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" ++dependencies = [ ++ "cfg-if", ++ "js-sys", ++ "libc", ++ "r-efi", ++ "wasip2", ++ "wasm-bindgen", ++] ++ + [[package]] + name = "gimli" + version = "0.28.1" +@@ -854,25 +871,6 @@ dependencies = [ + "regex-syntax 0.8.5", + ] + +-[[package]] +-name = "h2" +-version = "0.3.26" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +-dependencies = [ +- "bytes", +- "fnv", +- "futures-core", +- "futures-sink", +- "futures-util", +- "http", +- "indexmap", +- "slab", +- "tokio", +- "tokio-util", +- "tracing", +-] +- + [[package]] + name = "half" + version = "2.4.1" +@@ -913,9 +911,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + + [[package]] + name = "http" +-version = "0.2.12" ++version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" ++checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" + dependencies = [ + "bytes", + "fnv", +@@ -924,76 +922,107 @@ dependencies = [ + + [[package]] + name = "http-body" +-version = "0.4.6" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" ++checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" + dependencies = [ + "bytes", + "http", +- "pin-project-lite", + ] + + [[package]] +-name = "httparse" +-version = "1.8.0" ++name = "http-body-util" ++version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" ++checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" ++dependencies = [ ++ "bytes", ++ "futures-core", ++ "http", ++ "http-body", ++ "pin-project-lite", ++] + + [[package]] +-name = "httpdate" +-version = "1.0.3" ++name = "httparse" ++version = "1.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" ++checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + + [[package]] + name = "hyper" +-version = "0.14.30" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" ++checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" + dependencies = [ + "bytes", + "futures-channel", +- "futures-core", + "futures-util", +- "h2", + "http", + "http-body", + "httparse", +- "httpdate", + "itoa", + "pin-project-lite", +- "socket2", ++ "smallvec", + "tokio", +- "tower-service", +- "tracing", + "want", + ] + + [[package]] + name = "hyper-rustls" +-version = "0.24.2" ++version = "0.27.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" ++checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" + dependencies = [ +- "futures-util", + "http", + "hyper", ++ "hyper-util", + "rustls", ++ "rustls-pki-types", + "tokio", + "tokio-rustls", ++ "tower-service", ++ "webpki-roots", + ] + + [[package]] + name = "hyper-tls" +-version = "0.5.0" ++version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" ++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" + dependencies = [ + "bytes", ++ "http-body-util", + "hyper", ++ "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", ++ "tower-service", ++] ++ ++[[package]] ++name = "hyper-util" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" ++dependencies = [ ++ "base64 0.22.1", ++ "bytes", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "hyper", ++ "ipnet", ++ "libc", ++ "percent-encoding", ++ "pin-project-lite", ++ "socket2 0.6.1", ++ "tokio", ++ "tower-service", ++ "tracing", + ] + + [[package]] +@@ -1042,6 +1071,16 @@ version = "2.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + ++[[package]] ++name = "iri-string" ++version = "0.7.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" ++dependencies = [ ++ "memchr", ++ "serde", ++] ++ + [[package]] + name = "is-terminal" + version = "0.4.12" +@@ -1085,10 +1124,11 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + + [[package]] + name = "js-sys" +-version = "0.3.72" ++version = "0.3.82" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" ++checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" + dependencies = [ ++ "once_cell", + "wasm-bindgen", + ] + +@@ -1109,11 +1149,11 @@ checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978" + dependencies = [ + "ahash", + "anyhow", +- "base64", ++ "base64 0.21.7", + "bytecount", + "fancy-regex", + "fraction", +- "getrandom", ++ "getrandom 0.2.12", + "iso8601", + "itoa", + "memchr", +@@ -1137,9 +1177,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.161" ++version = "0.2.177" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" ++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" + + [[package]] + name = "linux-raw-sys" +@@ -1195,6 +1235,12 @@ dependencies = [ + "hashbrown", + ] + ++[[package]] ++name = "lru-slab" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" ++ + [[package]] + name = "lsp-async-stub" + version = "0.7.0" +@@ -1202,7 +1248,7 @@ dependencies = [ + "anyhow", + "async-trait", + "futures", +- "getrandom", ++ "getrandom 0.2.12", + "lsp-types", + "rowan", + "serde", +@@ -1257,12 +1303,6 @@ dependencies = [ + "autocfg", + ] + +-[[package]] +-name = "mime" +-version = "0.3.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +- + [[package]] + name = "minimal-lexical" + version = "0.2.1" +@@ -1498,7 +1538,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -1635,7 +1675,16 @@ dependencies = [ + "smallvec", + "symbolic-demangle", + "tempfile", +- "thiserror", ++ "thiserror 1.0.57", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" ++dependencies = [ ++ "zerocopy 0.8.27", + ] + + [[package]] +@@ -1650,9 +1699,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.78" ++version = "1.0.103" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" ++checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" + dependencies = [ + "unicode-ident", + ] +@@ -1666,6 +1715,61 @@ dependencies = [ + "memchr", + ] + ++[[package]] ++name = "quinn" ++version = "0.11.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" ++dependencies = [ ++ "bytes", ++ "cfg_aliases", ++ "pin-project-lite", ++ "quinn-proto", ++ "quinn-udp", ++ "rustc-hash 2.1.1", ++ "rustls", ++ "socket2 0.5.5", ++ "thiserror 2.0.17", ++ "tokio", ++ "tracing", ++ "web-time", ++] ++ ++[[package]] ++name = "quinn-proto" ++version = "0.11.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" ++dependencies = [ ++ "bytes", ++ "getrandom 0.3.4", ++ "lru-slab", ++ "rand", ++ "ring", ++ "rustc-hash 2.1.1", ++ "rustls", ++ "rustls-pki-types", ++ "slab", ++ "thiserror 2.0.17", ++ "tinyvec", ++ "tracing", ++ "web-time", ++] ++ ++[[package]] ++name = "quinn-udp" ++version = "0.5.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" ++dependencies = [ ++ "cfg_aliases", ++ "libc", ++ "once_cell", ++ "socket2 0.5.5", ++ "tracing", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "quote" + version = "1.0.35" +@@ -1675,6 +1779,41 @@ dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "r-efi" ++version = "5.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" ++ ++[[package]] ++name = "rand" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" ++dependencies = [ ++ "rand_chacha", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" ++dependencies = [ ++ "getrandom 0.3.4", ++] ++ + [[package]] + name = "rayon" + version = "1.8.1" +@@ -1750,46 +1889,43 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + + [[package]] + name = "reqwest" +-version = "0.11.27" ++version = "0.12.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" ++checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" + dependencies = [ +- "base64", ++ "base64 0.22.1", + "bytes", +- "encoding_rs", + "futures-core", +- "futures-util", +- "h2", + "http", + "http-body", ++ "http-body-util", + "hyper", + "hyper-rustls", + "hyper-tls", +- "ipnet", ++ "hyper-util", + "js-sys", + "log", +- "mime", + "native-tls", +- "once_cell", + "percent-encoding", + "pin-project-lite", ++ "quinn", + "rustls", +- "rustls-pemfile", ++ "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", +- "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", ++ "tower", ++ "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", +- "winreg", + ] + + [[package]] +@@ -1808,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" + dependencies = [ + "cc", +- "getrandom", ++ "getrandom 0.2.12", + "libc", + "spin", + "untrusted", +@@ -1824,7 +1960,7 @@ dependencies = [ + "countme", + "hashbrown", + "memoffset", +- "rustc-hash", ++ "rustc-hash 1.1.0", + "text-size", + ] + +@@ -1840,6 +1976,12 @@ version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + ++[[package]] ++name = "rustc-hash" ++version = "2.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" ++ + [[package]] + name = "rustix" + version = "0.38.31" +@@ -1855,32 +1997,36 @@ dependencies = [ + + [[package]] + name = "rustls" +-version = "0.21.12" ++version = "0.23.34" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" ++checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" + dependencies = [ +- "log", ++ "once_cell", + "ring", ++ "rustls-pki-types", + "rustls-webpki", +- "sct", ++ "subtle", ++ "zeroize", + ] + + [[package]] +-name = "rustls-pemfile" +-version = "1.0.4" ++name = "rustls-pki-types" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" ++checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" + dependencies = [ +- "base64", ++ "web-time", ++ "zeroize", + ] + + [[package]] + name = "rustls-webpki" +-version = "0.101.7" ++version = "0.103.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" ++checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" + dependencies = [ + "ring", ++ "rustls-pki-types", + "untrusted", + ] + +@@ -1945,16 +2091,6 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +-[[package]] +-name = "sct" +-version = "0.7.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +-dependencies = [ +- "ring", +- "untrusted", +-] +- + [[package]] + name = "security-framework" + version = "2.9.2" +@@ -2015,7 +2151,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -2049,7 +2185,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -2118,6 +2254,16 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "socket2" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" ++dependencies = [ ++ "libc", ++ "windows-sys 0.60.2", ++] ++ + [[package]] + name = "spin" + version = "0.9.8" +@@ -2142,6 +2288,12 @@ version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + ++[[package]] ++name = "subtle" ++version = "2.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" ++ + [[package]] + name = "symbolic-common" + version = "12.10.0" +@@ -2178,9 +2330,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.48" ++version = "2.0.108" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" ++checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" + dependencies = [ + "proc-macro2", + "quote", +@@ -2189,29 +2341,11 @@ dependencies = [ + + [[package]] + name = "sync_wrapper" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +- +-[[package]] +-name = "system-configuration" +-version = "0.5.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +-dependencies = [ +- "bitflags 1.3.2", +- "core-foundation", +- "system-configuration-sys", +-] +- +-[[package]] +-name = "system-configuration-sys" +-version = "0.5.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" ++checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" + dependencies = [ +- "core-foundation-sys", +- "libc", ++ "futures-core", + ] + + [[package]] +@@ -2239,7 +2373,7 @@ dependencies = [ + "schemars", + "serde", + "serde_json", +- "thiserror", ++ "thiserror 1.0.57", + "time", + "toml", + "tracing", +@@ -2307,7 +2441,7 @@ dependencies = [ + "sha1", + "tap", + "taplo", +- "thiserror", ++ "thiserror 1.0.57", + "time", + "tokio", + "tracing", +@@ -2352,7 +2486,7 @@ dependencies = [ + "clap", + "console_error_panic_hook", + "futures", +- "getrandom", ++ "getrandom 0.2.12", + "indexmap", + "js-sys", + "lsp-async-stub", +@@ -2404,7 +2538,16 @@ version = "1.0.57" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" + dependencies = [ +- "thiserror-impl", ++ "thiserror-impl 1.0.57", ++] ++ ++[[package]] ++name = "thiserror" ++version = "2.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" ++dependencies = [ ++ "thiserror-impl 2.0.17", + ] + + [[package]] +@@ -2415,7 +2558,18 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "2.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.108", + ] + + [[package]] +@@ -2497,7 +2651,7 @@ dependencies = [ + "num_cpus", + "parking_lot", + "pin-project-lite", +- "socket2", ++ "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", + ] +@@ -2510,7 +2664,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -2525,27 +2679,14 @@ dependencies = [ + + [[package]] + name = "tokio-rustls" +-version = "0.24.1" ++version = "0.26.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" ++checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" + dependencies = [ + "rustls", + "tokio", + ] + +-[[package]] +-name = "tokio-util" +-version = "0.7.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +-dependencies = [ +- "bytes", +- "futures-core", +- "futures-sink", +- "pin-project-lite", +- "tokio", +-] +- + [[package]] + name = "toml" + version = "0.7.8" +@@ -2580,11 +2721,50 @@ dependencies = [ + "winnow", + ] + ++[[package]] ++name = "tower" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" ++dependencies = [ ++ "futures-core", ++ "futures-util", ++ "pin-project-lite", ++ "sync_wrapper", ++ "tokio", ++ "tower-layer", ++ "tower-service", ++] ++ ++[[package]] ++name = "tower-http" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" ++dependencies = [ ++ "bitflags 2.4.2", ++ "bytes", ++ "futures-util", ++ "http", ++ "http-body", ++ "iri-string", ++ "pin-project-lite", ++ "tower", ++ "tower-layer", ++ "tower-service", ++] ++ ++[[package]] ++name = "tower-layer" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" ++ + [[package]] + name = "tower-service" +-version = "0.3.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" ++checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + + [[package]] + name = "tracing" +@@ -2605,7 +2785,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] + + [[package]] +@@ -2769,28 +2949,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] +-name = "wasm-bindgen" +-version = "0.2.100" ++name = "wasip2" ++version = "1.0.1+wasi-0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" ++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" + dependencies = [ +- "cfg-if", +- "once_cell", +- "rustversion", +- "wasm-bindgen-macro", ++ "wit-bindgen", + ] + + [[package]] +-name = "wasm-bindgen-backend" +-version = "0.2.100" ++name = "wasm-bindgen" ++version = "0.2.105" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" ++checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" + dependencies = [ +- "bumpalo", +- "log", +- "proc-macro2", +- "quote", +- "syn 2.0.48", ++ "cfg-if", ++ "once_cell", ++ "rustversion", ++ "wasm-bindgen-macro", + "wasm-bindgen-shared", + ] + +@@ -2808,9 +2984,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.100" ++version = "0.2.105" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" ++checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -2818,22 +2994,22 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.100" ++version = "0.2.105" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" ++checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" + dependencies = [ ++ "bumpalo", + "proc-macro2", + "quote", +- "syn 2.0.48", +- "wasm-bindgen-backend", ++ "syn 2.0.108", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.100" ++version = "0.2.105" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" ++checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" + dependencies = [ + "unicode-ident", + ] +@@ -2848,11 +3024,24 @@ dependencies = [ + "wasm-bindgen", + ] + ++[[package]] ++name = "web-time" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ + [[package]] + name = "webpki-roots" +-version = "0.25.4" ++version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" ++checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" ++dependencies = [ ++ "rustls-pki-types", ++] + + [[package]] + name = "winapi" +@@ -2885,6 +3074,12 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows-link" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" ++ + [[package]] + name = "windows-sys" + version = "0.48.0" +@@ -2903,6 +3098,15 @@ dependencies = [ + "windows-targets 0.52.0", + ] + ++[[package]] ++name = "windows-sys" ++version = "0.60.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" ++dependencies = [ ++ "windows-targets 0.53.5", ++] ++ + [[package]] + name = "windows-targets" + version = "0.48.5" +@@ -2933,6 +3137,23 @@ dependencies = [ + "windows_x86_64_msvc 0.52.0", + ] + ++[[package]] ++name = "windows-targets" ++version = "0.53.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" ++dependencies = [ ++ "windows-link", ++ "windows_aarch64_gnullvm 0.53.1", ++ "windows_aarch64_msvc 0.53.1", ++ "windows_i686_gnu 0.53.1", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.53.1", ++ "windows_x86_64_gnu 0.53.1", ++ "windows_x86_64_gnullvm 0.53.1", ++ "windows_x86_64_msvc 0.53.1", ++] ++ + [[package]] + name = "windows_aarch64_gnullvm" + version = "0.48.5" +@@ -2945,6 +3166,12 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.48.5" +@@ -2957,6 +3184,12 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.48.5" +@@ -2969,6 +3202,18 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.48.5" +@@ -2981,6 +3226,12 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.48.5" +@@ -2993,6 +3244,12 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.48.5" +@@ -3005,6 +3262,12 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.48.5" +@@ -3017,6 +3280,12 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.53.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" ++ + [[package]] + name = "winnow" + version = "0.5.40" +@@ -3027,14 +3296,10 @@ dependencies = [ + ] + + [[package]] +-name = "winreg" +-version = "0.50.0" ++name = "wit-bindgen" ++version = "0.46.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +-dependencies = [ +- "cfg-if", +- "windows-sys 0.48.0", +-] ++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + + [[package]] + name = "zerocopy" +@@ -3042,7 +3307,16 @@ version = "0.7.32" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" + dependencies = [ +- "zerocopy-derive", ++ "zerocopy-derive 0.7.32", ++] ++ ++[[package]] ++name = "zerocopy" ++version = "0.8.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" ++dependencies = [ ++ "zerocopy-derive 0.8.27", + ] + + [[package]] +@@ -3053,5 +3327,22 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.48", ++ "syn 2.0.108", + ] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.8.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.108", ++] ++ ++[[package]] ++name = "zeroize" ++version = "1.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +diff --git a/Cargo.toml b/Cargo.toml +index d98197c..e1100e2 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -30,7 +30,7 @@ lsp-types = { version = "0.93.0" } + once_cell = { version = "1.4" } + parking_lot = { version = "0.12.0" } + regex = { version = "1.5" } +-reqwest = { version = "0.11.9", default-features = false } ++reqwest = { version = "0.12.24", default-features = false } + rowan = { version = "0.15.3" } + schemars = { version = "0.8.3" } + serde = { version = "1" } From e110e409abbba6ff7dd76ed0115fb91fd42789a6 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Tue, 4 Nov 2025 21:43:24 +0800 Subject: [PATCH 1176/2279] toml-test: init at 1.6.0 --- pkgs/by-name/to/toml-test/package.nix | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/to/toml-test/package.nix diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix new file mode 100644 index 000000000000..14cbd6b129fe --- /dev/null +++ b/pkgs/by-name/to/toml-test/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "toml-test"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "toml-lang"; + repo = "toml-test"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jOFkSEDNvvx8svgyYYpAbveQsclMsQRKJ2ocA6ty1Kw="; + }; + + vendorHash = "sha256-yt5rwpYzO38wEUhcyG4G367Byek20Uz3u+buAazq/5A="; + + ldflags = [ + "-s" + "-w" + "-X zgo.at/zli.version=${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Language agnostic test suite for TOML parsers"; + homepage = "https://github.com/toml-lang/toml-test"; + changelog = "https://github.com/toml-lang/toml-test/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + yzx9 + defelo + ]; + mainProgram = "toml-test"; + }; +}) From 74cfe4614562bff690aaf4ac5516bd552a00ed70 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Wed, 5 Nov 2025 09:50:57 +0800 Subject: [PATCH 1177/2279] taplo: add toml-test --- pkgs/by-name/ta/taplo/package.nix | 41 +++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index aafc29f7a8a1..c866d85ee39f 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -5,10 +5,16 @@ fetchFromGitHub, pkg-config, openssl, - withLsp ? true, installShellFiles, versionCheckHook, + + # passthru dependencies nix-update-script, + runCommand, + toml-test, + + # Optional feature + withLsp ? true, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -52,7 +58,38 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + + tests = { + toml-test = + let + # Unfortunately, taplo does not yet pass all toml-test v1.6.0 tests. + # Some of the failures are reported issues, others may not be. + # https://github.com/tamasfe/taplo/issues/486 + skips = [ + "valid/comment/nonascii" + "valid/datetime/edge" + "valid/key/quoted-unicode" + "valid/string/quoted-unicode" + "invalid/control/multi-cr" + "invalid/control/rawmulti-cr" + "invalid/table/super-twice" + ]; + in + runCommand "taplo-toml-test" + { + nativeBuildInputs = [ + finalAttrs.finalPackage + toml-test + ]; + } + '' + toml-test taplo ${lib.concatMapStringsSep " " (a: "-skip ${a}") skips} -- toml-test + touch "$out" + ''; + }; + }; meta = { description = "TOML toolkit written in Rust"; From bfc2a521bb04b019f281e29ccd755ae843bdc239 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 08:23:37 +0000 Subject: [PATCH 1178/2279] supabase-cli: 2.55.4 -> 2.58.1 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index d2b09bc1f1d7..b8698cad5acc 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.55.4"; + version = "2.58.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-BJjNWZKqf59sl9+kVIRuBWF71X19wk8fbIJqlXDhM5Q="; + hash = "sha256-JvFfA8hgzVLs+DQqt5CWEdUkgQMrB3zaWaHZAx4d5rg="; }; - vendorHash = "sha256-ASNo3T0ziPcMm/xXBnokyVWVTTq2ZEn4qg9yHjxinEA="; + vendorHash = "sha256-oogYnjcoSS+9BX6ybISpzbKuV9AJjxJ8mvuNY66vsQ4="; ldflags = [ "-s" From e2541851dcb324b850ecce89fce324f7e17d57f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 08:23:37 +0000 Subject: [PATCH 1179/2279] sendme: 0.30.0 -> 0.31.0 --- pkgs/by-name/se/sendme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 1a44281ae6b8..1c4775c0363b 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "sendme"; rev = "v${version}"; - hash = "sha256-LcSQuvNXSHqaiBE6GR3rNALAYPc9Xezf5cV8Im9qYMo="; + hash = "sha256-zh0YYJoljcOQz0ltAk+UBScSGZhsoSqIa+F0Qm4/3iw="; }; - cargoHash = "sha256-/hgkMWEokcOh3ebZ2pIunktJmuq0YpI6IixO7XoNRCk="; + cargoHash = "sha256-G7b1BBlVMPtfEWfIXIMH4N+Avt9vtEcCG1ctrja5Ttc="; # The tests require contacting external servers. doCheck = false; From 5217998f70092021bf7c8db706a0d71be0f4818b Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Thu, 6 Nov 2025 09:31:54 +0100 Subject: [PATCH 1180/2279] pcloud: 1.14.17 -> 1.14.18 Changelog: https://www.pcloud.com/release-notes/linux.html - 1.14.18 (05/11/2025) - Performance improvements in synchronization. - Other bug fixes & stability improvements. --- pkgs/by-name/pc/pcloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 12dcb5eb4d2f..0026c25d77ce 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.17"; - code = "XZNtR95ZctUIq8zYVD7eSKotwGMx7kDWVtzV"; + version = "1.14.18"; + code = "XZ2gJM5Z8pdJVlCT0s5FI1aTKxxgt48aEr8k"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-Chh8obZHntkiG7IJAW96T9y3KcOwzI18/VALheLcxBA="; + hash = "sha256-YDXmna1SZaDLK1EEdHvWm9+PgYKjYUsa2lvdzFGmyIU="; }; appimageContents = appimageTools.extractType2 { From ccb79a925cceee939612830849ac0e7f70147ad2 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Thu, 6 Nov 2025 09:38:23 +0100 Subject: [PATCH 1181/2279] pcloud: add link to changelog --- pkgs/by-name/pc/pcloud/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 0026c25d77ce..69fb7076ceec 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -121,6 +121,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; + changelog = "https://www.pcloud.com/release-notes/linux.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ patryk27 ]; From 9b58e9be47051fc55b3888c102dc925cb573cab5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 11:54:31 +0300 Subject: [PATCH 1182/2279] python313Packages.hass-nabucasa: add missing dependency --- pkgs/development/python-modules/hass-nabucasa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 16b874cc9ce8..a5480e992abe 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -2,6 +2,7 @@ lib, acme, aiohttp, + async-timeout, atomicwrites-homeassistant, attrs, buildPythonPackage, @@ -57,6 +58,7 @@ buildPythonPackage rec { dependencies = [ acme aiohttp + async-timeout atomicwrites-homeassistant attrs ciso8601 From ae3159d475e2b2eb3a3f9d908a69a4fc145c5265 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Nov 2025 20:56:45 +0100 Subject: [PATCH 1183/2279] python313Packages.beautysh: 6.2.1 -> 6.4.1 Changelog: https://github.com/lovesegfault/beautysh/releases/tag/v6.4.1 --- .../python-modules/beautysh/default.nix | 48 ++++++++----------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix index 245615bd7ccd..199e6bab6ed5 100644 --- a/pkgs/development/python-modules/beautysh/default.nix +++ b/pkgs/development/python-modules/beautysh/default.nix @@ -2,58 +2,48 @@ lib, buildPythonPackage, colorama, + editorconfig, fetchFromGitHub, - fetchpatch, - poetry-core, - pytest7CheckHook, - setuptools, + hatchling, + hypothesis, + pytestCheckHook, + pyyaml, types-colorama, - types-setuptools, }: buildPythonPackage rec { pname = "beautysh"; - version = "6.2.1"; - format = "pyproject"; + version = "6.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "lovesegfault"; repo = "beautysh"; - rev = "v${version}"; - hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o="; + tag = "v${version}"; + hash = "sha256-B+1qwivb9MZ+W0u7hccDt3aTjDOcbEQ89Alc8mWd2Sg="; }; - patches = [ - # https://github.com/lovesegfault/beautysh/pull/247 - (fetchpatch { - name = "poetry-to-poetry-core.patch"; - url = "https://github.com/lovesegfault/beautysh/commit/5f4fcac083fa68568a50f3c2bcee3ead0f3ca7c5.patch"; - hash = "sha256-H/kIJKww5ouWu8rmRkaMOXcsq2daZWDdwxBqbc99x0s="; - }) - ]; + build-system = [ hatchling ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"' - ''; - - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ colorama - setuptools + editorconfig types-colorama - types-setuptools ]; - nativeCheckInputs = [ pytest7CheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + pyyaml + ]; pythonImportsCheck = [ "beautysh" ]; meta = with lib; { description = "Tool for beautifying Bash scripts"; homepage = "https://github.com/lovesegfault/beautysh"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/lovesegfault/beautysh/releases/tag/${src.tag}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "beautysh"; }; From 159a5ae316da139ba84e0d2e39623d1ba9e5f015 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 6 Nov 2025 09:58:38 +0100 Subject: [PATCH 1184/2279] nixos/qtile: enable gnome keyring by default --- nixos/modules/services/x11/window-managers/qtile.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index f1a633c26b24..9af62649c542 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -68,7 +68,11 @@ in xserver.windowManager.qtile.finalPackage = cfg.package.override { extraPackages = cfg.extraPackages cfg.package.pythonModule.pkgs; }; + displayManager.sessionPackages = [ cfg.finalPackage ]; + + # Recommended by upstream for libqtile/widget/imapwidget.py + gnome.gnome-keyring.enable = lib.mkDefault true; }; environment = { From 8e88d6a868aeb591bae3575aeeb0b7240e687e0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Nov 2025 09:59:56 +0100 Subject: [PATCH 1185/2279] python313Packages.mdformat-beautysh: 0.1.1 -> 1.0.0 Diff: https://github.com/hukkin/mdformat-beautysh/compare/0.1.1...1.0.0 Changelog: https://github.com/hukkin/mdformat-beautysh/releases/tag/1.0.0 --- .../python-modules/mdformat-beautysh/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-beautysh/default.nix b/pkgs/development/python-modules/mdformat-beautysh/default.nix index 2b5d8fd23fab..015b26f27b87 100644 --- a/pkgs/development/python-modules/mdformat-beautysh/default.nix +++ b/pkgs/development/python-modules/mdformat-beautysh/default.nix @@ -8,26 +8,23 @@ mdit-py-plugins, poetry-core, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "mdformat-beautysh"; - version = "0.1.1"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "hukkin"; repo = "mdformat-beautysh"; tag = version; - hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw="; + hash = "sha256-Wzwy2FSknohmgrZ/ACliBDD2lOaQKKHyacAL57Ci3SU="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ beautysh mdformat mdformat-gfm @@ -41,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mdformat plugin to beautify Bash scripts"; homepage = "https://github.com/hukkin/mdformat-beautysh"; + changelog = "https://github.com/hukkin/mdformat-beautysh/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; }; From 82051edbc075767f2a751ec7bce824a72369c5a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 09:04:54 +0000 Subject: [PATCH 1186/2279] cdncheck: 1.2.7 -> 1.2.8 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 3adab037a612..902019cf6073 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-Tit9AJ6V20vutd4veymlyi9thstcf6+sefHfhGeRQ68="; + hash = "sha256-nMKIvRV6lfJgpzPGQVOeFBjkjt3RcFHw8sXiFRP+Vok="; }; vendorHash = "sha256-n0/9VLnB4y0YSbc6fu9SP0sWfGFSh7QgZfJkHMJB80U="; From b4b61822fa6a5b72d4a657e57e0d189581d0a3f4 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Thu, 6 Nov 2025 17:10:30 +0800 Subject: [PATCH 1187/2279] capypdf: fix build on darwin --- pkgs/by-name/ca/capypdf/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix index 51f3a492ae3a..3ddff2102dc8 100644 --- a/pkgs/by-name/ca/capypdf/package.nix +++ b/pkgs/by-name/ca/capypdf/package.nix @@ -11,6 +11,7 @@ libpng, libtiff, zlib, + darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -42,7 +43,9 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libtiff zlib - ]; + ] + # error: 'to_chars' is unavailable: introduced in macOS 13.3 + ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3"); meta = { description = "Fully color managed PDF generation library"; From d0beb16463f732236e1ba31e134e8c20e7aac25c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 6 Nov 2025 18:22:22 +0900 Subject: [PATCH 1188/2279] lima: 1.2.1 -> 1.2.2 Diff: https://github.com/lima-vm/lima/compare/v1.2.1...v1.2.2 --- pkgs/by-name/li/lima/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index aa1134c22f91..133ad36dd22d 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -3,7 +3,7 @@ }: let - version = "1.2.1"; + version = "1.2.2"; in { inherit version; @@ -12,7 +12,7 @@ in owner = "lima-vm"; repo = "lima"; tag = "v${version}"; - hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k="; + hash = "sha256-bIYF/bsOMuWTkjD6fe6by220/WQGL+VWEBXmUzyXU98="; }; vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os="; From b053a6c260f9119e2f66ca03c37a6dad668a8348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 09:32:25 +0000 Subject: [PATCH 1189/2279] riffdiff: 3.5.1 -> 3.6.0 --- pkgs/by-name/ri/riffdiff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 77763b38dc6e..c068a6b32b34 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; tag = version; - hash = "sha256-SRr4yFv6fulBN/HNM3uCVLXS6pcspi5X5hXvQJg1sDI="; + hash = "sha256-WpVj/sgvvdNweZ+exxoSc4rtDmuRvaIdkwKk+eu46Ok="; }; - cargoHash = "sha256-86nBxitdA8deJHRQqLM/JWcpSX/u6C4cofJAbYj5Ijs="; + cargoHash = "sha256-YJnqeuj4XvOnGJ9RcNBtfy1duYUu/u6ed47bAndLm30="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; From 09f5e265f11876881d2f69ed0bcf08a6480d1daf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 09:48:06 +0000 Subject: [PATCH 1190/2279] waytrogen: 0.7.4 -> 0.8.0 --- pkgs/by-name/wa/waytrogen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 83d784d51d2e..93ea549ba19f 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "waytrogen"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = finalAttrs.version; - hash = "sha256-I7juUTIN+ZhD9w2WXSU5YMBulxcGUYDdv6eiLZ1Byyw="; + hash = "sha256-zFRSWAVyTWvH6nxiacQbrrLRlu0Xac53XFaA6FcSf6M="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU="; + hash = "sha256-/QCDxno0xZ9hLq0U6FNAZX7x+Kx5xaMtT/mR/GrNavs="; }; nativeBuildInputs = [ From 63691fc94d5bd8e1070f10793b781292e01800a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 09:54:54 +0000 Subject: [PATCH 1191/2279] sozu: 1.1.0 -> 1.1.1 --- pkgs/by-name/so/sozu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index 2dc4b0b972da..5de6064251c7 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = "sozu"; rev = version; - hash = "sha256-yODApjpcHl9wmf+6TEVzXTme8e68b3Ee1y64D/u7NW8="; + hash = "sha256-a/Pna2l1gRv4kxIyGUuUHlN+lIQemGjZXwM65Ccc24Y="; }; - cargoHash = "sha256-HADNumewYIejVPHXknGayrK4hZ5hBCk0rTFQ/xeG3Mo="; + cargoHash = "sha256-9ZmlUUdtVAvri9v+EJb6vRQ7Yc3FjRwU5I5Xe8je9/c="; nativeBuildInputs = [ protobuf ]; From a58b5ed89d26970cddac5a83dcbfb43d01cb6ed6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 10:01:24 +0000 Subject: [PATCH 1192/2279] reindeer: 2025.10.27.00 -> 2025.11.03.00 --- pkgs/by-name/re/reindeer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 6908f925be6b..54b73c67821e 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.10.27.00"; + version = "2025.11.03.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-ykey6fdL9bjf+IfIAKzlIs5Pw/r2rAe6VB8BR1fUtz4="; + hash = "sha256-Kzxw0v/COISCoaZXu1Pi8/IB51YpZ5m3dZ/XTDfRQhg="; }; - cargoHash = "sha256-aFDMVxWLeE8TtQCW5U2ULh9yJBc67vkXkPjgo+QPxYM="; + cargoHash = "sha256-KO8iAdE+9k5ka4Qcih6imxX/qSaY6giaF9BXtXumzV0="; nativeBuildInputs = [ pkg-config ]; From 9a6df97e61facce429d0324f96b4694ec817fa34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 10:10:10 +0000 Subject: [PATCH 1193/2279] python3Packages.pymiele: 0.5.6 -> 0.6.0 --- pkgs/development/python-modules/pymiele/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix index 1712b7cb8025..03144e04bb96 100644 --- a/pkgs/development/python-modules/pymiele/default.nix +++ b/pkgs/development/python-modules/pymiele/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymiele"; - version = "0.5.6"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.13"; src = fetchPypi { inherit pname version; - hash = "sha256-JRP7k5XbNBYCx9pdulL6UIv/E/OdbzxnEYsLXoI41sI="; + hash = "sha256-X2nATBOOq+N4ptF2NCNbZLi2KweoMzw0ixwP5mXm9SI="; }; build-system = [ setuptools ]; From be3fdd6f3c3e82a1c819c1fd1009af6f41bb3bc3 Mon Sep 17 00:00:00 2001 From: Nina Fromm Date: Thu, 6 Nov 2025 11:26:57 +0100 Subject: [PATCH 1194/2279] docuseal: 2.1.7 -> 2.2.0 - 2.1.8: Translation fixes - https://github.com/docusealco/docuseal/releases/tag/2.1.8 - 2.2.0: Auto-Detect form fields - https://github.com/docusealco/docuseal/releases/tag/2.2.0 --- pkgs/by-name/do/docuseal/Gemfile | 2 + pkgs/by-name/do/docuseal/Gemfile.lock | 45 ++++++++---- pkgs/by-name/do/docuseal/gemset.nix | 99 ++++++++++++++++++++------- pkgs/by-name/do/docuseal/package.nix | 4 +- pkgs/by-name/do/docuseal/update.sh | 1 + 5 files changed, 111 insertions(+), 40 deletions(-) diff --git a/pkgs/by-name/do/docuseal/Gemfile b/pkgs/by-name/do/docuseal/Gemfile index 1cf7ca39e261..4ef1e77522b4 100644 --- a/pkgs/by-name/do/docuseal/Gemfile +++ b/pkgs/by-name/do/docuseal/Gemfile @@ -23,7 +23,9 @@ gem 'image_processing' gem 'jwt' gem 'lograge' gem 'mysql2', require: false +gem 'numo-narray' gem 'oj' +gem 'onnxruntime' gem 'pagy' gem 'pg', require: false gem 'premailer-rails' diff --git a/pkgs/by-name/do/docuseal/Gemfile.lock b/pkgs/by-name/do/docuseal/Gemfile.lock index d62126380cc8..ac58cc1d1bb0 100644 --- a/pkgs/by-name/do/docuseal/Gemfile.lock +++ b/pkgs/by-name/do/docuseal/Gemfile.lock @@ -76,7 +76,7 @@ GEM public_suffix (>= 2.0.2, < 7.0) annotaterb (4.14.0) arabic-letter-connector (0.1.1) - ast (2.4.2) + ast (2.4.3) aws-eventstream (1.3.0) aws-partitions (1.1027.0) aws-sdk-core (3.214.0) @@ -289,10 +289,10 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) jmespath (1.6.2) - json (2.13.2) + json (2.15.0) jwt (2.9.3) base64 - language_server-protocol (3.17.0.3) + language_server-protocol (3.17.0.5) launchy (3.0.1) addressable (~> 2.8) childprocess (~> 5.0) @@ -303,6 +303,7 @@ GEM letter_opener (~> 1.9) railties (>= 6.1) rexml + lint_roller (1.1.0) logger (1.7.0) lograge (0.14.0) actionpack (>= 4) @@ -350,17 +351,26 @@ GEM racc (~> 1.4) nokogiri (1.18.9-x86_64-linux-musl) racc (~> 1.4) + numo-narray (0.9.2.1) oj (3.16.11) bigdecimal (>= 3.0) ostruct (>= 0.2) + onnxruntime (0.10.1) + ffi + onnxruntime (0.10.1-aarch64-linux) + ffi + onnxruntime (0.10.1-arm64-darwin) + ffi + onnxruntime (0.10.1-x86_64-linux) + ffi openssl (3.3.0) orm_adapter (0.5.0) os (1.1.4) ostruct (0.6.3) package_json (0.1.0) pagy (9.3.3) - parallel (1.26.3) - parser (3.3.6.0) + parallel (1.27.0) + parser (3.3.9.0) ast (~> 2.4.1) racc pg (1.5.9) @@ -377,6 +387,7 @@ GEM pretender (0.5.0) actionpack (>= 6.1) prettyprint (0.2.0) + prism (1.5.1) pry (0.15.0) coderay (~> 1.1) method_source (~> 1.0) @@ -389,7 +400,7 @@ GEM puma (6.5.0) nio4r (~> 2.0) racc (1.8.1) - rack (3.2.0) + rack (3.2.3) rack-proxy (0.7.7) rack rack-session (2.1.1) @@ -442,7 +453,7 @@ GEM psych (>= 4.0.0) redis-client (0.23.0) connection_pool - regexp_parser (2.9.3) + regexp_parser (2.11.3) reline (0.6.2) io-console (~> 0.5) representable (3.2.0) @@ -479,18 +490,20 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.2) - rubocop (1.69.2) + rubocop (1.81.1) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.36.2, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.37.0) - parser (>= 3.3.1.0) + rubocop-ast (1.47.1) + parser (>= 3.3.7.2) + prism (~> 1.4) rubocop-performance (1.23.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -559,9 +572,9 @@ GEM tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - unicode-display_width (3.1.2) - unicode-emoji (~> 4.0, >= 4.0.4) - unicode-emoji (4.0.4) + unicode-display_width (3.2.0) + unicode-emoji (~> 4.1) + unicode-emoji (4.1.0) uniform_notifier (1.16.0) uri (1.0.3) useragent (0.16.11) @@ -624,7 +637,9 @@ DEPENDENCIES letter_opener_web lograge mysql2 + numo-narray oj + onnxruntime pagy pg premailer-rails diff --git a/pkgs/by-name/do/docuseal/gemset.nix b/pkgs/by-name/do/docuseal/gemset.nix index 79f90caa1cee..e53f3253f9a1 100644 --- a/pkgs/by-name/do/docuseal/gemset.nix +++ b/pkgs/by-name/do/docuseal/gemset.nix @@ -254,10 +254,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm"; type = "gem"; }; - version = "2.4.2"; + version = "2.4.3"; }; aws-eventstream = { groups = [ "default" ]; @@ -1427,10 +1427,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82"; + sha256 = "0p5dafxjp6kqkf3yx737gz9lwpaljlkc1raynkvcn6yql68d895w"; type = "gem"; }; - version = "2.13.2"; + version = "2.15.0"; }; jwt = { dependencies = [ "base64" ]; @@ -1452,10 +1452,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px"; type = "gem"; }; - version = "3.17.0.3"; + version = "3.17.0.5"; }; launchy = { dependencies = [ @@ -1504,6 +1504,20 @@ }; version = "3.0.0"; }; + lint_roller = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c"; + type = "gem"; + }; + version = "1.1.0"; + }; logger = { groups = [ "default" @@ -1808,6 +1822,16 @@ }; version = "1.18.9"; }; + numo-narray = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1syw9bhkk0bnacadcpdbwvc66j1gi3qqgcvqv3zqh4myxr3npmzf"; + type = "gem"; + }; + version = "0.9.2.1"; + }; oj = { dependencies = [ "bigdecimal" @@ -1822,6 +1846,17 @@ }; version = "3.16.11"; }; + onnxruntime = { + dependencies = [ "ffi" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0c8l82qff7vd6whh0ks1f72734gmghzm0h2hvy2gnnp7y8j7amhq"; + type = "gem"; + }; + version = "0.10.1"; + }; openssl = { groups = [ "default" ]; platforms = [ ]; @@ -1891,10 +1926,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; type = "gem"; }; - version = "1.26.3"; + version = "1.27.0"; }; parser = { dependencies = [ @@ -1909,10 +1944,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fxw738al3qxa4s4ghqkxb908sav03i3h7xflawwmxzhqiyfdm15"; + sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll"; type = "gem"; }; - version = "3.3.6.0"; + version = "3.3.9.0"; }; pg = { groups = [ "default" ]; @@ -1994,6 +2029,20 @@ }; version = "0.2.0"; }; + prism = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0d3i31npmlhmigcs1zlb9lksg7z7lv6nffams71wrz5rriv1n35l"; + type = "gem"; + }; + version = "1.5.1"; + }; pry = { dependencies = [ "coderay" @@ -2092,10 +2141,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04inzfa1psgl8mywgzaks31am1zh00lyc0mf3zb5jv399m8j3kbr"; + sha256 = "0h9xr8ivrfr0i5f2n7czg74r3ri1pba8wb84bzr78iaqlqykg6i3"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.3"; }; rack-proxy = { dependencies = [ "rack" ]; @@ -2335,10 +2384,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yb3iycaj3krvlnicijm99qxvfbrbi0pd81i2cpdhjc3xmbhcqjb"; + sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya"; type = "gem"; }; - version = "2.9.3"; + version = "2.11.3"; }; reline = { dependencies = [ "io-console" ]; @@ -2554,6 +2603,7 @@ dependencies = [ "json" "language_server-protocol" + "lint_roller" "parallel" "parser" "rainbow" @@ -2569,13 +2619,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1f2bj93f60757xyk7h3v0s7xz8d22lc9zlw88l2zd6rp1brv0bvn"; + sha256 = "0d8n87wx2r8vkva5qi4m3hi4s9b6qhmzgw85qgv14hsa65prlaim"; type = "gem"; }; - version = "1.69.2"; + version = "1.81.1"; }; rubocop-ast = { - dependencies = [ "parser" ]; + dependencies = [ + "parser" + "prism" + ]; groups = [ "default" "development" @@ -2584,10 +2637,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10604xc4bcji3ca43anlc89xwxb4wkzk69cia95x04zima4aq4wm"; + sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr"; type = "gem"; }; - version = "1.37.0"; + version = "1.47.1"; }; rubocop-performance = { dependencies = [ @@ -2992,10 +3045,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lcmyip9rw4azsia1hb5srj2mgbdhrinc4113cs1w84qz1ndpm7x"; + sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c"; type = "gem"; }; - version = "3.1.2"; + version = "3.2.0"; }; unicode-emoji = { groups = [ @@ -3006,10 +3059,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c"; + sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9"; type = "gem"; }; - version = "4.0.4"; + version = "4.1.0"; }; uniform_notifier = { groups = [ diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix index e161f5ea0708..c6869b24ed80 100644 --- a/pkgs/by-name/do/docuseal/package.nix +++ b/pkgs/by-name/do/docuseal/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "docuseal"; - version = "2.1.7"; + version = "2.2.0"; bundler = bundler.override { ruby = ruby_3_4; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "docusealco"; repo = "docuseal"; tag = finalAttrs.version; - hash = "sha256-zNfxQPJjobYrx/YPGRn5QKwUd1VXetFqtBeII0wlmk4="; + hash = "sha256-QKGIcLdyIeYcHXA3TRv7PS9V2mok3Y8UOuqCdnCpNfM="; # https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333 postFetch = "rm $out/db/schema.rb"; }; diff --git a/pkgs/by-name/do/docuseal/update.sh b/pkgs/by-name/do/docuseal/update.sh index fbb4561bf0a0..fe351f5d55a3 100755 --- a/pkgs/by-name/do/docuseal/update.sh +++ b/pkgs/by-name/do/docuseal/update.sh @@ -2,6 +2,7 @@ #!nix-shell -i bash -p curl jq bundix ruby_3_4 prefetch-yarn-deps nix-update nixfmt set -eu -o pipefail +set -x dir="$(dirname "$(readlink -f "$0")")" current=$(nix --extra-experimental-features nix-command eval --raw -f . docuseal.src.tag) From 602fdcff2574f640ab08394b35392c4e25cb739c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Thu, 6 Nov 2025 10:37:15 +0000 Subject: [PATCH 1195/2279] claude-code: 2.0.33 -> 2.0.34 --- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 22e0322b6924..b86d4ca4ada2 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.33", + "version": "2.0.34", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.33", + "version": "2.0.34", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 8de765ca83d8..da13768205ad 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.33"; + version = "2.0.34"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-Ng9uJj4STRCKk2ndk7zH3fF/OLZ/cvZSGKH2QRyOFcM="; + hash = "sha256-GYykbpvkFTsj7tlsAimDrNbN9kP1+8AtfG+Boch8eSk="; }; - npmDepsHash = "sha256-89+DrE8rG5WPw6J+iw4t1t+1yJKdbaKLDodfP/CsViU="; + npmDepsHash = "sha256-D0sbwZ5eCzIobFGf5LY7u3/RWQ6bYpGFDlU/ClPTA7Y="; postPatch = '' cp ${./package-lock.json} package-lock.json From 3bdb8d8f9370b76bf336e9ad3ed74bb4e0cae580 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 6 Nov 2025 18:50:31 +0800 Subject: [PATCH 1196/2279] cagebreak: 3.0.0 -> 3.1.0 --- pkgs/by-name/ca/cagebreak/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/cagebreak/package.nix b/pkgs/by-name/ca/cagebreak/package.nix index 49601ee280cf..5f4a1d2c5b01 100644 --- a/pkgs/by-name/ca/cagebreak/package.nix +++ b/pkgs/by-name/ca/cagebreak/package.nix @@ -23,18 +23,18 @@ wayland-scanner, withXwayland ? true, xwayland, - wlroots_0_18, + wlroots_0_19, }: stdenv.mkDerivation (finalAttrs: { pname = "cagebreak"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; tag = finalAttrs.version; - hash = "sha256-vXRIZqFyywRettzriOArl1FGdzWdaeVOfYFZCiPLQZg="; + hash = "sha256-ADRtfzmn8DmDNbiJO3WbhQZiriJoUAG2TxPmx+RwPXE="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { systemd wayland wayland-protocols - wlroots_0_18 + wlroots_0_19 ]; mesonFlags = [ From c58139723adf1499014faf5ceb4e65ac236ee07c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 12:11:00 +0100 Subject: [PATCH 1197/2279] workflows/pull-request-target: remove leftover secret This was used for reviewers.yml, which has been removed. --- .github/workflows/pull-request-target.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index a3774366bc9b..f74ce93de354 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -12,9 +12,6 @@ on: required: true NIXPKGS_CI_APP_PRIVATE_KEY: required: true - OWNER_APP_PRIVATE_KEY: - # The Test workflow should not actually request reviews from owners. - required: false concurrency: group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }} From 1742aef1e988b884b81d6b6060be33d1b8dd1a41 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 12:11:34 +0100 Subject: [PATCH 1198/2279] workflows/teams: use single token in team sync The nixpkgs-ci app now has all the privileges needed to see the member lists anyway, so no need for two apps / tokens anymore. --- .github/workflows/teams.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index 1cd54cd527e0..b848983b5aa2 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -16,13 +16,17 @@ jobs: sync: runs-on: ubuntu-24.04-arm steps: + # Use a GitHub App to create the PR so that CI gets triggered and to + # request team member lists. - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 - id: team-token + id: app-token with: - app-id: ${{ vars.OWNER_APP_ID }} - private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + app-id: ${{ vars.NIXPKGS_CI_APP_ID }} + private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} permission-administration: read + permission-contents: write permission-members: read + permission-pull-requests: write - name: Fetch source uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 @@ -38,7 +42,7 @@ jobs: - name: Synchronise teams uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 with: - github-token: ${{ steps.team-token.outputs.token }} + github-token: ${{ steps.app-token.outputs.token }} script: | require('./ci/github-script/get-teams.js')({ github, @@ -47,20 +51,11 @@ jobs: outFile: "maintainers/github-teams.json" }) - # Use a GitHub App to create the PR so that CI gets triggered - - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 - id: sync-token - with: - app-id: ${{ vars.NIXPKGS_CI_APP_ID }} - private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} - permission-contents: write - permission-pull-requests: write - - name: Get GitHub App User Git String id: user env: - GH_TOKEN: ${{ steps.sync-token.outputs.token }} - APP_SLUG: ${{ steps.sync-token.outputs.app-slug }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} + APP_SLUG: ${{ steps.app-token.outputs.app-slug }} run: | name="${APP_SLUG}[bot]" userId=$(gh api "/users/$name" --jq .id) @@ -70,7 +65,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8 with: - token: ${{ steps.sync-token.outputs.token }} + token: ${{ steps.app-token.outputs.token }} add-paths: maintainers/github-teams.json author: ${{ steps.user.outputs.git-string }} committer: ${{ steps.user.outputs.git-string }} From c6780e087b8ceb6f0d0f3b448db6c0e7f3ab0658 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 14:18:57 +0300 Subject: [PATCH 1199/2279] home-assistant: pin pyav to ffmpeg 7 Ew. --- pkgs/servers/home-assistant/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 51f5b443e56a..e59e152034d9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -7,6 +7,7 @@ python313, replaceVars, ffmpeg-headless, + ffmpeg_7-headless, inetutils, nixosTests, home-assistant, @@ -85,7 +86,7 @@ let ]; }); - av = super.av.overridePythonAttrs rec { + av = (super.av.override { ffmpeg-headless = ffmpeg_7-headless; }).overridePythonAttrs rec { version = "13.1.0"; src = fetchFromGitHub { owner = "PyAV-Org"; From e505932e78fbb4c66d005eb1644f334c0f804ca5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Aug 2025 15:50:09 +0200 Subject: [PATCH 1200/2279] texpresso: 0-unstable-2025-01-29 -> 0.1 Diff: https://github.com/let-def/texpresso/compare/c42a5912f501f180984840fa8adf9ffc09c5ac13...1f17765ddad7e1f7c0fafc100f7fca5472952dc7 --- pkgs/by-name/te/texpresso/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix index 7e65525348fb..ddda76c43b6d 100644 --- a/pkgs/by-name/te/texpresso/package.nix +++ b/pkgs/by-name/te/texpresso/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texpresso"; - version = "0-unstable-2025-01-29"; + version = "0.1"; src = fetchFromGitHub { owner = "let-def"; repo = "texpresso"; - rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13"; - hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g="; + tag = "v${finalAttrs.version}"; + hash = "sha256-d+wNQIysn3hdTQnHN9MJbFOIhJQ0ml6PoeuwsryntTI="; }; postPatch = '' @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { #!nix-shell -i bash -p curl jq nix-update tectonic_version="$(curl -s "https://api.github.com/repos/let-def/texpresso/contents/tectonic" | jq -r '.sha')" - nix-update --version=branch texpresso + nix-update texpresso nix-update --version=branch=$tectonic_version texpresso.tectonic ''; }; From fef66ce780e39d628fc7eddbfc98f9c60559ad11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 11:28:40 +0000 Subject: [PATCH 1201/2279] vscode-extensions.k--kato.intellij-idea-keybindings: 1.7.5 -> 1.7.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 66641240934e..b47b6869df20 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2643,8 +2643,8 @@ let mktplcRef = { name = "intellij-idea-keybindings"; publisher = "k--kato"; - version = "1.7.5"; - hash = "sha256-DOSe0UhNMj6FRyHylnKYQsyhSLQQFvGfcmOBZSw+nVo="; + version = "1.7.6"; + hash = "sha256-eSt4iT/o4mp17Dasr0gDr3SsQHX3R6jGmW4V/2KymnY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog"; From 918e017d6436ce1683d92af1ee4949e606fb1933 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 6 Nov 2025 19:34:30 +0800 Subject: [PATCH 1202/2279] lib.extendMkDerivation: adjust default value documentation --- lib/customisation.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 30747f7fde7e..55117f8289d0 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -763,11 +763,11 @@ rec { # Inputs `extendMkDerivation`-specific configurations - : `constructDrv`: Base build helper, the `mkDerivation`-like build helper to extend. - : `excludeDrvArgNames`: Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`. - : `extendDrvArgs` : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`. - : `inheritFunctionArgs`: Whether to inherit `__functionArgs` from the base build helper (default to `true`). - : `transformDrv`: Function to apply to the result derivation (default to `lib.id`). + : `constructDrv` (required): Base build helper, the `mkDerivation`-like build helper to extend. + : `excludeDrvArgNames` (default to `[ ]`): Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`. + : `extendDrvArgs` (required): An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`. + : `inheritFunctionArgs` (default to `true`): Whether to inherit `__functionArgs` from the base build helper. + : `transformDrv` (default to `lib.id`): Function to apply to the result derivation. # Type From 289ec9eb7bc5e7c927afc6052ddf531f17ee7820 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Thu, 6 Nov 2025 11:37:24 +0000 Subject: [PATCH 1203/2279] maintainers/github-teams.json: Automated sync --- maintainers/github-teams.json | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index e67875efe6c5..289edd306687 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -724,7 +724,6 @@ "description": "Provides leadership for and has authority over Nixpkgs.", "id": 14317027, "maintainers": { - "K900": 386765, "alyssais": 2768870, "emilazy": 18535642, "wolfgangwalther": 9132420 From b337d6e74d1414bf208cdec6520305aa5d8b6ea9 Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Thu, 6 Nov 2025 13:35:32 +0200 Subject: [PATCH 1204/2279] python3Packages.files-to-prompt: Fix build Disable a test that fails with latest Click version. --- pkgs/development/python-modules/files-to-prompt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix index f4392672429a..29d6fc79c16d 100644 --- a/pkgs/development/python-modules/files-to-prompt/default.nix +++ b/pkgs/development/python-modules/files-to-prompt/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { versionCheckHook ]; + disabledTests = [ "test_binary_file_warning" ]; + versionCheckProgramArg = "--version"; meta = { From 342edfebb8eb705e1e41f1107f6630b7cd8a03d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 11:46:43 +0000 Subject: [PATCH 1205/2279] gancio: 1.28.0 -> 1.28.1 --- pkgs/by-name/ga/gancio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index f99f7f5f03c3..916041b08d3b 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "gancio"; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "les"; repo = "gancio"; rev = "v${finalAttrs.version}"; - hash = "sha256-0pwZdS/EQNxcHQhvNrTEm70VGkbDdILDgdqCV0qwd3k="; + hash = "sha256-G1hkuHIaSWMaW2gmUrv4+AB/TBQutB2bim1HSwNRc2E="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-skUlzmjKfeVdvKAHj5L+xO2LEn1j8af8DOjHTATLedo="; + hash = "sha256-N53GctXhKH04rO+N8Tshln6bU+QuOyZPEuJf8hC0wHk="; }; nativeBuildInputs = [ From bb0522505056d85c7a2bd322be8a19a4e49d187c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Thu, 6 Nov 2025 11:44:33 +0000 Subject: [PATCH 1206/2279] high-tide: add gst-plugins-bad --- pkgs/by-name/hi/high-tide/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index b19baef569a7..ac3b3d85f244 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -49,6 +49,7 @@ python313Packages.buildPythonApplication rec { gstreamer gst-plugins-base gst-plugins-good + gst-plugins-bad libsecret ]); From e410e51de7984f7f594935c32f29a1f726555652 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 6 Nov 2025 12:47:29 +0100 Subject: [PATCH 1207/2279] coqPackages.metarocq: 1.'-9.0 -> 1.4-9.1 --- pkgs/development/coq-modules/metarocq/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix index 952ed86ddbf2..ba2a7ba8c40a 100644 --- a/pkgs/development/coq-modules/metarocq/default.nix +++ b/pkgs/development/coq-modules/metarocq/default.nix @@ -15,11 +15,13 @@ let case = case: out: { inherit case out; }; in lib.switch coq.coq-version [ + (case "9.1" "1.4-9.1") (case "9.0" "1.4-9.0.1") ] null; release = { "1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg="; "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI="; + "1.4-9.1".sha256 = "sha256-v6jFvUavIzyb/e6ytAaZjxQLFM9uW9TDUB77yRO74eE="; }; releaseRev = v: "v${v}"; From 3d70e7f1af76d87403edf921173d9c7f481ade78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 11:49:10 +0000 Subject: [PATCH 1208/2279] linuxKernel.kernels.linux_zen: 6.17.6 -> 6.17.7 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ab7002b0886c..1c0435d1306f 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.17.6"; # zen + version = "6.17.7"; # zen suffix = "zen1"; # zen - sha256 = "0kkrfmxj1q7il7njc1s8fnn459rcgviyy5q2kbynasrqij5kdciy"; # zen + sha256 = "01dh7cdqa4rx0fmr22yyn8d6qb8ns7v0x53k2ij3vrp9pz6p5cs4"; # zen isLqx = false; }; # ./update-zen.py lqx From 92d617e1a9aa603e4de1284dffe6e10f707b66e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 11:50:26 +0000 Subject: [PATCH 1209/2279] json-repair: 0.52.2 -> 0.52.4 --- pkgs/development/python-modules/json-repair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index 4ad9515baf2b..3b1828f75e73 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.52.2"; + version = "0.52.4"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; tag = "v${version}"; - hash = "sha256-NYW2PJ329c8EYfQrRl1mi+leUR7Afz2J0N9HVD1xyT0="; + hash = "sha256-eO9F2c3hIHhxLC5j2+ZtPaj+zD7Mby44N7ULsxfAQxg="; }; build-system = [ setuptools ]; From e356805995fdc3779bd6d02e0508ba7b12156159 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:18:29 +0000 Subject: [PATCH 1210/2279] emacsPackages.ebuild-mode: 1.78 -> 1.79 --- .../elisp-packages/manual-packages/ebuild-mode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 8fd622b2cb08..cf2ffff8d4ff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.78"; + version = "1.79"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-vpNjhW3U/b+A4O78vYKoMN0Gutd6fRcB4wb3dz1z2Cc="; + hash = "sha256-FV9e6QF85yPnowfmseo53/Q36W3wlOgTG0/X4r7OHiI="; }; meta = { From 1048da6e0a8606295dac111cf8de7465726f1011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:27:16 +0000 Subject: [PATCH 1211/2279] werf: 2.51.1 -> 2.51.3 --- pkgs/by-name/we/werf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index e907e3f79c11..cad94a2edf39 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.51.1"; + version = "2.51.3"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-8tmBzwvuYv3FvSNFpu51fYZP1nqQHtfKioY6eycf7W8="; + hash = "sha256-xka8poabuG1Bwmo+Q+VeWLZIkKSY9+k5JHYTO2ecz2I="; }; proxyVendor = true; From bc14d5bd6e563391bb7c3339d18be1e7513f4932 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:27:44 +0000 Subject: [PATCH 1212/2279] goodvibes: 0.8.2 -> 0.8.3 --- pkgs/by-name/go/goodvibes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix index 02944b66b646..cc7e123d8bec 100644 --- a/pkgs/by-name/go/goodvibes/package.nix +++ b/pkgs/by-name/go/goodvibes/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitLab { owner = "goodvibes"; repo = "goodvibes"; rev = "v${version}"; - hash = "sha256-AHw8KlU1lmgH837GOpxGBgngwRIs5XV3+TvH4MuCx54="; + hash = "sha256-Lh4FPH0Bdxg2J4IxsZPs8Zjc7Tcobb4bTpvJzVNIy0Y="; }; nativeBuildInputs = [ From bc5ac1823cb66a8696e3c6c38d5ab4c15dff0d63 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 6 Nov 2025 06:43:38 +0100 Subject: [PATCH 1213/2279] qtconnectivity: fix build on darwin pcsclite is provided by Apple framework Signed-off-by: Florian Brandes --- pkgs/development/libraries/qt-6/modules/qtconnectivity.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 7fc3c4ca3c5d..c96ebd0e0f32 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -12,7 +12,10 @@ qtModule { pname = "qtconnectivity"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pcsclite + bluez + ]; propagatedBuildInputs = [ qtbase qtdeclarative From 2c12d231fd5a6a3ac7f1991cf0f28c3849f7e1f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:37:06 +0000 Subject: [PATCH 1214/2279] jsonplaceholder: 0-unstable-2021-06-14 -> 0.3.3-unstable-2021-06-14 --- pkgs/by-name/js/jsonplaceholder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/js/jsonplaceholder/package.nix b/pkgs/by-name/js/jsonplaceholder/package.nix index 5036c9006bd9..63b034436f34 100644 --- a/pkgs/by-name/js/jsonplaceholder/package.nix +++ b/pkgs/by-name/js/jsonplaceholder/package.nix @@ -9,13 +9,13 @@ buildNpmPackage { pname = "jsonplaceholder"; - version = "0-unstable-2021-06-14"; + version = "0.3.3-unstable-2021-06-14"; src = fetchFromGitHub { owner = "typicode"; repo = "jsonplaceholder"; rev = "7ae4432ac3f60e7226a899c25e04826207d07098"; - hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ"; + hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ="; }; npmDepsHash = "sha256-x+EN33CQE4ga9T0V4oJRPkELT8x4WbNIsQmvyW+hHi8="; From 980fc4645f0d5c5e437b884cd7ca69397604af7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:39:29 +0000 Subject: [PATCH 1215/2279] sentry-cli: 2.57.0 -> 2.58.0 --- pkgs/by-name/se/sentry-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix index 895249d29723..ac1c66aca115 100644 --- a/pkgs/by-name/se/sentry-cli/package.nix +++ b/pkgs/by-name/se/sentry-cli/package.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.57.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - hash = "sha256-VcWIeWLWQpEDJhF0f95S9sQ0yC1NJqisOmEONINtKeA="; + hash = "sha256-8fz8bSQxqylTQ7mD/QbQ6gc8qlEdx/SDCjaB3uqFnGA="; }; doCheck = false; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase` dontUseSwiftpmBuild = true; - cargoHash = "sha256-S+A6v4rva8c7QuWP/5dRzUtJDdWryb8Jmu2J4JurNMM="; + cargoHash = "sha256-3I0uKHpD4SpSeLSIAEjBxxAFfyS4WIvb76x7QAy53HM="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ From affa1ee33b6b028be7a701d15bd7d41b99341f75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:42:06 +0000 Subject: [PATCH 1216/2279] buffrs: 0.11.0 -> 0.12.0 --- pkgs/by-name/bu/buffrs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix index e66dbc9a3e0a..e5bf43638479 100644 --- a/pkgs/by-name/bu/buffrs/package.nix +++ b/pkgs/by-name/bu/buffrs/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "buffrs"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "helsing-ai"; repo = "buffrs"; tag = "v${version}"; - hash = "sha256-VHzPOFOkwz3QlDt25gBbishM4ujtEPFjA21WuiNVw00="; + hash = "sha256-c1QMPFVc9k3hTK7Y1aimXbJ4IKBNmAt9aYtiUIchG8E="; }; - cargoHash = "sha256-/cdBt23VSmwN/C2XdHeeRjUSqLWiEheqVl+hfEDKIP0="; + cargoHash = "sha256-6592v/ednZDaKfMcaMCAmJOh4ZhZdBwIpEZiqsbF4hU="; # Disabling tests meant to work over the network, as they will fail # inside the builder. From 0def4430e83356db9fec4b31952ba22492924675 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:44:07 +0000 Subject: [PATCH 1217/2279] awsbck: 1.0.0 -> 1.0.1 --- pkgs/by-name/aw/awsbck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix index 1c253b989b34..5fe548b6eef5 100644 --- a/pkgs/by-name/aw/awsbck/package.nix +++ b/pkgs/by-name/aw/awsbck/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-IFdhfBri1k5u7NfC1HTSegKCtRDK2fz+WkjwHOtp1qk="; + hash = "sha256-WWYUMamMDtnvOR7vjoKd1Kn8vJBAAa9Jj8MFPRGQfEQ="; }; - cargoHash = "sha256-9RKsnGjbP0iQsC2iCq6LTleILHvX0powQu15oopE2XY="; + cargoHash = "sha256-eo7NBGDPhu+v07dUUw/k1O62gxbeXh1PdPogTjg6l8I="; # tests run in CI on the source repo doCheck = false; From 0dd045ea6f52ba0aef9cca4e7a146af9a0ce83be Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 6 Nov 2025 12:45:37 +0000 Subject: [PATCH 1218/2279] thanos: Add versionCheckHook --- pkgs/by-name/th/thanos/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix index 48e32cec0779..b56882f7d653 100644 --- a/pkgs/by-name/th/thanos/package.nix +++ b/pkgs/by-name/th/thanos/package.nix @@ -7,6 +7,7 @@ nixosTests, testers, thanos, + versionCheckHook, }: buildGoModule rec { @@ -45,6 +46,12 @@ buildGoModule rec { doCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; tests = { From 47b6f9110c95402f572802ae6c4ae98ed3078c4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:50:38 +0000 Subject: [PATCH 1219/2279] swaylock: 1.8.3 -> 1.8.4 --- pkgs/by-name/sw/swaylock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 674d84f83878..95c55943e525 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; tag = "v${version}"; - hash = "sha256-5JAA8mCY3vOsauvRK2zquBrzA2ROakEfahzp4a6j/Ac="; + hash = "sha256-l3fu04cw2Jin2F6UcDK0kWRJLKuwXpxuImUjoLk32Fc="; }; strictDeps = true; From 85e15f7cbf0dead359430e4dcafda48c90ec6a01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 12:55:12 +0000 Subject: [PATCH 1220/2279] python3Packages.gvm-tools: 25.4.1 -> 25.4.2 --- pkgs/development/python-modules/gvm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 9d91d6b518c0..ac4854c13f86 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "25.4.1"; + version = "25.4.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-tools"; tag = "v${version}"; - hash = "sha256-BYkpHUSw9MU9SpJiQf1ZgG1ZCfRxyAyX/K+53wgnKoQ="; + hash = "sha256-mhQX9yBH8mQ+ESZzqM2VC4bfktI677Y/dli/YWTYRhE="; }; __darwinAllowLocalNetworking = true; From 0a064e1cb30df71240a309e2dd3e13d5721d7a76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 13:16:07 +0000 Subject: [PATCH 1221/2279] qmapshack: 1.18.1 -> 1.18.2 --- pkgs/by-name/qm/qmapshack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix index 6b1b3afff205..a045c8e329bb 100644 --- a/pkgs/by-name/qm/qmapshack/package.nix +++ b/pkgs/by-name/qm/qmapshack/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmapshack"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "Maproom"; repo = "qmapshack"; tag = "V_${finalAttrs.version}"; - hash = "sha256-uJO0WBA8/PAvO3yFE7O2Ncz801UBoL2Nf7Dv61yxQag="; + hash = "sha256-vvpDjGFzkbsM/QUiU9EURuU0babWYL1gLzWTqJbHu0c="; }; nativeBuildInputs = [ From 3771940d07d6e120bc646e736eaea2e3c974fd41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 13:18:54 +0000 Subject: [PATCH 1222/2279] talosctl: 1.11.3 -> 1.11.4 --- pkgs/by-name/ta/talosctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix index 7ac6a74005ce..c95b764c42f5 100644 --- a/pkgs/by-name/ta/talosctl/package.nix +++ b/pkgs/by-name/ta/talosctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; tag = "v${version}"; - hash = "sha256-6nm0KgENOHUdyJllvnhBNlxDGL3G8gg4KqhTkTRE32o="; + hash = "sha256-TA84RIn5ZRW9ZrsnEYB094n+H8MBBSyRjubcy4Qqmnw="; }; - vendorHash = "sha256-NLyWzkagiP6zeeB4o6CI9UBPH6a5JGhPu1QGyiovBfM="; + vendorHash = "sha256-8yy0lLC+9Ubw9gHUOnq3ZgrjaOxSxtorSJxuxM9laKE="; ldflags = [ "-s" From fbcbb15299fa058736077a41757ff9836a3e946a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 13:34:02 +0000 Subject: [PATCH 1223/2279] cocogitto: 6.3.0 -> 6.5.0 --- pkgs/by-name/co/cocogitto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix index 6a6bc4982611..e8fcb71c6e19 100644 --- a/pkgs/by-name/co/cocogitto/package.nix +++ b/pkgs/by-name/co/cocogitto/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "6.3.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "oknozor"; repo = "cocogitto"; tag = version; - hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE="; + hash = "sha256-aAVoPPeuJN6QPcuc3oBF93dP6U+74bAoSDw93XR01Vo="; }; - cargoHash = "sha256-wfq1W9zjC0phPUr6SaLv8Ia5aQk/+1ujOTo0241X7AY="; + cargoHash = "sha256-yDpZHkRKsWXXHuSKnzhGrjsFLUFZEpC23tcU3FeUZK8="; # Test depend on git configuration that would likely exist in a normal user environment # and might be failing to create the test repository it works in. From 0bdc7c415b27deff14ab884bfa6a90ce103dab8b Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 6 Nov 2025 14:43:10 +0100 Subject: [PATCH 1224/2279] chromium,chromedriver: 142.0.7444.59 -> 142.0.7444.134 https://chromereleases.googleblog.com/2025/11/stable-channel-update-for-desktop.html This update includes 5 security fixes. CVEs: CVE-2025-12725 CVE-2025-12726 CVE-2025-12727 CVE-2025-12728 CVE-2025-12729 --- .../networking/browsers/chromium/info.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 1725526143ae..1c0ee2a7a319 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "142.0.7444.59", + "version": "142.0.7444.134", "chromedriver": { - "version": "142.0.7444.60", - "hash_darwin": "sha256-5Atr7h0jIneU4VbSF20j+3tcYVneYvqOsJ0GG8sD7r4=", - "hash_darwin_aarch64": "sha256-sh2BTEKJaAYbiuNYiSW6iChiCroo95EHoGqxVgX6Jw0=" + "version": "142.0.7444.135", + "hash_darwin": "sha256-i34SR1pfHcAA4N4ppIioa7r33PnvY0OYA8/+U1bQFs8=", + "hash_darwin_aarch64": "sha256-dsbjEDkZ0AVghazgF5w9O3aUWZNSy8R9WiHn9m/Sa9g=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa", - "hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=", + "rev": "b6965f826881a60c51151cfc0a0175966a0a4e81", + "hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=", "recompress": true }, "src/third_party/clang-format/script": { @@ -132,8 +132,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920", - "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo=" + "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831", + "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -257,8 +257,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7", - "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg=" + "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17", + "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -807,8 +807,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "bb294624702efbb17691b642333f06bf5108e600", - "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs=" + "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d", + "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs=" } } }, From 7b234c74e082c457bfe1c62632dd1043c94da1fd Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Thu, 6 Nov 2025 15:07:32 +0200 Subject: [PATCH 1225/2279] semiphemeral: drop --- pkgs/by-name/se/semiphemeral/package.nix | 38 ------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/by-name/se/semiphemeral/package.nix diff --git a/pkgs/by-name/se/semiphemeral/package.nix b/pkgs/by-name/se/semiphemeral/package.nix deleted file mode 100644 index 90f419d35432..000000000000 --- a/pkgs/by-name/se/semiphemeral/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - python3, - fetchPypi, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "semiphemeral"; - version = "0.7"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U="; - }; - - doCheck = false; # upstream has no tests - - pythonImportsCheck = [ "semiphemeral" ]; - - build-system = with python3.pkgs; [ setuptools ]; - - dependencies = with python3.pkgs; [ - click - sqlalchemy - flask - tweepy - colorama - ]; - - meta = with lib; { - description = "Automatically delete your old tweets, except for the ones you want to keep"; - homepage = "https://github.com/micahflee/semiphemeral"; - license = licenses.mit; - maintainers = with maintainers; [ amanjeev ]; - mainProgram = "semiphemeral"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7f758a78104..a7d8ed11a8c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1351,6 +1351,7 @@ mapAliases { SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20 seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21 seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21 + semiphemeral = throw "'semiphemeral' has been removed as it is archived upstream"; # Added 2025-11-06 sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27 session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27 setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18 From 9dd3dd1d7b8c5daf39f00c8d3863a15da6b0c5ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 14:00:03 +0000 Subject: [PATCH 1226/2279] home-assistant-custom-lovelace-modules.card-mod: 3.4.5 -> 3.4.6 --- .../custom-lovelace-modules/card-mod/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix index 2aa1a3ab3ab7..d11aa9a3adf9 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "lovelace-card-mod"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "thomasloven"; repo = "lovelace-card-mod"; rev = "v${version}"; - hash = "sha256-yd07C3/tpnoclrztWBAVwU6Ic2a4hY45xcjmgSp/uZA="; + hash = "sha256-eQwJOVpRy9MTILWrKSru90p+kKgRlIUBFhpeHrYX3X0="; }; - npmDepsHash = "sha256-IjN0sBWa6y/j0x5XRvDU0F6kA9RTfKFlVsnqwBkgx2Q="; + npmDepsHash = "sha256-3KXu/RhDt0jzO9UJKRN3nOc/mm9tCOeQYGRGaCUv2wM="; installPhase = '' runHook preInstall From 061ef6f35d31fedc67d28e5f93516f43ea3a0838 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sun, 2 Nov 2025 14:37:05 +0000 Subject: [PATCH 1227/2279] opencode: 1.0.25 -> 1.0.35 --- pkgs/by-name/op/opencode/hashes.json | 8 + .../op/opencode/local-models-dev.patch | 20 ++ pkgs/by-name/op/opencode/package.nix | 189 ++++++++++++------ pkgs/by-name/op/opencode/skip-npm-pack.patch | 24 +++ 4 files changed, 178 insertions(+), 63 deletions(-) create mode 100644 pkgs/by-name/op/opencode/hashes.json create mode 100644 pkgs/by-name/op/opencode/local-models-dev.patch create mode 100644 pkgs/by-name/op/opencode/skip-npm-pack.patch diff --git a/pkgs/by-name/op/opencode/hashes.json b/pkgs/by-name/op/opencode/hashes.json new file mode 100644 index 000000000000..ad76e9e5ed76 --- /dev/null +++ b/pkgs/by-name/op/opencode/hashes.json @@ -0,0 +1,8 @@ +{ + "node_modules": { + "aarch64-linux": "sha256-nNzDvqsFLJdZYDjvuYAcohnGnqNiGiS1mI9zAeKPr/U=", + "x86_64-linux": "sha256-rrW97K4eNtW3gGxu49BdzL6p8/goHBi3IT6z0IcQY0A=", + "aarch64-darwin": "sha256-joKBnXYVtDiJeq7sdDZwseXdNIjXM6BO3RqLTvq8kTQ=", + "x86_64-darwin": "sha256-6hLqaOP6qxnkUPHsWvlD96SjXRrbqWLeExWwlRgrUdg=" + } +} diff --git a/pkgs/by-name/op/opencode/local-models-dev.patch b/pkgs/by-name/op/opencode/local-models-dev.patch new file mode 100644 index 000000000000..21ecd38fb0c8 --- /dev/null +++ b/pkgs/by-name/op/opencode/local-models-dev.patch @@ -0,0 +1,20 @@ +diff --git i/packages/opencode/src/provider/models-macro.ts w/packages/opencode/src/provider/models-macro.ts +index 91a0348..4f60069 100644 +--- i/packages/opencode/src/provider/models-macro.ts ++++ w/packages/opencode/src/provider/models-macro.ts +@@ -1,4 +1,15 @@ + export async function data() { ++ const localApiJsonPath = process.env.MODELS_DEV_API_JSON ++ ++ // Try to read from local file if path is provided ++ if (localApiJsonPath) { ++ const localFile = Bun.file(localApiJsonPath) ++ if (await localFile.exists()) { ++ return await localFile.text() ++ } ++ } ++ ++ // Fallback to fetching from remote URL + const json = await fetch("https://models.dev/api.json").then((x) => x.text()) + return json + } diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 0e847d5b5306..1eb440b9b922 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -1,91 +1,158 @@ { lib, stdenvNoCC, - fetchurl, - autoPatchelfHook, - common-updater-scripts, - curl, - installShellFiles, - jq, - unzip, + bun, + fetchFromGitHub, + fzf, + makeBinaryWrapper, + models-dev, + nix-update-script, + ripgrep, testers, - writeShellScript, + writableTmpDirAsHomeHook, }: + stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.0.25"; + version = "1.0.35"; + src = fetchFromGitHub { + owner = "sst"; + repo = "opencode"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0IFlFWMPu9ynrpu/bYJK2xOgZc+lCSQOSV2WfD0KY3w="; + }; - src = - finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - sourceRoot = "."; + node_modules = stdenvNoCC.mkDerivation { + pname = "opencode-node_modules"; + inherit (finalAttrs) version src; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + + # NOTE: Without `--linker=hoisted` the necessary platform specific packages are not created, i.e. `@parcel/watcher--` and `@opentui/core--` + bun install \ + --filter=./packages/opencode \ + --force \ + --frozen-lockfile \ + --ignore-scripts \ + --linker=hoisted \ + --no-progress \ + --production + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/node_modules + cp -R ./node_modules $out + + runHook postInstall + ''; + + # NOTE: Required else we get errors that our fixed-output derivation references store paths + dontFixup = true; + + outputHash = (lib.importJSON ./hashes.json).node_modules.${stdenvNoCC.hostPlatform.system}; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; - strictDeps = true; nativeBuildInputs = [ - unzip - installShellFiles - ] - ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; + bun + makeBinaryWrapper + models-dev + ]; + + patches = [ + # NOTE: Patch `packages/opencode/src/provider/models-macro.ts` to get contents of + # `_api.json` from the file bundled with `bun build`. + ./local-models-dev.patch + # NOTE: Skip npm pack commands in build.ts since packages are already in node_modules + ./skip-npm-pack.patch + ]; + + configurePhase = '' + runHook preConfigure + + cd packages/opencode + cp -R ${finalAttrs.node_modules}/. . + + chmod -R u+w ./node_modules + # Make symlinks absolute to avoid issues with bun build + rm ./node_modules/@opencode-ai/script + ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script + rm -f ./node_modules/@opencode-ai/sdk + ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk + rm -f ./node_modules/@opencode-ai/plugin + ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin + + runHook postConfigure + ''; + + env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json"; + env.OPENCODE_VERSION = finalAttrs.version; + env.OPENCODE_CHANNEL = "stable"; + + buildPhase = '' + runHook preBuild + + bun run ./script/build.ts --single + + runHook postBuild + ''; - dontConfigure = true; - dontBuild = true; dontStrip = true; installPhase = '' runHook preInstall - install -Dm 755 ./opencode $out/bin/opencode + install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode runHook postInstall ''; + postInstall = '' + wrapProgram $out/bin/opencode \ + --prefix PATH : ${ + lib.makeBinPath [ + fzf + ripgrep + ] + } + ''; + passthru = { - sources = { - "aarch64-darwin" = fetchurl { - url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip"; - hash = "sha256-z/TMgr1OVQi69lcrhV8sxPzlZp3t2dHA2b0C2JXeMFg="; - }; - "aarch64-linux" = fetchurl { - url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip"; - hash = "sha256-C7bjxmzLetc2Y0vN8P3mhvzaa5ZBZxTBtfRYiv5q8Zg="; - }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip"; - hash = "sha256-Xv4TJbrn86v/BBPCZu2DdrTP+WLkroizNvLtNSOrxvk="; - }; - "x86_64-linux" = fetchurl { - url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip"; - hash = "sha256-ESsmlnFvmEPggRYOiacg3tGifWw8UQQP+ZGDcDCsCq4="; - }; - }; tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "HOME=$(mktemp -d) opencode --version"; inherit (finalAttrs) version; }; - updateScript = writeShellScript "update-opencode" '' - set -o errexit - export PATH="${ - lib.makeBinPath [ - curl - jq - common-updater-scripts - ] - }" - NEW_VERSION=$(curl --silent https://api.github.com/repos/sst/opencode/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) - if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then - echo "No update available." - exit 0 - fi - for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do - update-source-version "opencode" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" - done - ''; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; }; meta = { description = "AI coding agent built for the terminal"; - changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}"; longDescription = '' OpenCode is a terminal-based agent that can build anything. It combines a TypeScript/JavaScript core with a Go-based TUI @@ -93,11 +160,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/sst/opencode"; license = lib.licenses.mit; - platforms = builtins.attrNames finalAttrs.passthru.sources; - maintainers = with lib.maintainers; [ - zestsystem - delafthi - ]; + platforms = lib.platforms.unix; mainProgram = "opencode"; }; }) diff --git a/pkgs/by-name/op/opencode/skip-npm-pack.patch b/pkgs/by-name/op/opencode/skip-npm-pack.patch new file mode 100644 index 000000000000..cdb93c3f82fa --- /dev/null +++ b/pkgs/by-name/op/opencode/skip-npm-pack.patch @@ -0,0 +1,24 @@ +diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts +index 4ce8bfba..5b3da591 100755 +--- i/packages/opencode/script/build.ts ++++ w/packages/opencode/script/build.ts +@@ -39,17 +39,9 @@ for (const [os, arch] of targets) { + const name = `${pkg.name}-${os}-${arch}` + await $`mkdir -p dist/${name}/bin` + +- const opentui = `@opentui/core-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}` +- await $`mkdir -p ../../node_modules/${opentui}` +- await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd( +- path.join(dir, "../../node_modules"), +- ) +- await $`tar -xf ../../node_modules/${opentui.replace("@opentui/", "opentui-")}-*.tgz -C ../../node_modules/${opentui} --strip-components=1` ++ // Skip npm pack - packages already installed in node_modules by Nix + +- const watcher = `@parcel/watcher-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}${os === "linux" ? "-glibc" : ""}` +- await $`mkdir -p ../../node_modules/${watcher}` +- await $`npm pack ${watcher}`.cwd(path.join(dir, "../../node_modules")).quiet() +- await $`tar -xf ../../node_modules/${watcher.replace("@parcel/", "parcel-")}-*.tgz -C ../../node_modules/${watcher} --strip-components=1` ++ // Skip npm pack - packages already installed in node_modules by Nix + + const parserWorker = fs.realpathSync( + path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js"), From 4658d0d5a3affe8457c74351bf012fc9e17fa417 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 11:15:48 +0100 Subject: [PATCH 1228/2279] ci/github-script/bot: fix needs reviewer label The recent change to use the result of requesting reviewers for setting the `needs: reviewer` label caused a regression: It would not set the label for PRs where no reviewers were requested, because *too many were eligible*. Still - these PRs don't have reviewers, so they need attention otherwise - via the label. --- ci/github-script/reviewers.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js index 2ac0d346f369..c5f79c11d992 100644 --- a/ci/github-script/reviewers.js +++ b/ci/github-script/reviewers.js @@ -64,14 +64,6 @@ async function handleReviewers({ ).filter(Boolean) log('reviewers - reviewers', reviewers.join(', ')) - if (reviewers.length > 15) { - log( - `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`, - ) - // false indicates, that we do have reviewers and don't need the "needs: reviewers" label. - return false - } - const requested_reviewers = new Set( pull_request.requested_reviewers.map(({ login }) => login), ) @@ -88,6 +80,14 @@ async function handleReviewers({ Array.from(existing_reviewers).join(', '), ) + if (reviewers.length > 15) { + log( + `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`, + ) + // Return a boolean on whether the "needs: reviewers" label should be set. + return existing_reviewers.size === 0 && requested_reviewers.size === 0 + } + const non_requested_reviewers = new Set(reviewers) .difference(requested_reviewers) // We don't want to rerequest reviews from people who already reviewed. @@ -117,7 +117,7 @@ async function handleReviewers({ // Return a boolean on whether the "needs: reviewers" label should be set. return ( - new_reviewers.size === 0 && + non_requested_reviewers.size === 0 && existing_reviewers.size === 0 && requested_reviewers.size === 0 ) From 3570896cecfd9e34d86149df6a0bfa24599e773f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 14:14:57 +0000 Subject: [PATCH 1229/2279] python3Packages.ufoprocessor: 1.13.3 -> 1.14.1 --- pkgs/development/python-modules/ufoprocessor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix index e848536d8c60..a9bcacc15869 100644 --- a/pkgs/development/python-modules/ufoprocessor/default.nix +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "ufoprocessor"; - version = "1.13.3"; + version = "1.14.1"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1187g7xs6z8i2hzfkqhfd59qsdvzydqnmwhaz71nsi1zf5bw59gw"; + sha256 = "sha256-/TjTzDWblBcbqNP9weTe/eIgas70+X11tIUDu4rAOwE="; }; build-system = [ setuptools-scm ]; From d086c6c6b3f8b2661596f1d424871601e7c5a96f Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 12:51:46 +0100 Subject: [PATCH 1230/2279] ci/github-script/merge: add hint about stuck GitHub Unfortunately it still happens frequently that, after enabling auto-merge, GitHub is stuck even though all checks have passed, and doesn't merge the PR. Any contributor can trigger GitHub again with an approval of the PR - this will then immediately queue the PR for merge. Adding a hint to the posted comment, should help users through this without my intervention. --- ci/github-script/merge.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js index 688a7928fe97..deb2b5bdabba 100644 --- a/ci/github-script/merge.js +++ b/ci/github-script/merge.js @@ -182,7 +182,9 @@ async function handleMerge({ }`, { node_id: pull_request.node_id, sha: pull_request.head.sha }, ) - return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge` + return [ + `:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`, + ] } catch (e) { log('Enqueing failed', e.response.errors[0].message) } @@ -201,7 +203,12 @@ async function handleMerge({ }`, { node_id: pull_request.node_id, sha: pull_request.head.sha }, ) - return 'Enabled Auto Merge' + return [ + `:heavy_check_mark: Enabled Auto Merge (#306934)`, + '', + '> [!TIP]', + '> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.', + ] } catch (e) { log('Auto Merge failed', e.response.errors[0].message) throw new Error(e.response.errors[0].message) @@ -287,7 +294,7 @@ async function handleMerge({ if (result) { await react('ROCKET') try { - body.push(`:heavy_check_mark: ${await merge()} (#306934)`) + body.push(...(await merge())) } catch (e) { // Remove the HTML comment with node_id reference to allow retrying this merge on the next run. body.shift() From 9769386e388f860b6aac078ec2a39944f892fb86 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 6 Nov 2025 22:22:54 +0800 Subject: [PATCH 1231/2279] pantheon.elementary-code: 8.1.1 -> 8.1.2 https://github.com/elementary/code/compare/8.1.1...8.1.2 --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 0dc979e18b85..faf3de7c06c5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "8.1.1"; + version = "8.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; - rev = version; - hash = "sha256-4IGun7MnrMRmpXD0Kxm/ND4C3pFVhjHqDeP6jUmRg7k="; + tag = version; + hash = "sha256-DZ6smq339VgR33jQm0OFD9CM8sQ0Rz7aHKL1EWFSyBM="; }; strictDeps = true; From bd4649bdd3ec1c3721ab14636e99a5b7baa71af9 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 6 Nov 2025 11:25:21 -0300 Subject: [PATCH 1232/2279] maintainers: drop redbaron --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dd6c6b13881e..c0aef881becd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21762,12 +21762,6 @@ { fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; } ]; }; - redbaron = { - email = "ivanov.maxim@gmail.com"; - github = "redbaron"; - githubId = 16624; - name = "Maxim Ivanov"; - }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; From 5652eea9258880d16612231a319d6b90111411ad Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 6 Nov 2025 06:26:13 -0800 Subject: [PATCH 1233/2279] cinny-desktop: 4.10.1 -> 4.10.2 Diff: https://github.com/cinnyapp/cinny-desktop/compare/v4.10.1...v4.10.2 Changelog: https://github.com/cinnyapp/cinny/releases/tag/v4.10.2 --- pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 81d2b034dad9..d5c1082760ab 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.10.1"; + version = "4.10.2"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-SUbEanFIvjj2wyy/nuq+91F5on7wuLWcpVt1U8XWjRI="; + hash = "sha256-M1p8rwdNEsKvZ1ssxsFyfiIBS8tKrXhuz85CKM4dSRw="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-NL5vsuSNKduRW2TaXWFA0pjszVa8EYU5cRaTZHCooLU="; + cargoHash = "sha256-Ie6xq21JoJ37j/BjdVrsiJ3JULVEV5ZwN3hf9NhfXVA="; postPatch = let From e408ece5b3636cdca413be82c717a343b08563d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 14:27:42 +0000 Subject: [PATCH 1234/2279] dart-sass: 1.93.2 -> 1.93.3 --- pkgs/by-name/da/dart-sass/package.nix | 4 +-- pkgs/by-name/da/dart-sass/pubspec.lock.json | 38 ++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index c925ed3be313..5f1408dd8477 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -23,13 +23,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.93.2"; + version = "1.93.3"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-YE4s0um3WR6N0KsXgLjvoiqjr8dQg8WOyZRbfoZlbqE="; + hash = "sha256-I51wpm2HmeuXk0F9O1uTvFA5Hk8sAs+JsumW+N3EPXA="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index 30e98a706e5a..c880ab758599 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", + "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", "url": "https://pub.dev" }, "source": "hosted", - "version": "85.0.0" + "version": "91.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d", + "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.7.1" + "version": "8.4.1" }, "archive": { "dependency": "direct dev", @@ -154,11 +154,11 @@ "dependency": "direct dev", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "csslib": { "dependency": "transitive", @@ -184,21 +184,21 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", + "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "dartdoc": { "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be", + "sha256": "73335ae67d2766ff753dc78b0f33ceb399ba5b94a5cfe8ce8d4128fb631717ee", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.4" + "version": "9.0.0" }, "ffi": { "dependency": "transitive", @@ -434,11 +434,11 @@ "dependency": "transitive", "description": { "name": "oauth2", - "sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4", + "sha256": "890a032ba1b44fa8dcfeba500e613df0ecbe16aeace13bb0fe1d25eb42cda5b8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.5" }, "package_config": { "dependency": "direct main", @@ -484,21 +484,21 @@ "dependency": "direct main", "description": { "name": "protobuf", - "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e", + "sha256": "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "5.1.0" }, "protoc_plugin": { "dependency": "direct dev", "description": { "name": "protoc_plugin", - "sha256": "5bf4289e0fa9eec4b0ee4e77111fa47fa2e6b54b2a7b9c2e83ec87a971542f01", + "sha256": "c3893590d5b81345dfd4daa25c1890092667983fd4374bb6671b2a9a481d8359", "url": "https://pub.dev" }, "source": "hosted", - "version": "22.5.0" + "version": "23.0.0" }, "pub_api_client": { "dependency": "direct dev", @@ -744,11 +744,11 @@ "dependency": "direct main", "description": { "name": "watcher", - "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", + "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.1.4" }, "web": { "dependency": "transitive", @@ -812,6 +812,6 @@ } }, "sdks": { - "dart": ">=3.8.0 <4.0.0" + "dart": ">=3.9.0 <4.0.0" } } From e5769557a2440e58e8cf6111273df81b59543ac0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 14:28:00 +0000 Subject: [PATCH 1235/2279] terraform-providers.aliyun_alicloud: 1.261.0 -> 1.262.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 c979937782d0..379bfc68691a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,13 +45,13 @@ "vendorHash": "sha256-2dGMtSLIiBuhZt4XmcBGfkghU4kCsMsiRFWKMbdmSB8=" }, "aliyun_alicloud": { - "hash": "sha256-OTKcssJpAO/8AQ8LuVxZTWM2iVi0W0HriD77jc6u7Fs=", + "hash": "sha256-4dj49kVEPPFfd8N86L5czVOpdCkE4H7OKnIzZY8pMv4=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.261.0", + "rev": "v1.262.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-f+Btkbc6e90W1VgYAMDq2CG4XhpKmJhKm/mv1r9DYpA=" + "vendorHash": "sha256-GvnQrgczdnxpWCq8/vHcpcKeYf8v+GU/edx2CgPA/40=" }, "aminueza_minio": { "hash": "sha256-snQZbGdHTY41aA6iK0PFO5SJ958xnsWPPLGv+H9uV2Y=", From a793425d9c10947653cdfe522e927a94ca764f01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 14:56:27 +0000 Subject: [PATCH 1236/2279] cue: 0.14.2 -> 0.15.0 --- pkgs/by-name/cu/cue/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index ded451de75f0..ee2c8a058abf 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "cue"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; tag = "v${finalAttrs.version}"; - hash = "sha256-RK06DHCR2ugz6WhythvVfb1WUn7QyHPK8vaUNWVAd+Q="; + hash = "sha256-yyvIjaOElEHR75o+DgVOG1EklXaWGdjvv15iMvfbkeA="; }; - vendorHash = "sha256-wVeNMw6AZS1wT+KnaZBGOfBxrKzmfQSXeZWcYiLKMQ4="; + vendorHash = "sha256-ivFw62+pg503EEpRsdGSQrFNah87RTUrRXUSPZMFLG4="; subPackages = [ "cmd/*" ]; From 684545ccdafdcd88c11e3f7c3d0d1b5379f31688 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Nov 2025 15:48:36 +0100 Subject: [PATCH 1237/2279] rocmPackages.meta.release-packagePlatforms: regenerate The list should have been regenerated after adding ROCm support to onnxruntime, but apparently we forgot. This will make hydra build the ROCm-flavored Firefox package. Fixes: #459100 --- .../rocm-modules/6/release-attrPaths.json | 152 +++++++++--------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/6/release-attrPaths.json index 20e3a90e7450..82c540a1e17a 100644 --- a/pkgs/development/rocm-modules/6/release-attrPaths.json +++ b/pkgs/development/rocm-modules/6/release-attrPaths.json @@ -3,25 +3,20 @@ "attrPaths": [ "adaptivecpp", "adios2", + "adoptopenjdk-icedtea-web", "aider-chat-full", "aider-chat-with-help", - "aligator", + "aitrack", "alpaca", "ants", "appcsxcad", "arpack-mpi", "backgroundremover", "beets", - "beets-unstable", - "beetsPackages.beets", - "beetsPackages.beets-stable", - "beetsPackages.beets-unstable", - "bonmin", "btop", "btop-cuda", "c3d", "calibre", - "casadi", "catalyst", "chatd", "cloudcompare", @@ -29,26 +24,32 @@ "costa", "cp2k", "crewai", - "crocoddyl", + "crow-translate", "csxcad", - "dartsim", "dbcsr", + "deface", "dl-poly-classic-mpi", - "docling", - "docling-serve", "dolfinx", "dtcmp", "easyocr", "elastix", "elmerfem", "elpa", + "envision", "exhibit", "exo", - "expliot", "ezminc", "f3d", "ffmpeg_8-full", "fftwMpi", + "firefox", + "firefox-beta", + "firefox-beta-unwrapped", + "firefox-devedition", + "firefox-devedition-unwrapped", + "firefox-mobile", + "firefox-unwrapped", + "firefoxpwa", "freecad", "frigate", "galene-stt", @@ -58,7 +59,6 @@ "gromacsDoubleMpi", "gromacsMpi", "hashcat", - "haskellPackages.casadi-bindings-internal", "haskellPackages.mpi-hs", "haskellPackages.mpi-hs-binary", "haskellPackages.mpi-hs-cereal", @@ -72,10 +72,9 @@ "hpl", "hypre", "hyprpanel", + "ieda", "immich-machine-learning", - "intensity-normalization", "ior", - "ipopt", "itk", "itk_5", "itk_5_2", @@ -87,43 +86,50 @@ "libcircle", "libmbd", "libretranslate", + "librewolf", + "librewolf-unwrapped", "libsupermesh", "libvdwxc", + "livecaptions", "llama-cpp", "llama-cpp-vulkan", "lwgrp", + "maa-assistant-arknights", + "maa-cli", + "magika", "migrate", - "mim-solvers", + "minari", "mirtk", "mlflow-server", "mokuro", + "monado", "mpi", "mpifileutils", "mrtrix", - "mumps", "mumps-mpi", - "ndcurves", "nest-mpi", "netcdf-mpi", "netgen", "neuron-mpi", "newelle", "nwchem", + "obs-studio-plugins.obs-backgroundremoval", "octavePackages.dicom", "octopus", "ollama", + "onnxruntime", "openai-whisper", "openems", "openmpi", + "openseeface", "opensplat", - "openturns", + "opentrack", "otb", "owocr", "p4est", "p4est-dbg", "p4est-sc", "p4est-sc-dbg", - "pagmo2", "paraview", "parmmg", "pcl", @@ -131,18 +137,16 @@ "petsc", "pfft", "pianotrans", - "pinocchio", + "piper-phonemize", "piper-tts", "pitivi", "pnetcdf", "pnfft", "precice", - "proxsuite-nlp", "python3Packages.accelerate", "python3Packages.adios2", - "python3Packages.aerosandbox", "python3Packages.albumentations", - "python3Packages.aligator", + "python3Packages.ale-py", "python3Packages.anndata", "python3Packages.apptools", "python3Packages.apricot-select", @@ -156,13 +160,15 @@ "python3Packages.baselines", "python3Packages.beetcamp", "python3Packages.beets", + "python3Packages.beets-audible", "python3Packages.bitsandbytes", "python3Packages.blackjax", "python3Packages.blosc2", "python3Packages.botorch", + "python3Packages.brax", "python3Packages.captum", - "python3Packages.casadi", "python3Packages.catalyst", + "python3Packages.chromadb", "python3Packages.clean-fid", "python3Packages.cleanvision", "python3Packages.clip", @@ -173,40 +179,31 @@ "python3Packages.compressed-tensors", "python3Packages.conduit-mpi", "python3Packages.crewai", - "python3Packages.crocoddyl", "python3Packages.ctranslate2", "python3Packages.curated-transformers", "python3Packages.cut-cross-entropy", "python3Packages.cvxpy", - "python3Packages.cyipopt", - "python3Packages.dartsim", + "python3Packages.dalle-mini", "python3Packages.dask-mpi", - "python3Packages.dcmstack", "python3Packages.dctorch", "python3Packages.deepdish", + "python3Packages.deepface", "python3Packages.deepsearch-toolkit", "python3Packages.deepwave", - "python3Packages.deid", "python3Packages.depyf", "python3Packages.detectron2", - "python3Packages.dicom-numpy", "python3Packages.dicom2nifti", - "python3Packages.dicomweb-client", "python3Packages.diffusers", - "python3Packages.dipy", - "python3Packages.docling", + "python3Packages.dm-sonnet", "python3Packages.docling-core", "python3Packages.docling-ibm-models", - "python3Packages.docling-jobkit", - "python3Packages.docling-mcp", - "python3Packages.docling-parse", - "python3Packages.docling-serve", "python3Packages.easyocr", + "python3Packages.edward", "python3Packages.effdet", "python3Packages.einops", "python3Packages.encodec", "python3Packages.envisage", - "python3Packages.example-robot-data", + "python3Packages.evosax", "python3Packages.experiment-utilities", "python3Packages.ezyrb", "python3Packages.f3d", @@ -214,6 +211,7 @@ "python3Packages.fairscale", "python3Packages.fast-simplification", "python3Packages.fastai", + "python3Packages.fastembed", "python3Packages.faster-whisper", "python3Packages.fastmri", "python3Packages.fenics-dolfinx", @@ -221,8 +219,8 @@ "python3Packages.finetuning-scheduler", "python3Packages.firedrake", "python3Packages.flammkuchen", + "python3Packages.flax", "python3Packages.flyingsquid", - "python3Packages.fslpy", "python3Packages.funsor", "python3Packages.fvcore", "python3Packages.gdcm", @@ -239,17 +237,15 @@ "python3Packages.graphtage", "python3Packages.gstools", "python3Packages.guidance", + "python3Packages.gymnasium", "python3Packages.h5io", "python3Packages.h5py-mpi", - "python3Packages.heudiconv", - "python3Packages.highdicom", "python3Packages.holistic-trace-analysis", "python3Packages.hyper-connections", "python3Packages.ignite", "python3Packages.imagededup", "python3Packages.imgcat", "python3Packages.insightface", - "python3Packages.intensity-normalization", "python3Packages.invisible-watermark", "python3Packages.iopath", "python3Packages.itk", @@ -257,14 +253,16 @@ "python3Packages.julius", "python3Packages.k-diffusion", "python3Packages.kahip", - "python3Packages.kokoro", + "python3Packages.keras", "python3Packages.kornia", "python3Packages.kornia-rs", "python3Packages.kserve", "python3Packages.lacuscore", "python3Packages.lancedb", + "python3Packages.langchain-chroma", "python3Packages.langchain-huggingface", "python3Packages.layoutparser", + "python3Packages.lerobot", "python3Packages.libretranslate", "python3Packages.librosa", "python3Packages.libsupermesh", @@ -291,7 +289,6 @@ "python3Packages.llama-index-multi-modal-llms-openai", "python3Packages.llama-index-node-parser-docling", "python3Packages.llama-index-readers-database", - "python3Packages.llama-index-readers-docling", "python3Packages.llama-index-readers-file", "python3Packages.llama-index-readers-json", "python3Packages.llama-index-readers-llama-parse", @@ -309,6 +306,7 @@ "python3Packages.llm-sentence-transformers", "python3Packages.lm-eval", "python3Packages.local-attention", + "python3Packages.magika", "python3Packages.manga-ocr", "python3Packages.manifest-ml", "python3Packages.markitdown", @@ -318,7 +316,9 @@ "python3Packages.medvol", "python3Packages.meep", "python3Packages.meshtastic", + "python3Packages.mhcflurry", "python3Packages.mim-solvers", + "python3Packages.minari", "python3Packages.mlcroissant", "python3Packages.mlflow", "python3Packages.mmcv", @@ -329,25 +329,18 @@ "python3Packages.monty", "python3Packages.mpi-pytest", "python3Packages.mpi4py", + "python3Packages.mtcnn", "python3Packages.napari-nifti", - "python3Packages.ndcurves", "python3Packages.nest", "python3Packages.netgen-mesher", - "python3Packages.neuralfoil", "python3Packages.neuronpy", "python3Packages.nianet", - "python3Packages.nibabel", "python3Packages.nifty8", - "python3Packages.nilearn", - "python3Packages.nipy", - "python3Packages.nipype", - "python3Packages.nitime", - "python3Packages.nitransforms", - "python3Packages.niworkflows", "python3Packages.noisereduce", + "python3Packages.onnxruntime", "python3Packages.open-clip-torch", "python3Packages.openai-whisper", - "python3Packages.openturns", + "python3Packages.opencv4Full", "python3Packages.optimum", "python3Packages.optuna", "python3Packages.optuna-dashboard", @@ -363,33 +356,27 @@ "python3Packages.peft", "python3Packages.pepit", "python3Packages.petsc4py", + "python3Packages.petsctools", + "python3Packages.pettingzoo", "python3Packages.pgmpy", "python3Packages.piano-transcription-inference", - "python3Packages.pinocchio", + "python3Packages.piper-phonemize", "python3Packages.pomegranate", - "python3Packages.proxsuite-nlp", "python3Packages.pyannote-audio", "python3Packages.pyannote-pipeline", - "python3Packages.pybids", - "python3Packages.pydicom", "python3Packages.pydmd", - "python3Packages.pygmo", "python3Packages.pykrige", "python3Packages.pylance", - "python3Packages.pylibjpeg", - "python3Packages.pylibjpeg-openjpeg", - "python3Packages.pylibjpeg-rle", "python3Packages.pymanopt", "python3Packages.pymatgen", "python3Packages.pymedio", - "python3Packages.pynetdicom", - "python3Packages.pyorthanc", "python3Packages.pyotb", "python3Packages.pypasser", "python3Packages.pyprecice", "python3Packages.pyradiomics", "python3Packages.pyro-ppl", "python3Packages.pyseries", + "python3Packages.pysilero-vad", "python3Packages.python-csxcad", "python3Packages.python-openems", "python3Packages.pytorch-bench", @@ -404,9 +391,13 @@ "python3Packages.pyvista", "python3Packages.qpsolvers", "python3Packages.qutip", + "python3Packages.rapidocr", + "python3Packages.rapidocr-onnxruntime", + "python3Packages.rembg", "python3Packages.rerun-sdk", "python3Packages.resampy", "python3Packages.resize-right", + "python3Packages.retinaface", "python3Packages.rlcard", "python3Packages.roma", "python3Packages.rotary-embedding-torch", @@ -418,9 +409,11 @@ "python3Packages.sentence-transformers", "python3Packages.sfepy", "python3Packages.shap", + "python3Packages.shimmy", "python3Packages.simpleitk", "python3Packages.sirius", "python3Packages.skorch", + "python3Packages.skrl", "python3Packages.slepc4py", "python3Packages.slicer", "python3Packages.smolagents", @@ -432,7 +425,7 @@ "python3Packages.spacy-transformers", "python3Packages.speechbrain", "python3Packages.speechrecognition", - "python3Packages.spyder-kernels", + "python3Packages.stable-baselines3", "python3Packages.stanza", "python3Packages.staticvectors", "python3Packages.stytra", @@ -440,13 +433,14 @@ "python3Packages.syne-tune", "python3Packages.tables", "python3Packages.tami4edgeapi", - "python3Packages.templateflow", "python3Packages.tensorboardx", "python3Packages.tensordict", "python3Packages.tensorflow-datasets", "python3Packages.test-tube", "python3Packages.textacy", "python3Packages.textnets", + "python3Packages.tf2onnx", + "python3Packages.tianshou", "python3Packages.timm", "python3Packages.tinygrad", "python3Packages.torch", @@ -460,14 +454,15 @@ "python3Packages.torchao", "python3Packages.torchaudio", "python3Packages.torchbench", + "python3Packages.torchcodec", "python3Packages.torchcrepe", "python3Packages.torchdiffeq", - "python3Packages.torcheval", "python3Packages.torchinfo", "python3Packages.torchio", "python3Packages.torchlibrosa", "python3Packages.torchmetrics", "python3Packages.torchprofile", + "python3Packages.torchrl", "python3Packages.torchsde", "python3Packages.torchsnapshot", "python3Packages.torchsummary", @@ -479,40 +474,41 @@ "python3Packages.translatehtml", "python3Packages.treescope", "python3Packages.trl", - "python3Packages.trx-python", - "python3Packages.tsid", "python3Packages.ttach", "python3Packages.txtai", + "python3Packages.tyro", "python3Packages.ultralytics", "python3Packages.ultralytics-thop", + "python3Packages.unsloth", + "python3Packages.unsloth-zoo", "python3Packages.unstructured-inference", "python3Packages.vllm", "python3Packages.vtk", "python3Packages.wandb", + "python3Packages.waymax", "python3Packages.webdataset", "python3Packages.whisperx", "python3Packages.x-transformers", "python3Packages.xarray-einstats", "python3Packages.xformers", "python3Packages.xgrammar", - "python3Packages.xnatpy", "qcsxcad", "quantum-espresso", "ramalama", + "rapidraw", "raxml-mpi", "rclip", "rembg", "rlama", "rtabmap", "scalapack", - "scipopt-gcg", - "scipopt-scip", "scipopt-ug", - "scotch", + "seagoat", "siesta", "siesta-mpi", "simpleitk", "sirius", + "sitespeed-io", "slepc", "spfft", "spla", @@ -528,10 +524,15 @@ "tests.testers.hasCmakeConfigModules.boost-has-boost_mpi", "tests.testers.hasCmakeConfigModules.boost_mpi-does-not-have-mpi", "therion", + "thunderbird", + "thunderbird-latest", + "thunderbird-latest-unwrapped", + "thunderbird-unwrapped", + "thunderbirdPackages.thunderbird", + "thunderbirdPackages.thunderbird-latest", "tmpi", "tocpdf", "trilinos-mpi", - "tsid", "tt-metal", "tts", "ucc", @@ -553,6 +554,7 @@ "whisperx", "wifite2", "witnessme", + "wivrn", "wyoming-faster-whisper", "wyoming-piper", "xyce-parallel" From 27cd4f14aca556a05f136afbe586b3417620bd7f Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 6 Nov 2025 15:07:08 +0000 Subject: [PATCH 1238/2279] =?UTF-8?q?nexusmods-app:=200.19.4=20=E2=86=92?= =?UTF-8?q?=200.20.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.20.2 --- pkgs/by-name/ne/nexusmods-app/package.nix | 18 +-------- .../ne/nexusmods-app/vendored/games.json | 40 +++++++++---------- 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 5b993929fc93..5041b96063fa 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -5,7 +5,6 @@ desktop-file-utils, dotnetCorePackages, fetchFromGitHub, - fetchpatch2, imagemagick, lib, xdg-utils, @@ -23,13 +22,13 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.19.4"; + version = "0.20.2"; src = fetchFromGitHub { owner = "Nexus-Mods"; repo = "NexusMods.App"; tag = "v${finalAttrs.version}"; - hash = "sha256-WKfv5y6UmO3dmzkXrqZ+VtIbXf0FszRdsa5Rmp95rYg="; + hash = "sha256-hpsrHHh0Bk+9Z4Qp5aTqH5i8KnqCLQdseYGrbr4sh1k="; fetchSubmodules = true; }; @@ -57,14 +56,6 @@ buildDotnetModule (finalAttrs: { dotnet-sdk = dotnetCorePackages.sdk_9_0; dotnet-runtime = dotnetCorePackages.runtime_9_0; - patches = [ - (fetchpatch2 { - name = "Fix-SMAPI-installation.patch"; - url = "https://github.com/Nexus-Mods/NexusMods.App/pull/4026.patch?full_index=1"; - hash = "sha256-1LgFTi63fVhGUZXZtS6iD2yqd0RxhdpiXKtWMFNEoD4="; - }) - ]; - postPatch = '' # Specify a fixed date to improve build reproducibility echo "1970-01-01T00:00:00Z" >buildDate.txt @@ -82,11 +73,6 @@ buildDotnetModule (finalAttrs: { ${lib.optionalString finalAttrs.doCheck '' # For some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png - - # Fix expected version number in text fixture - # https://github.com/Nexus-Mods/NexusMods.App/issues/4030 - substituteInPlace tests/NexusMods.Backend.Tests/EventTrackerTests.Test_PrepareRequest.verified.txt \ - --replace-fail 0.0.1 ${finalAttrs.version} ''} ''; diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json index 478145604579..00e9d035c0dd 100644 --- a/pkgs/by-name/ne/nexusmods-app/vendored/games.json +++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json @@ -6,12 +6,12 @@ "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/", "nexusmods_url": "https://www.nexusmods.com/stardewvalley", "genre": "Simulation", - "file_count": 143212, - "downloads": 627187655, + "file_count": 144372, + "downloads": 635510946, "domain_name": "stardewvalley", "approved_date": 1457432329, - "mods": 25945, - "collections": 2020 + "mods": 26187, + "collections": 1990 }, { "id": 1704, @@ -20,12 +20,12 @@ "forum_url": "https://forums.nexusmods.com/games/6-skyrim/", "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition", "genre": "RPG", - "file_count": 661698, - "downloads": 9193533035, + "file_count": 667120, + "downloads": 9346275237, "domain_name": "skyrimspecialedition", "approved_date": 1477480498, - "mods": 118807, - "collections": 4852 + "mods": 119859, + "collections": 4876 }, { "id": 3174, @@ -34,12 +34,12 @@ "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/", "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord", "genre": "Strategy", - "file_count": 50603, - "downloads": 116400189, + "file_count": 50960, + "downloads": 117558949, "domain_name": "mountandblade2bannerlord", "approved_date": 1582898627, - "mods": 6341, - "collections": 293 + "mods": 6397, + "collections": 294 }, { "id": 3333, @@ -48,12 +48,12 @@ "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/", "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077", "genre": "Action", - "file_count": 125224, - "downloads": 930909718, + "file_count": 126752, + "downloads": 958960285, "domain_name": "cyberpunk2077", "approved_date": 1607433331, - "mods": 18032, - "collections": 1588 + "mods": 18283, + "collections": 1597 }, { "id": 3474, @@ -62,11 +62,11 @@ "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/", "nexusmods_url": "https://www.nexusmods.com/baldursgate3", "genre": "RPG", - "file_count": 105632, - "downloads": 351591575, + "file_count": 106755, + "downloads": 359737700, "domain_name": "baldursgate3", "approved_date": 1602863114, - "mods": 15020, - "collections": 1752 + "mods": 15196, + "collections": 1740 } ] From 9f5cc0bdcdfb665e814e2b40d77991de2de34e71 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Thu, 6 Nov 2025 15:56:00 +0100 Subject: [PATCH 1239/2279] fex: 2510 -> 2511 --- pkgs/by-name/fe/fex/package.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 25858a8a4a05..62da7dd5f4b8 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -26,7 +26,6 @@ xorg, withQt ? true, qt6, - fetchpatch, }: let @@ -96,13 +95,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2510"; + version = "2511"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA="; + hash = "sha256-CulENHssPkCXI+oyVKwf3GN5bjxUok2+AHsoOQ+Mchc="; leaveDotGit = true; postFetch = '' @@ -128,16 +127,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ''; }; - patches = [ - # Backported fix of unit test build with LLVM 21. - # TODO: drop after next release - (fetchpatch { - name = "unittests-thunklibs-fix-build-with-llvm-21.patch"; - url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch"; - hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE="; - }) - ]; - postPatch = '' substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \ --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \ From 51acc56dcb07fa099efc7f8ec921e4e2c67f3732 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 16:07:31 +0100 Subject: [PATCH 1240/2279] ci/github-script/merge: ignore PRs with >= 100 files We use the files endpoint to get a list of all *names* of files touched in the PR - but this endpoint will also actually download the files / their diff, too. That's pointless and actually takes quite some time for huge treewides. We're just putting in a stop-gap for now, so that we're not burning more than 1 API requests on this and don't spend so much time on it either. A limit of 99 files will be more than enough for quite some time - we will only need to raise this when we're able to represent package sets in by-name properly and have "package set maintainers", who are not committers. --- ci/github-script/merge.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js index 688a7928fe97..674d8153a7e9 100644 --- a/ci/github-script/merge.js +++ b/ci/github-script/merge.js @@ -128,11 +128,20 @@ async function handleMerge({ (await getTeamMembers('nixpkgs-committers')).map(({ id }) => id), ) - const files = await github.paginate(github.rest.pulls.listFiles, { - ...context.repo, - pull_number, - per_page: 100, - }) + const files = ( + await github.rest.pulls.listFiles({ + ...context.repo, + pull_number, + per_page: 100, + }) + ).data + + // Early exit to prevent treewides from using up a lot of API requests (and time!) to list + // all the files in the pull request. For now, the merge-bot will not work when 100 or more + // files are touched in a PR - which should be more than fine. + // TODO: Find a more efficient way of downloading all the *names* of the touched files, + // including an early exit when the first non-by-name file is found. + if (files.length >= 100) return false // Only look through comments *after* the latest (force) push. const lastPush = events.findLastIndex( From 9efe926863c5d4e087057fe610ef9eb73fa942a7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 16:11:01 +0100 Subject: [PATCH 1241/2279] ci/github-script/reviewers: exit early for treewides When hitting a treewide, we would previously find the username for each user and then check all of them for collaborator status - only to then realize that this results in more than 15 reviewers and exit. We can put a simple stop-gap in, even before de-duplicating the combined lists of maintainers and owners as safe guard. We could still hit huge numbers of code owners, but in practice we don't nearly as many as maintainers, so this will be sufficient for now. --- ci/github-script/reviewers.js | 46 ++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js index c5f79c11d992..eefa87e36d65 100644 --- a/ci/github-script/reviewers.js +++ b/ci/github-script/reviewers.js @@ -13,6 +13,34 @@ async function handleReviewers({ }) { const pull_number = pull_request.number + const requested_reviewers = new Set( + pull_request.requested_reviewers.map(({ login }) => login), + ) + log( + 'reviewers - requested_reviewers', + Array.from(requested_reviewers).join(', '), + ) + + const existing_reviewers = new Set( + reviews.map(({ user }) => user?.login).filter(Boolean), + ) + log( + 'reviewers - existing_reviewers', + Array.from(existing_reviewers).join(', '), + ) + + // Early sanity check, before we start making any API requests. The list of maintainers + // does not have duplicates so the only user to filter out from this list would be the + // PR author. Therefore, we check for a limit of 15+1, where 15 is the limit we check + // further down again. + // This is to protect against huge treewides consuming all our API requests for no + // reason. + if (maintainers.length > 16) { + core.warning('Too many potential reviewers, skipping review requests.') + // Return a boolean on whether the "needs: reviewers" label should be set. + return existing_reviewers.size === 0 && requested_reviewers.size === 0 + } + const users = new Set([ ...(await Promise.all( maintainers.map(async (id) => (await getUser(id)).login), @@ -64,24 +92,8 @@ async function handleReviewers({ ).filter(Boolean) log('reviewers - reviewers', reviewers.join(', ')) - const requested_reviewers = new Set( - pull_request.requested_reviewers.map(({ login }) => login), - ) - log( - 'reviewers - requested_reviewers', - Array.from(requested_reviewers).join(', '), - ) - - const existing_reviewers = new Set( - reviews.map(({ user }) => user?.login).filter(Boolean), - ) - log( - 'reviewers - existing_reviewers', - Array.from(existing_reviewers).join(', '), - ) - if (reviewers.length > 15) { - log( + core.warning( `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`, ) // Return a boolean on whether the "needs: reviewers" label should be set. From 17199e5ff6d970c47338c22b07e5e39e305f2a8b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 16:11:36 +0100 Subject: [PATCH 1242/2279] ci/github-script/reviewers: add TODO about future optimization We still use a few too many API requests by checking team members for collaborator status - we can improve on that in the future. --- ci/github-script/reviewers.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js index eefa87e36d65..07a77a5fec0d 100644 --- a/ci/github-script/reviewers.js +++ b/ci/github-script/reviewers.js @@ -75,6 +75,9 @@ async function handleReviewers({ const reviewers = ( await Promise.all( Array.from(new_reviewers, async (username) => { + // TODO: Restructure this file to only do the collaborator check for those users + // who were not already part of a team. Being a member of a team makes them + // collaborators by definition. try { await github.rest.repos.checkCollaborator({ ...context.repo, From cd7f83638e0e96f667ce904a3f0363967f654cef Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 16:16:30 +0100 Subject: [PATCH 1243/2279] ci/github-script/bot: limit concurrency in PR runs This lead to reaching secondary API limits in a treewide recently, so we better limit it to where we actually need it. --- ci/github-script/bot.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index c66a91583140..34abe96941fb 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -576,7 +576,10 @@ module.exports = async ({ github, context, core, dry }) => { // Controls level of parallelism. Applies to both the number of concurrent requests // as well as the number of concurrent workers going through the list of PRs. - const maxConcurrent = 20 + // We'll only boost concurrency when we're running many PRs in parallel on a schedule, + // but not for single PRs. This avoids things going wild, when we accidentally make + // too many API requests on treewides. + const maxConcurrent = context.eventName === 'pull_request' ? 1 : 20 await withRateLimit({ github, core, maxConcurrent }, async (stats) => { if (context.payload.pull_request) { From f8a2ee2c1f1aa98ac5d58f35a89612c1ae562ba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 15:26:25 +0000 Subject: [PATCH 1244/2279] everest: 5935 -> 5961 --- pkgs/by-name/ev/everest-bin/package.nix | 6 +++--- pkgs/by-name/ev/everest/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 2f0076b4dfd2..048f564c3507 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "5935"; + version = "5961"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5935.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5961.0/main.zip"; extension = "zip"; - hash = "sha256-XYvXrfHSjSShAg3r2qikt1CPXldYvsU1EvRJNzJoGTU="; + hash = "sha256-zFGBzRbFJOnJ4d8396SoLEgnicDwEqvSbOZKqWSyR+w="; }; buildInputs = [ icu diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index a6f7bcf3f285..18e42f537766 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,7 +11,7 @@ let pname = "everest"; - version = "5935"; + version = "5961"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -20,11 +20,11 @@ buildDotnetModule { src = fetchFromGitHub { owner = "EverestAPI"; repo = "Everest"; - rev = "6a6da718227b357f5b997499e454d5dc5c3e2788"; + rev = "7972286159c1f4d1f219c1101273067d45cd1161"; fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-qSDcwqjJeb2pNbyriZ/9Gk72DyR5KdIoncXol7JZvFg="; + hash = "sha256-GkWeOfatzw9uLWkzNzjSEM8p+HWuJPbycv/0YNxTdqk="; }; nativeBuildInputs = [ autoPatchelfHook ]; From 7f6ce9097f3a37052c60493ec6746f1a8a3eebbe Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 6 Nov 2025 23:35:08 +0800 Subject: [PATCH 1245/2279] lib.extendMkDerivation: fix argument documentation layout --- lib/customisation.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 55117f8289d0..0422ea05b576 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -763,11 +763,21 @@ rec { # Inputs `extendMkDerivation`-specific configurations - : `constructDrv` (required): Base build helper, the `mkDerivation`-like build helper to extend. - : `excludeDrvArgNames` (default to `[ ]`): Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`. - : `extendDrvArgs` (required): An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`. - : `inheritFunctionArgs` (default to `true`): Whether to inherit `__functionArgs` from the base build helper. - : `transformDrv` (default to `lib.id`): Function to apply to the result derivation. + : `constructDrv` (required) + : Base build helper, the `mkDerivation`-like build helper to extend. + + `excludeDrvArgNames` (default to `[ ]`) + : Argument names not to pass from the input fixed-point arguments to `constructDrv`. + It doesn't apply to the updating arguments returned by `extendDrvArgs`. + + `extendDrvArgs` (required) + : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`. + + `inheritFunctionArgs` (default to `true`) + : Whether to inherit `__functionArgs` from the base build helper. + + `transformDrv` (default to `lib.id`) + : Function to apply to the result derivation. # Type From d75b2035146827347f53918004d95fcba65be7a0 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 6 Nov 2025 19:37:08 +0800 Subject: [PATCH 1246/2279] lib.extendMkDerivation: document the typical usage of inheritFunctionArgs --- lib/customisation.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/customisation.nix b/lib/customisation.nix index 0422ea05b576..77875d91d38f 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -775,6 +775,7 @@ rec { `inheritFunctionArgs` (default to `true`) : Whether to inherit `__functionArgs` from the base build helper. + Set `inheritFunctionArgs` to `false` when `extendDrvArgs`'s `args` set pattern does not contain an ellipsis. `transformDrv` (default to `lib.id`) : Function to apply to the result derivation. From d24ec930d54374f9b34c0de5c06e19c48c142d85 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 6 Nov 2025 17:37:32 +0200 Subject: [PATCH 1247/2279] nixos/boot.tmp: fix description rendering --- nixos/modules/system/boot/tmp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index f927ba1c9c90..c8286979ff41 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -41,10 +41,10 @@ in default = "never"; example = "within_size"; description = '' - never - Do not allocate huge memory pages. This is the default. - always - Attempt to allocate huge memory page every time a new page is needed. - within_size - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended. - advise - Only allocate huge memory pages if requested with madvise(2). + - `never` - Do not allocate huge memory pages. This is the default. + - `always` - Attempt to allocate huge memory page every time a new page is needed. + - `within_size` - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended. + - `advise` - Only allocate huge memory pages if requested with madvise(2). ''; }; From 3026703280158319205fad19b9d69a4e1c693780 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 6 Nov 2025 19:31:37 +0800 Subject: [PATCH 1248/2279] lib.extendMkDerivation: add argument excludeFunctionArgNames --- lib/customisation.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index 77875d91d38f..6159ce8ea27a 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -770,6 +770,10 @@ rec { : Argument names not to pass from the input fixed-point arguments to `constructDrv`. It doesn't apply to the updating arguments returned by `extendDrvArgs`. + `excludeFunctionArgNames` (default to `[ ]`) + : `__functionArgs` attribute names to remove from the result build helper. + `excludeFunctionArgNames` is useful for argument deprecation while avoiding ellipses. + `extendDrvArgs` (required) : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`. @@ -787,6 +791,7 @@ rec { { constructDrv :: ((FixedPointArgs | AttrSet) -> a) excludeDrvArgNames :: [ String ], + excludeFunctionArgNames :: [ String ] extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet) inheritFunctionArgs :: Bool, transformDrv :: a -> a, @@ -847,6 +852,7 @@ rec { { constructDrv, excludeDrvArgNames ? [ ], + excludeFunctionArgNames ? [ ], extendDrvArgs, inheritFunctionArgs ? true, transformDrv ? id, @@ -861,10 +867,12 @@ rec { ) # Add __functionArgs ( - # Inherit the __functionArgs from the base build helper - optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames) - # Recover the __functionArgs from the derived build helper - // functionArgs (extendDrvArgs { }) + removeAttrs ( + # Inherit the __functionArgs from the base build helper + optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames) + # Recover the __functionArgs from the derived build helper + // functionArgs (extendDrvArgs { }) + ) excludeFunctionArgNames ) // { inherit From 95756ab0f6ade456223162263d9e7ff0fcc03fd6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 6 Nov 2025 23:50:31 +0800 Subject: [PATCH 1249/2279] xfce.xfce4-screenshooter: 1.11.2 -> 1.11.3 https://gitlab.xfce.org/apps/xfce4-screenshooter/-/compare/xfce4-screenshooter-1.11.2...xfce4-screenshooter-1.11.3 Imgur custom action has been dropped in 1.11.2. --- .../xfce4-screenshooter/default.nix | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index ac6d913e2590..9d1264a8ed1e 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -11,6 +11,7 @@ wrapGAppsHook3, exo, gtk3, + gtk-layer-shell, libX11, libXext, libXfixes, @@ -21,23 +22,19 @@ wlr-protocols, xfce4-panel, xfconf, - curl, - zenity, - jq, - xclip, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "xfce4-screenshooter"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitLab { domain = "gitlab.xfce.org"; owner = "apps"; repo = "xfce4-screenshooter"; tag = "xfce4-screenshooter-${finalAttrs.version}"; - hash = "sha256-LELPY3SU25e3Dk9/OljWMLIbZYrDiQD1h6dMq+jRaH8="; + hash = "sha256-VN9j5Ieg3MZwhS4mE4LMRbQ5AM9F8O2n5lx/V0Qk0Po="; }; strictDeps = true; @@ -59,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ exo gtk3 + gtk-layer-shell libX11 libXext libXfixes @@ -71,21 +69,6 @@ stdenv.mkDerivation (finalAttrs: { xfconf ]; - preFixup = '' - # For Imgur upload action - # https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51 - gappsWrapperArgs+=( - --prefix PATH : ${ - lib.makeBinPath [ - curl - zenity - jq - xclip - ] - } - ) - ''; - passthru.updateScript = gitUpdater { rev-prefix = "xfce4-screenshooter-"; }; meta = { From 70285b8aaa8d307d835beb7ba12f91fa22949118 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 6 Nov 2025 16:51:32 +0100 Subject: [PATCH 1250/2279] python3Packages.chipwhisperer: minor cleanup --- pkgs/development/python-modules/chipwhisperer/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/chipwhisperer/default.nix b/pkgs/development/python-modules/chipwhisperer/default.nix index 1cc7fc8657bb..dcc446611b45 100644 --- a/pkgs/development/python-modules/chipwhisperer/default.nix +++ b/pkgs/development/python-modules/chipwhisperer/default.nix @@ -43,8 +43,6 @@ buildPythonPackage rec { hash = "sha256-C7QP044QEP7vmz1lMseLtMTYoKn5SoFV/q9URY7yQ6I="; }; - # Build - pyproject = true; build-system = [ @@ -70,8 +68,6 @@ buildPythonPackage rec { tqdm ]; - # Install - nativeInstallCheckInputs = [ udevCheckHook ]; @@ -90,8 +86,6 @@ buildPythonPackage rec { EOF ''; - # Check - pythonImportsCheck = [ "chipwhisperer" ]; nativeCheckInputs = [ From 02fa5ac8fee5565ccc0950e42953d38b1069550b Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 6 Nov 2025 17:06:19 +0100 Subject: [PATCH 1251/2279] termsvg: update meta capitalize user name in repo owner and meta.homepage --- pkgs/by-name/te/termsvg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix index 7a14d7112c58..be9e5a4ea63e 100644 --- a/pkgs/by-name/te/termsvg/package.nix +++ b/pkgs/by-name/te/termsvg/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { version = "0.10.0"; src = fetchFromGitHub { - owner = "mrmarble"; + owner = "MrMarble"; repo = "termsvg"; rev = "v${version}"; hash = "sha256-tNvr8ptMortP7iI6GwT4AGbqTvNFposca8I2JribGnk="; @@ -27,7 +27,7 @@ buildGoModule rec { meta = with lib; { description = "Record, share and export your terminal as a animated SVG image"; - homepage = "https://github.com/mrmarble/termsvg"; + homepage = "https://github.com/MrMarble/termsvg"; license = licenses.gpl3Only; maintainers = with maintainers; [ pbsds ]; mainProgram = "termsvg"; From 275feea9d152623e24960179838eba1b46fba2de Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 6 Nov 2025 17:12:35 +0100 Subject: [PATCH 1252/2279] vencord: 1.13.4 -> 1.13.5 --- pkgs/by-name/ve/vencord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 5379ce534490..b56682f189a4 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; tag = "v${finalAttrs.version}"; - hash = "sha256-NZuZ3WRHsM94PaGfikwB0Y7RRRPe+64FAfx80kRrQ1U="; + hash = "sha256-btbGURE3szy7qiC9W3N3+RdfnH+EUJv78m9tDZYeA1M="; }; patches = [ ./fix-deps.patch ]; From d72ac2eb4b57e7afd38a893dc208c128093666a3 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Wed, 5 Nov 2025 22:38:03 -0700 Subject: [PATCH 1253/2279] zbar: patch out segfault from overoptimization on darwin --- ...egfault-optimized-pointer-assignment.patch | 47 +++++++++++++++++++ pkgs/tools/graphics/zbar/default.nix | 5 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch diff --git a/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch b/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch new file mode 100644 index 000000000000..ebf38552cbde --- /dev/null +++ b/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch @@ -0,0 +1,47 @@ +From 3fa414aa82375648635281924904557cbe4d2d83 Mon Sep 17 00:00:00 2001 +From: sasdf +Date: Fri, 18 Oct 2024 00:22:36 +0800 +Subject: [PATCH] Fix pointer wrap around undefined behavior + +--- + zbar/img_scanner.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c +index d1bf8a3c..58436f16 100644 +--- a/zbar/img_scanner.c ++++ b/zbar/img_scanner.c +@@ -33,6 +33,7 @@ + #endif + + #include ++#include + #include /* malloc, free */ + #include /* memcmp, memset, memcpy */ + +@@ -50,7 +51,7 @@ + #include "svg.h" + + #if 1 +-#define ASSERT_POS assert(p == data + x + y * (intptr_t)w) ++#define ASSERT_POS assert(p == data + x + y * (ptrdiff_t)w) + #else + #define ASSERT_POS + #endif +@@ -858,11 +859,11 @@ static void zbar_send_code_via_dbus(zbar_image_scanner_t *iscn, + } + #endif + +-#define movedelta(dx, dy) \ +- do { \ +- x += (dx); \ +- y += (dy); \ +- p += (dx) + ((uintptr_t)(dy)*w); \ ++#define movedelta(dx, dy) \ ++ do { \ ++ x += (dx); \ ++ y += (dy); \ ++ p += (dx) + ((dy)*(ptrdiff_t)(w)); \ + } while (0); + + static void *_zbar_scan_image(zbar_image_scanner_t *iscn, zbar_image_t *img) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 8d77795366a2..58b64c4fd1a1 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -62,6 +62,11 @@ stdenv.mkDerivation rec { url = "https://github.com/mchehab/zbar/commit/a549566ea11eb03622bd4458a1728ffe3f589163.patch"; hash = "sha256-NY3bAElwNvGP9IR6JxUf62vbjx3hONrqu9pMSqaZcLY="; }) + # PR from fork not yet merged into upstream + # See PR: https://github.com/mchehab/zbar/pull/299 + # Remove this patch if the PR is merged or if the issue is solved another way. + # See https://github.com/NixOS/nixpkgs/issues/456461 for discussion of the root issue + ./darwin-segfault-optimized-pointer-assignment.patch ]; nativeBuildInputs = [ From 04a35bc5efea0e39ad732692ed9c5e93bdfaaa8b Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 7 Nov 2025 00:04:41 +0800 Subject: [PATCH 1254/2279] python313Packages.nonestorage: init at 0.1.0 --- .../python-modules/nonestorage/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/nonestorage/default.nix diff --git a/pkgs/development/python-modules/nonestorage/default.nix b/pkgs/development/python-modules/nonestorage/default.nix new file mode 100644 index 000000000000..3919754935d6 --- /dev/null +++ b/pkgs/development/python-modules/nonestorage/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, +}: + +buildPythonPackage rec { + pname = "nonestorage"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nonebot"; + repo = "nonestorage"; + tag = "v${version}"; + hash = "sha256-Y8Ywpp5/FRT8jIhSaMtuzMXs3UJROh5SrFdIZD7ysBA="; + }; + + build-system = [ hatchling ]; + + pythonImportsCheck = [ "nonestorage" ]; + + # no test + doCheck = false; + + meta = { + description = "Simple library that provides local storage folder detect"; + homepage = "https://github.com/nonebot/nonestorage"; + changelog = "https://github.com/nonebot/nonestorage/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4334ca2a112..0128da654ac5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10682,6 +10682,8 @@ self: super: with self; { noneprompt = callPackage ../development/python-modules/noneprompt { }; + nonestorage = callPackage ../development/python-modules/nonestorage { }; + norfair = callPackage ../development/python-modules/norfair { }; normality = callPackage ../development/python-modules/normality { }; From e25564b7227b9d8eb8ad964587a918110988ec1b Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 30 Oct 2025 09:23:24 +0000 Subject: [PATCH 1255/2279] nb-cli: 1.4.2 -> 1.5.0 --- pkgs/by-name/nb/nb-cli/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix index 74d724b86842..b141d364fc70 100644 --- a/pkgs/by-name/nb/nb-cli/package.nix +++ b/pkgs/by-name/nb/nb-cli/package.nix @@ -8,17 +8,18 @@ python3.pkgs.buildPythonApplication rec { pname = "nb-cli"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; src = fetchPypi { pname = "nb_cli"; inherit version; - hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8="; + hash = "sha256-vZxBjavim4xNp24s7hNsoZK7xoeRJST7NvSRbRTYSz8="; }; pythonRelaxDeps = [ "watchfiles" + "noneprompt" ]; build-system = [ @@ -35,8 +36,10 @@ python3.pkgs.buildPythonApplication rec { importlib-metadata jinja2 noneprompt + nonestorage pydantic pyfiglet + textual tomlkit typing-extensions virtualenv From 1b6d87582cbb27da62982fcc3b7d41cd441a651b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Nov 2025 17:14:20 +0100 Subject: [PATCH 1256/2279] python313Packages.iamdata: 0.1.202511051 -> 0.1.202511061 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202511051...v0.1.202511061 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511061 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 32245d3c6f11..b553f1be0878 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511051"; + version = "0.1.202511061"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-v70VJUU6ggC4N5qiZ6r90p1jg9uaQWJCnRrvkylCDjU="; + hash = "sha256-SEbER6oe5BK/6HpvMh+UD7rvGyPNJ1zxLD9LNis8QJw="; }; __darwinAllowLocalNetworking = true; From 8d378ad407e714d1eb3891200ac0bd56f2e7170e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 16:15:57 +0000 Subject: [PATCH 1257/2279] terraform-providers.poseidon_ct: 0.13.0 -> 0.14.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 c979937782d0..dd310c3b295b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1102,13 +1102,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "poseidon_ct": { - "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", + "hash": "sha256-Y0hBXxd9Ll5DY6hljZlI2QpTM/lWBZomQ47iAHbNuAs=", "homepage": "https://registry.terraform.io/providers/poseidon/ct", "owner": "poseidon", "repo": "terraform-provider-ct", - "rev": "v0.13.0", + "rev": "v0.14.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" + "vendorHash": "sha256-blWCf8O0B7INdZnlhOup6oihFEMY3UTmC1CF+0DJqUU=" }, "poseidon_matchbox": { "hash": "sha256-B1PxdbqXrB1ioB5utI4LI6rkhwHmaAiYkSxRAcjJnAA=", From feb904dec2df5f11bcc9e80a94a26901413fa60b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Nov 2025 17:06:35 +0100 Subject: [PATCH 1258/2279] python313Packages.botocore-stubs: 1.40.65 -> 1.40.66 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 0edeee6056a7..bf1f30fa0f34 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.65"; + version = "1.40.66"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-MfO51dsNHcZknRHBg8thOs8rXTKXnBYIUtSvtVRC7bo="; + hash = "sha256-ilKalmsJ/eGP/p5SaCoDOW96arm6WOX9c4203Gg4Bmo="; }; nativeBuildInputs = [ setuptools ]; From 7ebc446a4a14f324ac8116dd30b8287484f70136 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Nov 2025 17:19:05 +0100 Subject: [PATCH 1259/2279] python313Packages.botocore-stubs: 1.40.66 -> 1.40.67 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index bf1f30fa0f34..24206df5f31c 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.66"; + version = "1.40.67"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ilKalmsJ/eGP/p5SaCoDOW96arm6WOX9c4203Gg4Bmo="; + hash = "sha256-hk+f7UJy1+YrSlHaOxRe30J0AsH5l4YSpETtHo/fncc="; }; nativeBuildInputs = [ setuptools ]; From da9a0d3fbfdd824722e3a8d73d0b9829dee64a4f Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 6 Nov 2025 17:20:21 +0100 Subject: [PATCH 1260/2279] soju: 0.9.0 -> 0.10.0 Changelog: https://codeberg.org/emersion/soju/releases/tag/v0.10.0 --- pkgs/by-name/so/soju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix index 1b5af7fb121d..5b605e01541b 100644 --- a/pkgs/by-name/so/soju/package.nix +++ b/pkgs/by-name/so/soju/package.nix @@ -9,17 +9,17 @@ buildGoModule rec { pname = "soju"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "emersion"; repo = "soju"; rev = "v${version}"; - hash = "sha256-qbSTaE0qOeXVcEmOver8Tu+gwV4cP4gNzIxByLKApCU="; + hash = "sha256-1kdaLmgikRbk/B+HGTMKnhqbTho4KmvDTuizhEE3DAw="; }; - vendorHash = "sha256-JhoAtBw4O6lOd27dIXBNvA9EfUH5AD3ZHuGcWgU/Xv0="; + vendorHash = "sha256-NP4njea0hcklxWFoxPQqrvyWExeRP/TOzUJcamRnx+s="; nativeBuildInputs = [ installShellFiles From e69b54bfd0060ad2eda6e96f52c6eeb1e2e0787e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 6 Nov 2025 17:20:51 +0100 Subject: [PATCH 1261/2279] at-spi2-core: patch build on darwin --- pkgs/by-name/at/at-spi2-core/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 2309dd97e286..c9879d33eed5 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -41,6 +42,15 @@ stdenv.mkDerivation rec { hash = "sha256-390zANong6IZaf+t4oiYF/t8GQak75JJfrpllps9q1o="; }; + # TODO apply unconditionally on rebuild + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "timersub.patch"; + url = "https://github.com/GNOME/at-spi2-core/commit/02108ea1b96db0189b2d4a9eceb843e1f13b7bdf.diff"; + hash = "sha256-pVBhawfRnJoXmovl9CAmzh+YWJkbvlOVrCs8XanjP00="; + }) + ]; + nativeBuildInputs = [ glib meson From bbf15c1160665d1d907371963e8c29613cc84d9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Nov 2025 17:20:58 +0100 Subject: [PATCH 1262/2279] python313Packages.tencentcloud-sdk-python: 3.0.1482 -> 3.0.1483 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1482...3.0.1483 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1483/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8e282138421e..e639430287ce 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1482"; + version = "3.0.1483"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-dllmMdjI4osrtdTN5qo2k/KtEKDpF9G1Ul3JkegvMt0="; + hash = "sha256-yidKh50qnikyhBeuMKxiVD4xdqRO2ReJp1SuD266lHM="; }; build-system = [ setuptools ]; From 689e6ac84a06e94ba3d854afd0396c05ce0d5409 Mon Sep 17 00:00:00 2001 From: Maciej Zonski Date: Thu, 6 Nov 2025 17:23:58 +0100 Subject: [PATCH 1263/2279] coolercontrol: 3.0.1 -> 3.0.2 --- .../system/coolercontrol/coolercontrol-ui-data.nix | 2 +- pkgs/applications/system/coolercontrol/coolercontrold.nix | 2 +- pkgs/applications/system/coolercontrol/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index d2af32efee38..5a591c01e114 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -11,7 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-MhMHo6wjkaSCyevwzAKCvSsJTmAq9rYFG1ZVUAkRc0Y="; + npmDepsHash = "sha256-pXK2wyRujUqnRZNIf/bDXpYdfEYHeia/E/jwLkfWwfo="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 50987847a587..1022560eeb1c 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrold"; - cargoHash = "sha256-4aSEEBtxwTyAx5CPa2fDBhx5U+Ql2X/tKPQHLIsm3I0="; + cargoHash = "sha256-teKMz6ruTSwQ76dMXoupS3D7n1ashfHPpxMGo3Qm6FI="; buildInputs = [ libdrm ]; diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index d11e7f40aa6c..12b176cfdd8b 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -5,13 +5,13 @@ }: let - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-PvEj3xYJVpHNfd5p7kyw+eW9S/g1FB/YiFgWEJDDbus="; + hash = "sha256-puWnnNc3T/R+vPp3oyxP2aTHo1rZ5RWyW6KF6wywF1I="; }; meta = { From 9bf1d7c6cf36fb093bd0c445489e389aaa4d6f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 6 Nov 2025 16:25:28 +0000 Subject: [PATCH 1264/2279] bottom: 0.11.2 -> 0.11.3 --- pkgs/by-name/bo/bottom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index db6d3d44fe1a..9afdac3ebfdf 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = "bottom"; tag = version; - hash = "sha256-xX7W137OCMbdOsuFSv7lvKn67jDUKuKmtTSRt5Bb3i0="; + hash = "sha256-7rVvKAqK8hqICnSr/Ax9ndsIZAdTaUyOAoVZ13W5BJs="; }; - cargoHash = "sha256-IG+6UUQhFanWjNprjwlPsFHfzxU+TGeNR82xiy+4bWg="; + cargoHash = "sha256-OXprj84ixm5KFayWsHuxCB3p5Ob/oZgsk3u3lqkOiuk="; nativeBuildInputs = [ autoAddDriverRunpath From bd04ef83ceba92e1d51dc797b9bdfff035f219db Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Thu, 6 Nov 2025 17:27:50 +0100 Subject: [PATCH 1265/2279] harper: 0.70.0 -> 0.71.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.71.0 Diff: https://github.com/Automattic/harper/compare/v0.70.0...v0.71.0 --- .../vscode/extensions/elijah-potter.harper/default.nix | 2 +- pkgs/by-name/ha/harper/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix index 2cc632eb5b82..171d6038515f 100644 --- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix +++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "harper"; publisher = "elijah-potter"; version = harper.version; - hash = "sha256-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k="; + hash = "sha256-ldXQKAJX8YQVjtGjKRom14fNuA6ZwDwpPusbjS+4G+I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 1df595fa96ba..3b0158abbb20 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.70.0"; + version = "0.71.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-ksSr2styk0uDEOGrxAVRqW549oaGdzahejaJ5paYNf0="; + hash = "sha256-Hf086Ub0nVGET4qELDMddOErGAhK8B6ohbI5JhnU6z8="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-w4nwOzKV3yshvLzMeJyv32ihFv5yE+r7gNOF01zTYrU="; + cargoHash = "sha256-hS8fLWD3OTfEAa+4saeB9pK3zS/EQSnoQSUGIkVWocw="; passthru.updateScript = nix-update-script { }; From dbbdc29a847d8c888da5926e0dcccb704174ceac Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 7 Nov 2025 00:32:47 +0800 Subject: [PATCH 1266/2279] zatackax: enable on darwin --- ...SDL_main-redefinition-issue-on-macOS.patch | 25 +++++++++++++++++++ pkgs/by-name/za/zatackax/package.nix | 13 +++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch diff --git a/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch new file mode 100644 index 000000000000..992a31664df6 --- /dev/null +++ b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch @@ -0,0 +1,25 @@ +From 9cf8d3f1025689f3765da2f0a27561a6bfe5c3cb Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Fri, 7 Nov 2025 00:23:44 +0800 +Subject: [PATCH] Fix SDL_main redefinition issue on macOS + +--- + src/zatackax.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/zatackax.c b/src/zatackax.c +index dad2fa9..47a8bd7 100644 +--- a/src/zatackax.c ++++ b/src/zatackax.c +@@ -16,6 +16,8 @@ + */ + + #include "zatackax.h" ++// override SDL_main.h redefining main to SDL_main on darwin ++#define main main + + static const unsigned int FPS_CAP = 100; + +-- +2.51.0 + diff --git a/pkgs/by-name/za/zatackax/package.nix b/pkgs/by-name/za/zatackax/package.nix index 8361f286d084..62385ebb299d 100644 --- a/pkgs/by-name/za/zatackax/package.nix +++ b/pkgs/by-name/za/zatackax/package.nix @@ -21,6 +21,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1m99hi0kjpj5Yl1nAmwSMMdQWcP0rfLLPFJPkU4oVbM="; }; + # src/zatackax.c:2069:5: error: conflicting types for 'SDL_main' + # Fix SDL_main redefinition issue on darwin + patches = lib.optional stdenv.hostPlatform.isDarwin ./0001-Fix-SDL_main-redefinition-issue-on-macOS.patch; + + # malloc.h is not needed because stdlib.h is already included. + # On darwin, malloc.h does not even exist, resulting in an error. + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/zatackax.h \ + --replace-fail '#include ' "" + ''; + strictDeps = true; nativeBuildInputs = [ @@ -45,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.alch-emi ]; mainProgram = "zatackax"; - platforms = lib.platforms.linux; + platforms = with lib.platforms; linux ++ darwin; }; }) From 7e9d21f2ac18d37b670468b6c94ae6fa24f7d96e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 16:34:47 +0000 Subject: [PATCH 1267/2279] grafanaPlugins.volkovlabs-form-panel: 6.2.0 -> 6.3.1 --- .../grafana/plugins/volkovlabs-form-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index 0e684bba8b5d..e514350b0431 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-form-panel"; - version = "6.2.0"; - zipHash = "sha256-o7P2hQBHsSd9qZh1QMlzkJtwo8ug+3E0aEofJf1wukk="; + version = "6.3.1"; + zipHash = "sha256-HuzhTWey/6xLu6GPXGnN4/D3rs7yJ2sPGzO8PPuZmNA="; meta = with lib; { description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard"; license = licenses.asl20; From 8b0dc86b3b385327ecae480de43c911fa66484c6 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 6 Nov 2025 16:31:17 +0000 Subject: [PATCH 1268/2279] mergiraf: 0.15.0 -> 0.16.1 Changelog: https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.16.1 Diff: https://codeberg.org/mergiraf/mergiraf/compare/v0.15.0...v0.16.1 --- pkgs/by-name/me/mergiraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index ae7522885510..4c40ea86e905 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; tag = "v${finalAttrs.version}"; - hash = "sha256-aq0xeIj780wV6PlWj6dgDfXxzQHRRg0T6/EWLKVf+3o="; + hash = "sha256-vKqvVpGyQ9ayebssupiySjJ7R7gn1W8HTlDuGM4d1Ns="; }; - cargoHash = "sha256-nsp+jV9bl3rAFbibvIUD9WT/VZ9b8PXGu4IReOIybuM="; + cargoHash = "sha256-vhes4p8e1PW4p5tqqPffAgl3V4dK17+n748VA6Q23lE="; nativeCheckInputs = [ git ]; From 3df17d1cc1963d7f0588fb4f27c80fc31d54a8dc Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 6 Nov 2025 16:32:30 +0000 Subject: [PATCH 1269/2279] olivetin: 2025.10.30 -> 2025.11.06 Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.11.06 Diff: https://github.com/OliveTin/OliveTin/compare/2025.10.30...2025.11.06 --- pkgs/by-name/ol/olivetin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix index f963e1eea386..85bd6725b49d 100644 --- a/pkgs/by-name/ol/olivetin/package.nix +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -86,13 +86,13 @@ buildGoModule ( { pname = "olivetin"; - version = "2025.10.30"; + version = "2025.11.06"; src = fetchFromGitHub { owner = "OliveTin"; repo = "OliveTin"; tag = finalAttrs.version; - hash = "sha256-yzgyv/YLHXCU8h+c53qZQoY9dNOJdF0/EBBZJkN8Urc="; + hash = "sha256-81AcegFKG5TacKAv9kZgbSOKcAx+ZmK3rqrk3ia/res="; }; modRoot = "service"; From f7b7373a0db1361825251488ea0e57167e963062 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 6 Nov 2025 16:30:24 +0000 Subject: [PATCH 1270/2279] bruijn: 0-unstable-2025-10-28 -> 0-unstable-2025-11-01 Diff: https://github.com/marvinborner/bruijn/compare/9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad...c37a9d27b9f654b1e0118d32269a1548800b062b --- pkgs/by-name/br/bruijn/generated.nix | 4 ++-- pkgs/by-name/br/bruijn/version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index 58286f57abc8..573a0f78f0b3 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -24,8 +24,8 @@ mkDerivation { pname = "bruijn"; version = "0.1.0.0"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad.tar.gz"; - sha256 = "1zx2pcrd25gsq6qz0rixpsdwm0h05cjn5f1a2d2ivbmax88yvsjf"; + url = "https://github.com/marvinborner/bruijn/archive/c37a9d27b9f654b1e0118d32269a1548800b062b.tar.gz"; + sha256 = "1a667693agsc559yy4k04gxv1hlsgkn3aw64yvg876fbn5dr7sk3"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt index 796b237cd580..7b5b0a92b554 100644 --- a/pkgs/by-name/br/bruijn/version.txt +++ b/pkgs/by-name/br/bruijn/version.txt @@ -1 +1 @@ -0-unstable-2025-10-28 +0-unstable-2025-11-01 From a146035a2b1295b2d349fc1762c04cb4fb1e1f0b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 6 Nov 2025 17:46:56 +0100 Subject: [PATCH 1271/2279] ci/github-script/bot: fix concurrency limit This was introduced as part of the hotfix PR to avoid hitting API rate limits - but the condition was wrong. It was supposed to trigger in all PR contexts, not only for the Test workflow. --- ci/github-script/bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index 34abe96941fb..2b52955307ae 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -579,7 +579,7 @@ module.exports = async ({ github, context, core, dry }) => { // We'll only boost concurrency when we're running many PRs in parallel on a schedule, // but not for single PRs. This avoids things going wild, when we accidentally make // too many API requests on treewides. - const maxConcurrent = context.eventName === 'pull_request' ? 1 : 20 + const maxConcurrent = context.payload.pull_request ? 1 : 20 await withRateLimit({ github, core, maxConcurrent }, async (stats) => { if (context.payload.pull_request) { From 02dad28fe83d67c2e63886766a8c259049bef1e7 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Thu, 6 Nov 2025 15:59:38 +0300 Subject: [PATCH 1272/2279] helix-db: init at 2.0.5 --- .../by-name/he/helix-db/disable-updates.patch | 36 ++++++++++++ pkgs/by-name/he/helix-db/package.nix | 58 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 pkgs/by-name/he/helix-db/disable-updates.patch create mode 100644 pkgs/by-name/he/helix-db/package.nix diff --git a/pkgs/by-name/he/helix-db/disable-updates.patch b/pkgs/by-name/he/helix-db/disable-updates.patch new file mode 100644 index 000000000000..e4b26c3265d8 --- /dev/null +++ b/pkgs/by-name/he/helix-db/disable-updates.patch @@ -0,0 +1,36 @@ +diff --git a/helix-cli/src/main.rs b/helix-cli/src/main.rs +index 18e279fd..a3ec271c 100644 +--- a/helix-cli/src/main.rs ++++ b/helix-cli/src/main.rs +@@ -121,13 +121,6 @@ enum Commands { + action: MetricsAction, + }, + +- /// Update to the latest version +- Update { +- /// Force update even if already on latest version +- #[clap(long)] +- force: bool, +- }, +- + /// Migrate v1 project to v2 format + Migrate { + /// Project directory to migrate (defaults to current directory) +@@ -253,9 +246,6 @@ async fn main() -> Result<()> { + // Send CLI install event (only first time) + metrics_sender.send_cli_install_event_if_first_time(); + +- // Check for updates before processing commands +- update::check_for_updates().await?; +- + let cli = Cli::parse(); + + let result = match cli.command { +@@ -280,7 +270,6 @@ async fn main() -> Result<()> { + Commands::Prune { instance, all } => commands::prune::run(instance, all).await, + Commands::Delete { instance } => commands::delete::run(instance).await, + Commands::Metrics { action } => commands::metrics::run(action).await, +- Commands::Update { force } => commands::update::run(force).await, + Commands::Migrate { + path, + queries_dir, diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix new file mode 100644 index 000000000000..30ad67eed5e4 --- /dev/null +++ b/pkgs/by-name/he/helix-db/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "helix-db"; + version = "2.0.5"; + + src = fetchFromGitHub { + repo = "helix-db"; + owner = "HelixDB"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lNAaOpF6g2yunGP9bgsMVvVc7YMfZ44WfkumR+8Btlg="; + }; + + cargoHash = "sha256-YCBTSm252eUJeOyMIEcZ+0AyHoYM1QceYSHhp+qwf6Q="; + + patches = [ + #There are no feature yet + ./disable-updates.patch + ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + + env.OPENSSL_NO_VENDOR = true; + + cargoBuildFlags = [ + "-p" + "helix-cli" + ]; + + #There are no tests + doCheck = false; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open-source graph-vector database built from scratch in Rust"; + homepage = "https://github.com/HelixDB/helix-db"; + changelog = "https://github.com/HelixDB/helix-db/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ nartsiss ]; + mainProgram = "helix"; + }; +}) From 85a8de6fa3e5f109890cf0f99bf56b727c40b70d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 20:00:20 +0300 Subject: [PATCH 1273/2279] kdePackages.libquotient: 0.9.1 -> 0.9.5, fix build with Qt 6.10 --- pkgs/development/libraries/libquotient/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 850d0c1caa70..9441dfa4aeea 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, cmake, olm, openssl, @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.9.1"; + version = "0.9.5"; outputs = [ "out" @@ -23,9 +24,18 @@ stdenv.mkDerivation rec { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-R9ms3sYGdHaYKUMnZyBjw5KCik05k93vlvXMRtAXh5Y="; + hash = "sha256-wdIE5LI4l3WUvpGfoJBL8sjBl2k8NfZTh9CjfJc9FIA="; }; + patches = [ + # Qt 6.10 compat + # FIXME: remove in next update + (fetchpatch { + url = "https://github.com/quotient-im/libQuotient/commit/ea83157eed37ff97ab275a5d14c971f0a5a70595.diff"; + hash = "sha256-JMdcywGgZ0Gev/Nce4oPiMJQxTBJYPoq+WoT3WLWWNQ="; + }) + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ From b7a6c33d1afe332de0c6735de52db5aa0ef0bb48 Mon Sep 17 00:00:00 2001 From: Simon Engmann Date: Thu, 6 Nov 2025 18:13:23 +0100 Subject: [PATCH 1274/2279] wireshark: set Darwin minimum SDK version to 12.0 Required by Qt 6. CMake will error without this. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 1d74c153494f..aafea4cae0e4 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -9,6 +9,7 @@ buildPackages, c-ares, cmake, + darwinMinVersionHook, fixDarwinDylibNames, flex, gettext, @@ -147,6 +148,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gmp + # Required by Qt 6 + (darwinMinVersionHook "12.0") ]; strictDeps = true; From d7e8af6a10e29a38fe999f5fdc8fc0b463aab1de Mon Sep 17 00:00:00 2001 From: Simon Engmann Date: Thu, 6 Nov 2025 18:14:55 +0100 Subject: [PATCH 1275/2279] wireshark: fix extcap directory Starting with Wireshark 4.6.0, the extcap binaries are placed under `libexec` instead of `lib`. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index aafea4cae0e4..a80ee39d368d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { flags+=(-change @rpath/"$(basename "$file")" "$file") done - for file in $out/lib/wireshark/extcap/*; do + for file in $out/libexec/wireshark/extcap/*; do if [ -L "$file" ]; then continue; fi echo "$file: fixing dylib references" # note that -id does nothing on binaries @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns mkdir -p $out/Applications/Wireshark.app/Contents/PlugIns cp -r $out/lib/wireshark/plugins $out/Applications/Wireshark.app/Contents/PlugIns/wireshark - cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap + cp -r $out/libexec/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap ''; meta = { From 7581a63bed2694cf17f57fc55822d25a2484e557 Mon Sep 17 00:00:00 2001 From: kyehn Date: Mon, 27 Oct 2025 09:41:33 +0800 Subject: [PATCH 1276/2279] v2rayn: 7.14.4 -> 7.15.6 --- pkgs/by-name/v2/v2rayn/deps.json | 135 ++++++++++++++++++----------- pkgs/by-name/v2/v2rayn/package.nix | 11 +-- 2 files changed, 89 insertions(+), 57 deletions(-) diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index d44298118198..3aca1d055f16 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -1,4 +1,9 @@ [ + { + "pname": "Avalonia", + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, { "pname": "Avalonia", "version": "11.1.3", @@ -6,19 +11,29 @@ }, { "pname": "Avalonia", - "version": "11.2.1", - "hash": "sha256-KdjhwDKlii12v7HNI3NsYAM1qYoXKRsVN2scQJbYMTc=" + "version": "11.3.7", + "hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM=" }, { "pname": "Avalonia", - "version": "11.3.4", - "hash": "sha256-3ojATZlOAUEZ6Io3fUwtaJaD2h9vWMw/X/mGyZljRPU=" + "version": "11.3.8", + "hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g=" }, { "pname": "Avalonia.Angle.Windows.Natives", "version": "2.1.25547.20250602", "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.3.0", + "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.28", + "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=" + }, { "pname": "Avalonia.BuildServices", "version": "0.0.29", @@ -26,43 +41,48 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.31", - "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" + "version": "11.3.1", + "hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.4", - "hash": "sha256-/RbL/Yi5d/xmPVTG2pJFZ1K44iECajkUU8MfZStKxAM=" + "version": "11.3.8", + "hash": "sha256-cB3mYR1X8Gzu1FQfWCJpfWosnpojIQhRSxrjYz4zD6g=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.3.4", - "hash": "sha256-x3EtbbdgJ/WNBpltO+ztmI6JSQ2p5Ey4LDDX8FI1rXQ=" + "version": "11.3.8", + "hash": "sha256-5rB33sqLIoDIEjlGlJFRGf1lLwvnVh8o8/16GQzu15Q=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.4", - "hash": "sha256-HTLnySk+navLLYE05m4HDpHwgp3RAk1OKYAjVaUirDk=" + "version": "11.3.8", + "hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.4", - "hash": "sha256-85N0jIcrFNThaDhvcPU8/g84ISWILx2cXHVTPW0kJbI=" + "version": "11.3.8", + "hash": "sha256-eOLf2Id4Olbq/nMWERarked+vg5ZnVMCxMKOXBfqAqM=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.4", - "hash": "sha256-mH9d3yJbf10NqOI3PR1cCoGyyEQbnKRNDmxFN+2bS9c=" + "version": "11.3.8", + "hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs=" }, { "pname": "Avalonia.Native", - "version": "11.3.4", - "hash": "sha256-49rMUvhG5Dsl9RqhtD0i6H9X1g5768VdrW5l8axkwNI=" + "version": "11.3.8", + "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.3.4", - "hash": "sha256-6AZrrX1S0SSB5GzqJx4nPI/nSyvlu/iXW99mO4v1jK0=" + "version": "11.3.8", + "hash": "sha256-QwIPrfoxNw/u/deWc5C3ps0eQDBFOocMH74nlVahQuM=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.0.0", + "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=" }, { "pname": "Avalonia.Remote.Protocol", @@ -71,33 +91,33 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.1", - "hash": "sha256-RlO65QbExBdjEUY66CTlHefRdTZWzZbN4ksibVXxKv4=" + "version": "11.3.7", + "hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.4", - "hash": "sha256-kVHhVHtwl1ssEf4STciY6OV0u2zyV8nOb2mSXnPH+nk=" + "version": "11.3.8", + "hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU=" }, { "pname": "Avalonia.Skia", - "version": "11.3.4", - "hash": "sha256-CCjlniydh91cypVmnK88UvYZH1Arjbfr7L/kNJMjyTo=" + "version": "11.3.8", + "hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.4", - "hash": "sha256-lvjlqHU6X9ftLOXHAp0uzPfApIfte9YyIBJ+4CAp1/s=" + "version": "11.3.8", + "hash": "sha256-GSD4yvyDKqBSGV/rwE/EO3CTp9dG4eR4B5H0Y/u9+hE=" }, { "pname": "Avalonia.Win32", - "version": "11.3.4", - "hash": "sha256-pBc4jtBOalc29D+4XzOATDjiyuK+sMMpQfhXn2m9XJo=" + "version": "11.3.8", + "hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg=" }, { "pname": "Avalonia.X11", - "version": "11.3.4", - "hash": "sha256-POuDAvqpPYV6Ob0a4W6QIVL0s4/bQbRhshat9z5lvt0=" + "version": "11.3.8", + "hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0=" }, { "pname": "CliWrap", @@ -174,15 +194,20 @@ "version": "5.0.0", "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, { "pname": "NLog", - "version": "6.0.2", - "hash": "sha256-sToQRwukDjUo3ytSmHXT5p4j6fTv1utHkQKeF48EWnQ=" + "version": "6.0.5", + "hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY=" }, { "pname": "QRCoder", - "version": "1.6.0", - "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28=" + "version": "1.7.0", + "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU=" }, { "pname": "ReactiveUI", @@ -196,13 +221,18 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.9", - "hash": "sha256-4NsQyk70xjD+V0X/0wuWhQshkadbBVs1iyRNEPmExkk=" + "version": "11.3.7", + "hash": "sha256-iOf7KhTmHt0vqkRyloM+yueo/acHHwFQd/5UZ1r0SD8=" + }, + { + "pname": "Semi.Avalonia.AvaloniaEdit", + "version": "11.2.0.1", + "hash": "sha256-W0gAoDPlStqsznFS6eLDI4GFAlIDGyQq2L+DG/WKY1I=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.9", - "hash": "sha256-6V1agOI1KcTXQN1+uab7tSZH1ZdJEQrVfxZ5ha1cvGI=" + "version": "11.3.7", + "hash": "sha256-XD7a6YY5L24peG24GaItZq7PZEdK1RP1eS0QxFbASJU=" }, { "pname": "SkiaSharp", @@ -249,16 +279,6 @@ "version": "15.3.1", "hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU=" }, - { - "pname": "Splat", - "version": "15.5.3", - "hash": "sha256-nG2Q8PYkGgasSCoK2dO1TK4drljqr+1D6K9letsOQ08=" - }, - { - "pname": "Splat.NLog", - "version": "15.5.3", - "hash": "sha256-8s6PBlwaqOQfOR3NsloIufdXQELVyzrItcIUjrwec6U=" - }, { "pname": "sqlite-net-pcl", "version": "1.9.172", @@ -284,6 +304,11 @@ "version": "2.1.2", "hash": "sha256-e56+FgxEHqV3SGQx0ZAqzlscPxNUPXJ8Ls9rtqET1S4=" }, + { + "pname": "System.ComponentModel.Annotations", + "version": "4.5.0", + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" + }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", @@ -294,6 +319,11 @@ "version": "6.0.0", "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" + }, { "pname": "System.IO.Pipelines", "version": "8.0.0", @@ -309,6 +339,11 @@ "version": "6.0.1", "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, + { + "pname": "System.Reactive", + "version": "6.1.0", + "hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y=" + }, { "pname": "System.Security.AccessControl", "version": "6.0.1", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 8aff827ea49a..0faa6c9c91a3 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -15,19 +15,18 @@ krb5, bash, xorg, - xdg-utils, nix-update-script, }: buildDotnetModule (finalAttrs: { pname = "v2rayn"; - version = "7.14.4"; + version = "7.15.6"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = finalAttrs.version; - hash = "sha256-zfQza07GhYFEHwl4w5hqqE9JP/0yY5KIj0zRRNmAECA="; + hash = "sha256-YBOfewVdFWjP47JIWJErqEqR8/vSJLaFkZ3uJblPK6Q="; fetchSubmodules = true; }; @@ -41,13 +40,11 @@ buildDotnetModule (finalAttrs: { chmod +x v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh patchShebangs v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh substituteInPlace v2rayN/ServiceLib/Global.cs \ - --replace-fail "/bin/bash" "${bash}/bin/bash" + --replace-fail "/bin/bash" "${lib.getExe bash}" substituteInPlace v2rayN/ServiceLib/Manager/CoreAdminManager.cs \ - --replace-fail "/bin/bash" "${bash}/bin/bash" + --replace-fail "/bin/bash" "${lib.getExe bash}" substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \ --replace-fail "Utils.GetExePath())" '"v2rayN")' - substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \ - --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open" substituteInPlace v2rayN/ServiceLib/Manager/CoreManager.cs \ --replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false" ''; From 77addeb72da0f8763182b4811280f392da7e7f3f Mon Sep 17 00:00:00 2001 From: octvs Date: Thu, 6 Nov 2025 18:16:43 +0100 Subject: [PATCH 1277/2279] papis: fix build by upstream patch --- pkgs/development/python-modules/papis/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 101f5fe21732..111bf954bef4 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system hatchling, @@ -123,6 +124,14 @@ buildPythonPackage rec { "test_yaml_unicode_dump" ]; + patches = [ + (fetchpatch2 { + name = "fix-support-new-click-in-papisrunner.patch"; + url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1"; + hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU="; + }) + ]; + meta = { description = "Powerful command-line document and bibliography manager"; mainProgram = "papis"; From 65093c3eb52e860589a850044e9275af32f1114c Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 20:21:18 +0300 Subject: [PATCH 1278/2279] kdePackages.angelfish: apply Qt 6.10 hack --- pkgs/kde/gear/angelfish/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 42fe1f1753c7..e59a1c956451 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -31,4 +31,7 @@ mkKdeDerivation rec { corrosion qcoro ]; + + # FIXME: work around Qt 6.10 cmake API changes + cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ]; } From 1f291f53d65f944c3c4c7a77c9f75e950ac03d5b Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 6 Nov 2025 20:00:39 +0300 Subject: [PATCH 1279/2279] kdePackages: Gear 25.08.2 -> 25.08.3 --- pkgs/kde/generated/sources/gear.json | 1494 +++++++++++++------------- 1 file changed, 747 insertions(+), 747 deletions(-) diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json index 7c8a66002ab9..98fd3024c74e 100644 --- a/pkgs/kde/generated/sources/gear.json +++ b/pkgs/kde/generated/sources/gear.json @@ -1,1247 +1,1247 @@ { "accessibility-inspector": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/accessibility-inspector-25.08.2.tar.xz", - "hash": "sha256-Z8RYiX+GK+aoQ0zI5x5By5974VtHT0t7a0TwC6+2UmE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/accessibility-inspector-25.08.3.tar.xz", + "hash": "sha256-qu5u3kDAOYIAffLouVLn/mxTFOFBhFCU4ox1U3NEeQA=" }, "akonadi": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-25.08.2.tar.xz", - "hash": "sha256-Qc/q3+h7Ao1yAGjAReuebLId+p7bJHpUiNmz/GExww4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-25.08.3.tar.xz", + "hash": "sha256-+Gf9HhbZ1jepLaszTcQXDyD1i+EzZzkglOxTnj7uAXo=" }, "akonadi-calendar": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-calendar-25.08.2.tar.xz", - "hash": "sha256-wnrtySzylXBjazodxARKvuKaajbTU23usy1VjXmzVGE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-calendar-25.08.3.tar.xz", + "hash": "sha256-vuMRKJCiHyq2AFholD0lbHnFGPwbWyR/AUy4vazdQMI=" }, "akonadi-calendar-tools": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-calendar-tools-25.08.2.tar.xz", - "hash": "sha256-nIS+nz+VDOV1oyjUrKia/3v8f5CijPRCNqgzUoTmOog=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-calendar-tools-25.08.3.tar.xz", + "hash": "sha256-jHkM7gF8fMMx97aQqCe9MsW0kmB5Z47CS7gA0mxPHqY=" }, "akonadi-contacts": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-contacts-25.08.2.tar.xz", - "hash": "sha256-ZQwDTN8qq15TqL5XnK1nep2PzDXttwTncgLpBbD44gI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-contacts-25.08.3.tar.xz", + "hash": "sha256-OEAOvm4cudm/U2vNwym9ZI0r2HviMn0EtJNhxmzz0k0=" }, "akonadi-import-wizard": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-import-wizard-25.08.2.tar.xz", - "hash": "sha256-ORQ1Jp8sBhoJ6KcnpbpuOdPFkItpF6EYRthEbkmgO9U=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-import-wizard-25.08.3.tar.xz", + "hash": "sha256-X9O1offbeIUoyXR/70tz8KjKfHvCzw41uC3ODK/tE5k=" }, "akonadi-mime": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-mime-25.08.2.tar.xz", - "hash": "sha256-AAdRMbRrwa/L6qP86IUvdr7W8FMVeY6GEY4PyuDE3ks=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-mime-25.08.3.tar.xz", + "hash": "sha256-ciKSy8ewUeaLC3wFo3H6VarzHqi8Z/LdHOcz4O2xImY=" }, "akonadi-search": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-search-25.08.2.tar.xz", - "hash": "sha256-K+VinvzH8BNP22Gp+QYrxZsAq1XoG478dq8Yy11mpYg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-search-25.08.3.tar.xz", + "hash": "sha256-PI19LYADtJYBgxaA/BG6kNp5xRaYbMJscWALud5531E=" }, "akonadiconsole": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akonadiconsole-25.08.2.tar.xz", - "hash": "sha256-OFPxGuQUZSF2SolzPnCJxmfpyntD/ckTsmTKWTdVIpE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akonadiconsole-25.08.3.tar.xz", + "hash": "sha256-CJAdImBZ5k6kcUXw/g6XEEqf7no9SbHWnOeVxGnvRNo=" }, "akregator": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/akregator-25.08.2.tar.xz", - "hash": "sha256-0KZvccUVnLv+N+B2LRVXBRVpL4ZG+1WhkYDW1Sms/O4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/akregator-25.08.3.tar.xz", + "hash": "sha256-HGe7qUnvN2xwfUOV5qo3mNFy67cwOuNHIt/m1cCbD4M=" }, "alligator": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/alligator-25.08.2.tar.xz", - "hash": "sha256-QIZjRzpKuUJWnSeo1SfkroUrK8vDyhpHQcY+HX64P2Y=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/alligator-25.08.3.tar.xz", + "hash": "sha256-OAbXqoE/jrw061PPelDgaXObSbaR1Yt8kGOAXDTcuPo=" }, "analitza": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/analitza-25.08.2.tar.xz", - "hash": "sha256-124Mohk8mQPyBUYStMz2tPPU4VxeV37/M+9UV/arcGk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/analitza-25.08.3.tar.xz", + "hash": "sha256-Gr50HD8Ymz2MuM80tRaJD9ZM8hunXQ9VizcRlWuD5NE=" }, "angelfish": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/angelfish-25.08.2.tar.xz", - "hash": "sha256-NWH87SN49oIUteK8qAEXpgosCPpdUiOoHwzIN4mr28Q=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/angelfish-25.08.3.tar.xz", + "hash": "sha256-ccSns9ZlDrW9mn0ILOA++s4LtegG2POZ561nW7BkN2w=" }, "arianna": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/arianna-25.08.2.tar.xz", - "hash": "sha256-DsL4hIjZhP+cy7pDEfffP7SI+L3HRIAJwctGrSbAdCg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/arianna-25.08.3.tar.xz", + "hash": "sha256-Ou6H67yjIW6oZ2A2JmMSpeekrzQGwg3soS76n4tb2rQ=" }, "ark": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ark-25.08.2.tar.xz", - "hash": "sha256-dj6r7B6ABQ80Q7t6C8Ntd3soqwcgDvsWYwvzP32wy8o=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ark-25.08.3.tar.xz", + "hash": "sha256-yk+3KV8JAoDfAtJLZPET4QxvYYE4s4e8H9eixWHeVU8=" }, "artikulate": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/artikulate-25.08.2.tar.xz", - "hash": "sha256-y6ybg9tGEp5egY+CYTdRcyxuMuenWWd8S5F8cWSgX1M=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/artikulate-25.08.3.tar.xz", + "hash": "sha256-B8BF81lWTN5ri6U4xtDCq72pKDQekypFy0CBxMFdqOU=" }, "audex": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/audex-25.08.2.tar.xz", - "hash": "sha256-n4N+u12L0E8Jr5uyKIGfWl/ismllto5tcm5vJDJvPGM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/audex-25.08.3.tar.xz", + "hash": "sha256-eaECo9FOa12Sa+DQpmNF/VtYHDwCHlqbZSCBfugT7I4=" }, "audiocd-kio": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/audiocd-kio-25.08.2.tar.xz", - "hash": "sha256-rnWN3W+r6i2Af0qLcbmLGtLwtTCu6+O1eUtRhxYvkL8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/audiocd-kio-25.08.3.tar.xz", + "hash": "sha256-buOBRu17YVBH2wPhQgXqkiEknm64RyS9ZgmvmC9X7qw=" }, "audiotube": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/audiotube-25.08.2.tar.xz", - "hash": "sha256-PmPdKaJwsP95Xk9QeoMlYa5XKinYomjVubBV4B4PSlA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/audiotube-25.08.3.tar.xz", + "hash": "sha256-7g7PpDufa5qrtYPe4OIB8paScfp3ua28HauzSsFJte4=" }, "baloo-widgets": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/baloo-widgets-25.08.2.tar.xz", - "hash": "sha256-XGzTy29NC2ifxCNnxUGKxr8XiXhxQ5T/tbzV86c0G80=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/baloo-widgets-25.08.3.tar.xz", + "hash": "sha256-/AqOxTIbP0uw4fFlzY51dwGbkNV1UXCAJjSmjfw858s=" }, "blinken": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/blinken-25.08.2.tar.xz", - "hash": "sha256-AsermlIShX8/KOoR4BPs7kf6vYbQ3o9yCi8HTqNzq8w=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/blinken-25.08.3.tar.xz", + "hash": "sha256-dwWY8ifoy7abSw3eTjum3qEHTj4Kin8H5CQ6GL+HbW0=" }, "bomber": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/bomber-25.08.2.tar.xz", - "hash": "sha256-VOdFXk4nte9CtcFL1H0jmvZGP7z6eTrp7VlWT6xqibY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/bomber-25.08.3.tar.xz", + "hash": "sha256-eMHM10FRXCpUIJATB7hz/FLIb0xaHlGHBHIhX4zpzJs=" }, "bovo": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/bovo-25.08.2.tar.xz", - "hash": "sha256-dOqMcZHDqZtkkOxQmMqzrVFrxE7h59673zfK4a7t2/s=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/bovo-25.08.3.tar.xz", + "hash": "sha256-3+YkhXzh3seAlgygDr7mFe5rULouf6DBSF7NGFVxzeY=" }, "calendarsupport": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/calendarsupport-25.08.2.tar.xz", - "hash": "sha256-Lzw9pv9gDFccli4YyrfSpseA154oK5TextcKbwhNbUY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/calendarsupport-25.08.3.tar.xz", + "hash": "sha256-g0NzWYHoxBRm1w06SOcOHOIyipKO3QvtLa6QOaPPna0=" }, "calindori": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/calindori-25.08.2.tar.xz", - "hash": "sha256-9eH0pexsT220s+BRUgNKetlffanC4IvCsnrMjMI+aok=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/calindori-25.08.3.tar.xz", + "hash": "sha256-t7ylpu88XTa6qK6cVg+/V9mlPmkl1qJIYa7MKn3mzLw=" }, "calligra": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/calligra-25.08.2.tar.xz", - "hash": "sha256-319aPsI+evmPOAW0vYQmlH4AyNdeP0QU1dpYDgdwCUg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/calligra-25.08.3.tar.xz", + "hash": "sha256-dPrHglPEKYU+mfrgC88rhDMtvDqPU4zPcGdCWSZrklE=" }, "cantor": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/cantor-25.08.2.tar.xz", - "hash": "sha256-JZxEFr/CtgzpSZodoP70jVNpsLY+/nW8sNDIkGovIAA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/cantor-25.08.3.tar.xz", + "hash": "sha256-VjUAf7nFDYLojez5Jk/0D7n07mWydHTFkwsbUZ6yS3I=" }, "colord-kde": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/colord-kde-25.08.2.tar.xz", - "hash": "sha256-Sks0OGQoIidW6TM+EobQA6+syy/szKkmhffRQruatgk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/colord-kde-25.08.3.tar.xz", + "hash": "sha256-KaawondaAKO9WxsTjHc3LlOviARYDB5BK4edSOXQrt8=" }, "dolphin": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/dolphin-25.08.2.tar.xz", - "hash": "sha256-BvTxaY9kB/00uMmyED2RohzKtkZ0hbtfoj4jc26mZ5E=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/dolphin-25.08.3.tar.xz", + "hash": "sha256-Gr1jLr44N99WFiFvacPKn2JAFl+fhFAkIiAydeqo7gk=" }, "dolphin-plugins": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/dolphin-plugins-25.08.2.tar.xz", - "hash": "sha256-QxHdWblKASYl5/tlh9Tw7AENslccsrUIevAZCc8VD8g=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/dolphin-plugins-25.08.3.tar.xz", + "hash": "sha256-KESdFeCqzndWPztvE/R7oGhUFgoHXfQjh/wD9nCousU=" }, "dragon": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/dragon-25.08.2.tar.xz", - "hash": "sha256-AUNDWenG/kqX8fkgPlF7OCqpI3RrR85rJSs23wuBiug=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/dragon-25.08.3.tar.xz", + "hash": "sha256-nh0v6TAYFmQYy/yC/C+ThNHFyZvBtQDGkHLI/iz50Dg=" }, "elisa": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/elisa-25.08.2.tar.xz", - "hash": "sha256-4HUIsISk9d8bzqdYynBailPJDcAfb1Q1qe84eF0bEcE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/elisa-25.08.3.tar.xz", + "hash": "sha256-Y2dLvQWKUY10C9mIDWWpr2qBb8M/uQTMHwwMJIRH3RM=" }, "eventviews": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/eventviews-25.08.2.tar.xz", - "hash": "sha256-bcE4iCT+WrVtG+FbOX6IhKvo4dujel19PGsXQ8TXYjU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/eventviews-25.08.3.tar.xz", + "hash": "sha256-6hbNGZOcfU9bna+575N2PosvJsLfIsZw9qV4LdEOOD4=" }, "falkon": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/falkon-25.08.2.tar.xz", - "hash": "sha256-+39ozZTvJPdq86HkoHEZV+7nqVI5ubnEIjZ2maPMEVM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/falkon-25.08.3.tar.xz", + "hash": "sha256-FiUtikICi/VLiOHkpa+5WHUwneRPIDFWyZxKZDcg4Sk=" }, "ffmpegthumbs": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ffmpegthumbs-25.08.2.tar.xz", - "hash": "sha256-0vF4G82w8cov5qu83pPA2EUH8M7iNlDf2U64obfpTIw=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ffmpegthumbs-25.08.3.tar.xz", + "hash": "sha256-hOzRMaUHmYFfQUUi/BJwxW4O5Fu/r5b54dLJJ43ISWI=" }, "filelight": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/filelight-25.08.2.tar.xz", - "hash": "sha256-nKR/6/reraoRurzmXBngNaW8dmYA0JeM5JRNnkFmFVU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/filelight-25.08.3.tar.xz", + "hash": "sha256-ijqCXFocTzZi17eG91v4+u9qyfZyPI6M0p5s8VvagIA=" }, "francis": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/francis-25.08.2.tar.xz", - "hash": "sha256-PBqs9qoCAlgigzMMtuih1OHlfvyc/JpUkqoGBlePKxM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/francis-25.08.3.tar.xz", + "hash": "sha256-o71EolKHj7XhRRZYBqG6pxt+QL6T7ZTVvYd3GHWV/jE=" }, "ghostwriter": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ghostwriter-25.08.2.tar.xz", - "hash": "sha256-Xw0aUeB8pYZbM1I5qiDeV15M1XpJMpZtWpbY3/Pb1nY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ghostwriter-25.08.3.tar.xz", + "hash": "sha256-OZlp7wcHz0iD/OFy1qIt+vKSlKmw+tLnFq1oBFICsAY=" }, "granatier": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/granatier-25.08.2.tar.xz", - "hash": "sha256-UjN/T3EdDkojbKyL2njB4JUjTEZfQdQL+SaF9dMfl4Q=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/granatier-25.08.3.tar.xz", + "hash": "sha256-9JMa+NH6DVZaEsPsiANiSih1cWxalCsWzIgZOuEBYm8=" }, "grantlee-editor": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/grantlee-editor-25.08.2.tar.xz", - "hash": "sha256-+02OZHw2YaMGQ80yrUb1PJcuxvyAN2xNxRSx9lyj8M4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/grantlee-editor-25.08.3.tar.xz", + "hash": "sha256-atnws3Sd5VfsR8SdqRR1Q5JIWmZGHA1o9R/XcYhaVbU=" }, "grantleetheme": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/grantleetheme-25.08.2.tar.xz", - "hash": "sha256-xdtSGNuv2SXkaScoRYFBt6cbnpZ0usEchcho15LCTFQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/grantleetheme-25.08.3.tar.xz", + "hash": "sha256-ZJ3pmbthKI/JtK7T6+Ix5FIBzWz9TyR2Nqf9Jw74euA=" }, "gwenview": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/gwenview-25.08.2.tar.xz", - "hash": "sha256-wYmWeg4h8HU1YOjYc4HoiPPZQ3AdtMHyG+2LW7ivHlo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/gwenview-25.08.3.tar.xz", + "hash": "sha256-IADELUDuPpLONV+C0v3dB9J/YT9xzy5laZz+eUp27KE=" }, "incidenceeditor": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/incidenceeditor-25.08.2.tar.xz", - "hash": "sha256-CWWB/XaMWwcaxK/mfJ6zdB4wm2AKcku6wSr2l0bGgJg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/incidenceeditor-25.08.3.tar.xz", + "hash": "sha256-0MFcN1FyOrzxAaI6axYtMp4IkknpS9/UKD1o3s8hGpg=" }, "isoimagewriter": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/isoimagewriter-25.08.2.tar.xz", - "hash": "sha256-wfRRmrvrqtUlGa+V6Zr3jN4ZNv4Zl3BJWkY2hxpaLWA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/isoimagewriter-25.08.3.tar.xz", + "hash": "sha256-hhC0t4mo11DG9PKOHStfmE7/1+uCKDJeZzrU9CJRLi4=" }, "itinerary": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/itinerary-25.08.2.tar.xz", - "hash": "sha256-VXA9YIjiWgrbgiSYJYnUl4TpIL6MDnnl9QwTzDKu1z4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/itinerary-25.08.3.tar.xz", + "hash": "sha256-KPjO9H+UnOSDJvbSiC1YwceXpuMkxR9dNRDn2yIWH4c=" }, "juk": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/juk-25.08.2.tar.xz", - "hash": "sha256-KzlqgDeK5ygT0CmGtqNQLJdQZbSan+rzgkJsepZaSKA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/juk-25.08.3.tar.xz", + "hash": "sha256-uVwfu1rgZ0U7KrUrnA6MCNW7V+4+Xtyx0fsMcC+P/ok=" }, "k3b": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/k3b-25.08.2.tar.xz", - "hash": "sha256-tOsu4GmpaPfcPsSCU5Wvdea/tInZaiiUjyLuUaNq+jU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/k3b-25.08.3.tar.xz", + "hash": "sha256-Vx4fWYGeYwv/2pbJbGMm1fEoqkVW4oK+UZ9MhAkQXSU=" }, "kaccounts-integration": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kaccounts-integration-25.08.2.tar.xz", - "hash": "sha256-peBuAWaUm/LemVdTUX7bVT+iXu3Z7uWsMJ8vOsHZiO4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kaccounts-integration-25.08.3.tar.xz", + "hash": "sha256-f6A0Pww/WTdcSBfL0psP7X5Fy7MfSVbm0/YsCr4qHIs=" }, "kaccounts-providers": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kaccounts-providers-25.08.2.tar.xz", - "hash": "sha256-+XmuS9Ih7rybPEnNRmIE+R7xjBkVpNzoMgbzhK3Rr9M=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kaccounts-providers-25.08.3.tar.xz", + "hash": "sha256-EipO8htZau91+iu0HM2XxzMt/NYjSiYCrubBPFhFEG8=" }, "kaddressbook": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kaddressbook-25.08.2.tar.xz", - "hash": "sha256-RbP8niU57R/LvM1FzkXpw2t1AQiSZZmCCRVfvOcaWNU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kaddressbook-25.08.3.tar.xz", + "hash": "sha256-hTXzTM0UKGKQcq/V4uc5xZ4p5KDGfkRPCZF8pDAXqlc=" }, "kajongg": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kajongg-25.08.2.tar.xz", - "hash": "sha256-vYNzVfQl5SDcST64u8YpC134OIQPiCuLou9dHHucHBQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kajongg-25.08.3.tar.xz", + "hash": "sha256-R9WGyP0U6ZG/snih9ahTOH681PEhgdLVyc3rQ9+udXg=" }, "kalarm": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kalarm-25.08.2.tar.xz", - "hash": "sha256-f/WKJYoX31DqPaetfc3O4VBySBEU4+uxuFXrhcBl1nc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kalarm-25.08.3.tar.xz", + "hash": "sha256-NHufVkcecLTDNe6WvHan1cFIut/RRgzQDoi9s/9sZ1k=" }, "kalgebra": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kalgebra-25.08.2.tar.xz", - "hash": "sha256-Igi0+WWHbrSz9C6q4GxvNn/wc1skXZq6zy8sl1pxTxA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kalgebra-25.08.3.tar.xz", + "hash": "sha256-PcUwwsjUpIuhwtcRfS3hxH4GVCVfo8jUX2xtqs+bHUE=" }, "kalk": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kalk-25.08.2.tar.xz", - "hash": "sha256-9DlieqCYApCiu/eLYbGgPTi33hwaqnFwiGe7Xt190IM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kalk-25.08.3.tar.xz", + "hash": "sha256-8hip+c2oPhJECwgyxb7V18VNgLM1vHeFpjT4eSm53NA=" }, "kalm": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kalm-25.08.2.tar.xz", - "hash": "sha256-0u6i7yr7oRkUpb3WPOBfePV7bsE8ShfJpVbEIkilb64=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kalm-25.08.3.tar.xz", + "hash": "sha256-z9QK5UcuKGaN295py/dxCV6eKP/oDPMHxDl1MiSnT2k=" }, "kalzium": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kalzium-25.08.2.tar.xz", - "hash": "sha256-mfHaPrBK7jG0XZKLXdMKFnXcIEGUumQ/iXP0rm/bz+0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kalzium-25.08.3.tar.xz", + "hash": "sha256-NubE9G4aXaqs4U67Wx9trDQprV3z1PwfCt6uw+KOQgs=" }, "kamera": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kamera-25.08.2.tar.xz", - "hash": "sha256-/wOWIlPyoQjrDh9STSrPLZzJNFYUafuY9sgOkDKUoPQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kamera-25.08.3.tar.xz", + "hash": "sha256-Tca4sPtHkoi2V3tEbEVDF14hM2THkb1lC2HsevhV7RI=" }, "kamoso": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kamoso-25.08.2.tar.xz", - "hash": "sha256-Ry/NTfUXrzf5g+8RaJYcJzk8JeTFPwTkGibgfPRQTV8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kamoso-25.08.3.tar.xz", + "hash": "sha256-QhlpQxS3w15yyFAI++GFmuKLuAIHsdI/tHf5v8LzGLc=" }, "kanagram": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kanagram-25.08.2.tar.xz", - "hash": "sha256-57vmAV82DPVzR/pSaAa5QewDQ3AYGD1EizRk++34apc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kanagram-25.08.3.tar.xz", + "hash": "sha256-wVoqCywIzvdFUiDu3fzDCV027qFNaE/F+5/y8dCly7w=" }, "kapman": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kapman-25.08.2.tar.xz", - "hash": "sha256-uz9Imc5G1AScr2Kr0aEOQl7xVsdLFncVhFjlHFmz0pQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kapman-25.08.3.tar.xz", + "hash": "sha256-m2RJ6npbJ9Ih50cU3aLyd2Rcz0MJFVJGhD6lv/9FKXM=" }, "kapptemplate": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kapptemplate-25.08.2.tar.xz", - "hash": "sha256-qbfvgHc8d+nIHI9Rl5Cr2kD2rKF93sJA6cL0zcp8+UI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kapptemplate-25.08.3.tar.xz", + "hash": "sha256-NQbkTNMLdIgsoQgkqsUsXOJqs5axBSqOVSQcU20MXno=" }, "kasts": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kasts-25.08.2.tar.xz", - "hash": "sha256-sNpJl2/RJszypKty9VDIs079tYgwwMHvRDcaaFt9O5k=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kasts-25.08.3.tar.xz", + "hash": "sha256-zMyOMsnPIG8t/J2zYZaGQ5w+BbnTUr6KyVHJnJrYYnM=" }, "kate": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kate-25.08.2.tar.xz", - "hash": "sha256-te76UZaQmD75K+jMMOr6zh/IyfIl2dhRpcGBmlJjR3A=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kate-25.08.3.tar.xz", + "hash": "sha256-yS64tbgcm13JG1xG0gtPOuC3gREUd5/Y+S8VMjP8qQs=" }, "katomic": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/katomic-25.08.2.tar.xz", - "hash": "sha256-JborSTaM/p0tQTlvB9A3M0g57rZQLnHi+o+bpld9PWs=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/katomic-25.08.3.tar.xz", + "hash": "sha256-kCG+G+/Nog0lOCy1xiDNZsu/DqOqYhsKrkCpBVOrQsw=" }, "kbackup": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kbackup-25.08.2.tar.xz", - "hash": "sha256-VMeu3w0exMzduCL4MwM10Mv07ED2RJmRXwD+8MAwuLE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kbackup-25.08.3.tar.xz", + "hash": "sha256-/4keGs/pu0IApPaBZUAlWbsAzs2HkTQc1NQClpVf/CQ=" }, "kblackbox": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kblackbox-25.08.2.tar.xz", - "hash": "sha256-fh+GT6gzJpOlE3WiDvxX1Nk94rRLhj/vi2ApFChZNiQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kblackbox-25.08.3.tar.xz", + "hash": "sha256-7wCVZaokDWZI4FF7vp7Sh7wfWkpEBdbyHT7t4+2/oV8=" }, "kblocks": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kblocks-25.08.2.tar.xz", - "hash": "sha256-VGwjpKn5b7PLTGjFvZlosuDdwX37vRjeHDPvM2YOnv0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kblocks-25.08.3.tar.xz", + "hash": "sha256-CRr+lf/Wh/tIU1d1X3QbRKQYCZOhZpUvtbopUO7OBK0=" }, "kbounce": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kbounce-25.08.2.tar.xz", - "hash": "sha256-4PVacun5C/s3yq6n08UTxbj/U/c51P4D//X17As6rbg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kbounce-25.08.3.tar.xz", + "hash": "sha256-8UGeSUSGMiO1ontayzIo61giS26vTwyUFkwEYaw9kBo=" }, "kbreakout": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kbreakout-25.08.2.tar.xz", - "hash": "sha256-R8dSNSna4mN2vizPmOteMW7oVqrFLjamurUepf0+7gA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kbreakout-25.08.3.tar.xz", + "hash": "sha256-BYvwHpN/rc0ykS6ARVh1ZulPfAXQrXE/TmXW01GwT0A=" }, "kbruch": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kbruch-25.08.2.tar.xz", - "hash": "sha256-sLTn/am2A7rMLGKau82RQGnGxkonQX+tIjzYMl2j0Sw=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kbruch-25.08.3.tar.xz", + "hash": "sha256-j9VTZXEbvtWe285Mg5fqPoMWyASGYnyiky095Eg7s1w=" }, "kcachegrind": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kcachegrind-25.08.2.tar.xz", - "hash": "sha256-jVDAcaI9tirOzfItbpQ5aqA+TV/5esx9K+hIY7NPv8g=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kcachegrind-25.08.3.tar.xz", + "hash": "sha256-rsg436gGtDjRmPW7ZqKpkl7NuG0J2obFk6ITAgUrC74=" }, "kcalc": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kcalc-25.08.2.tar.xz", - "hash": "sha256-kn1cs9Z+MS8UeAWYhvsXqH9iGKArOFlN8WQ/fFi/B4E=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kcalc-25.08.3.tar.xz", + "hash": "sha256-DoQslASW5H9avR7GCB9cbPKIvh3XPttQcdhPBOyhg4o=" }, "kcalutils": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kcalutils-25.08.2.tar.xz", - "hash": "sha256-t7YK2AjaF3f2+QWzPodNp3oG4L0jVb9XejDpTjDGCKM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kcalutils-25.08.3.tar.xz", + "hash": "sha256-zqA3tnpRC6TjwJE6kLor/3JAcLKSUSSN8jr1+wuxii0=" }, "kcharselect": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kcharselect-25.08.2.tar.xz", - "hash": "sha256-3RUCQnrobAS5PVPUwrqQaaYMtSZ21CAQtAMdGQghjlA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kcharselect-25.08.3.tar.xz", + "hash": "sha256-r+4jbl4Dda7gOO1CkqOhiPpRJR2Sq46HLNn+cTzeOuM=" }, "kclock": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kclock-25.08.2.tar.xz", - "hash": "sha256-4u4DWOAWgHim49h2bntnOyLFvHhkASoFt5Je3bnpGtw=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kclock-25.08.3.tar.xz", + "hash": "sha256-2Kz8qjb/jdQk3oKuFja63Zqi9QpsTj41eI7VzDliduI=" }, "kcolorchooser": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kcolorchooser-25.08.2.tar.xz", - "hash": "sha256-tj/Nphft9sIOA6Qqh8zKB+C5pSKslGBV4/mPVjlDcxU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kcolorchooser-25.08.3.tar.xz", + "hash": "sha256-as7OA7OASmEIItBY+7vNq+w/4a2mqL/+1tNpUmkwvmc=" }, "kcron": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kcron-25.08.2.tar.xz", - "hash": "sha256-8Ity7bspzLYaizfEPC8lMDovNo38HT+cZfdDTpzRloM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kcron-25.08.3.tar.xz", + "hash": "sha256-UqVAID6bKN6+UkBefDEpzia1OvHdwXFlt7UlVcx1e2c=" }, "kde-dev-scripts": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kde-dev-scripts-25.08.2.tar.xz", - "hash": "sha256-4dcrwyEPtWjy7/2xuz+aWMTad4rxuksAXhOOmqF6Nek=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kde-dev-scripts-25.08.3.tar.xz", + "hash": "sha256-8J52s97VzHa5nCa8sCdVONWQJn8IySG1JAwISjy75H0=" }, "kde-dev-utils": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kde-dev-utils-25.08.2.tar.xz", - "hash": "sha256-JobJjo+CfOM3Rjp0ZVQ1djK/6aXfo6hOXFX273stMkc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kde-dev-utils-25.08.3.tar.xz", + "hash": "sha256-6BlfM4lgpNXvJHxmDkYrntQFPGB40jrtN8AptiWBKkM=" }, "kde-inotify-survey": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kde-inotify-survey-25.08.2.tar.xz", - "hash": "sha256-R75EgYmcWinoSEm5/1ZLQyBBhvwGnekCXqCUiY+8n2w=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kde-inotify-survey-25.08.3.tar.xz", + "hash": "sha256-s5wSm5a4CQT0p7X4KOzZiJHDK2G5SW6NYxBYnakeuVs=" }, "kdebugsettings": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdebugsettings-25.08.2.tar.xz", - "hash": "sha256-Brt+QdxF28yKOBwxbSPw+yAKnMbH8Zrrm021dg4e8+0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdebugsettings-25.08.3.tar.xz", + "hash": "sha256-dpkOq4FsRfEWyCMdsz8Wr5VezHM8TrfIn+g5d/MpPaA=" }, "kdeconnect-kde": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdeconnect-kde-25.08.2.tar.xz", - "hash": "sha256-5CRbagY9bfDhI/1nwGX1wkmU4hs0lYnNplleSAuRawk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdeconnect-kde-25.08.3.tar.xz", + "hash": "sha256-bkHx8i6F9ecKkt1so+aWg2SJbeN6/l2ut82lmfA+Xis=" }, "kdeedu-data": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdeedu-data-25.08.2.tar.xz", - "hash": "sha256-sTjppV2QE87JhoPVml0BD50xk9jOFj9Z1aYSa58B+m8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdeedu-data-25.08.3.tar.xz", + "hash": "sha256-cfhXK1fQ7bBzQp4vOUFFkRwINosgyqNoXPZMrbxvoqo=" }, "kdegraphics-mobipocket": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdegraphics-mobipocket-25.08.2.tar.xz", - "hash": "sha256-eZrzukGQMTOXOJMwZFw/oA9CkBf3M4QzyNSr7lWtZNI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdegraphics-mobipocket-25.08.3.tar.xz", + "hash": "sha256-pPj/FjInDBFpUJVzJmGZXZY5+DM8jWNzBlTXh9zDtVQ=" }, "kdegraphics-thumbnailers": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdegraphics-thumbnailers-25.08.2.tar.xz", - "hash": "sha256-AuH8XSp3rZxXFz3q4jM6Cj8ERG58z2gvH2awmQLwGt8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdegraphics-thumbnailers-25.08.3.tar.xz", + "hash": "sha256-FfwrsleMfFhGNTPr1tjU6j7D2er0fgT3TpMiwTXJfoQ=" }, "kdenetwork-filesharing": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdenetwork-filesharing-25.08.2.tar.xz", - "hash": "sha256-km5A7fwYnOWlBDwyO4NqzOoPXU+RFwj/QUWYQLmWYO4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdenetwork-filesharing-25.08.3.tar.xz", + "hash": "sha256-0s71ZEOEO4KlwhDsWm5MKh7RoqhtUX5Xc4VZU7qWpI8=" }, "kdenlive": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdenlive-25.08.2.tar.xz", - "hash": "sha256-RkUpuuXF++dHPb0DCPqMNYj2jye1yZZErRgynaVXuNk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdenlive-25.08.3.tar.xz", + "hash": "sha256-gbpOkRFH1dvTO89GSy8K6fV7iCTb/H+rIfPBG7ZDN4M=" }, "kdepim-addons": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdepim-addons-25.08.2.tar.xz", - "hash": "sha256-0UWCSIgZZTZgMFE+DheJzTiqB62Zfua3vB18Y42Wz4c=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdepim-addons-25.08.3.tar.xz", + "hash": "sha256-uqhcF0fJ54ly0aVNe7ezAN2/VAc0UsM4g1a8V21HnNc=" }, "kdepim-runtime": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdepim-runtime-25.08.2.tar.xz", - "hash": "sha256-wDD5iFTjHZJwcc1LS7wtl3ktTO+6xUiqbNddsGAlEso=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdepim-runtime-25.08.3.tar.xz", + "hash": "sha256-mLes8HJxZY09kWmlEWdlE74GWbc/XLH7RjCutU+mX4U=" }, "kdesdk-kio": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdesdk-kio-25.08.2.tar.xz", - "hash": "sha256-C5y8kWb0mC4JsQmNvLEB0xl5/08HLQ1kqepj9SwmSXU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdesdk-kio-25.08.3.tar.xz", + "hash": "sha256-QKNbsC0nMV0BKbgYHnpvy47k9MDMa4T4GMEPo/i31nE=" }, "kdesdk-thumbnailers": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdesdk-thumbnailers-25.08.2.tar.xz", - "hash": "sha256-WL9S2IGmTuQosO6dAo7f8G6+h9kiWE4m13r86B7Aw7M=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdesdk-thumbnailers-25.08.3.tar.xz", + "hash": "sha256-QWKweV1VrfvJ98G6jpZaYYqleygFiPQ9CkrbRc4I6HQ=" }, "kdev-php": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdev-php-25.08.2.tar.xz", - "hash": "sha256-7m4IJU6vEeZ97LsY5sFyxQMELahAOAmTgryhJm47mQ0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdev-php-25.08.3.tar.xz", + "hash": "sha256-9S7yko0u+dyyHzGtKNuc5DCcatT0+8ap0J6gc3KG1MY=" }, "kdev-python": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdev-python-25.08.2.tar.xz", - "hash": "sha256-ESl9BcQX+ecQjtOh8gVDbnWbqUWcPG9PlHNZ1nZRQsU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdev-python-25.08.3.tar.xz", + "hash": "sha256-VroTp+FyGuF6AVE4ZJ7270lw6Z1/9HMi8pamnxc0+z4=" }, "kdevelop": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdevelop-25.08.2.tar.xz", - "hash": "sha256-uHkj1tN95TiPNsLprmbhsJa59CW/n6D7+WNo9q9GWyk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdevelop-25.08.3.tar.xz", + "hash": "sha256-TSuSzzepozJN2RNwdcX1UgR72IpnNCCqFIT83nm6zpI=" }, "kdf": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdf-25.08.2.tar.xz", - "hash": "sha256-fFri8/WEG706a2XjBN+QUjAcY+Bj6dFeyf+oW34bAds=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdf-25.08.3.tar.xz", + "hash": "sha256-fldlaE/uQm/eytp6lJoXF/maikdnsv1mnJoDZrFF+mU=" }, "kdialog": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdialog-25.08.2.tar.xz", - "hash": "sha256-+cJGtN4tfkBqHJk2G41/qaOm1uzewuVVhmceq0zmQqY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdialog-25.08.3.tar.xz", + "hash": "sha256-0sn8M+y0ii0TVkO4PnALkhLR6A/WUZccA1v68yjfurQ=" }, "kdiamond": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kdiamond-25.08.2.tar.xz", - "hash": "sha256-ZpqXyFs43+4gmu2zWEP1oiDw8zPRZIp15mm7jLsb7e0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kdiamond-25.08.3.tar.xz", + "hash": "sha256-6iRNvZWgW+NJLqNH2wOFeAAuYCRa4EsJBt4MErgrN1U=" }, "keditbookmarks": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/keditbookmarks-25.08.2.tar.xz", - "hash": "sha256-wwkul/fh0cKxEUJvgT4frYjqc/zbn4vO/lRBj6LyLf8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/keditbookmarks-25.08.3.tar.xz", + "hash": "sha256-T1ehKu1z/OzDBZoGRZMdG4NrRCZxlClHY3QhMbIdOvo=" }, "keysmith": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/keysmith-25.08.2.tar.xz", - "hash": "sha256-ZiiqtMwrtCeLdNAeffv0KV113Ve10gqvPvCOWmDx4vM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/keysmith-25.08.3.tar.xz", + "hash": "sha256-wYi87L4GV7fNU6bcZKLyyvveFH58m9LJC1hFr9CMFSU=" }, "kfind": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kfind-25.08.2.tar.xz", - "hash": "sha256-HvgdtBOG/MaAXz/zf1AqY42kEJVNBQ+v40y3bCDu1QE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kfind-25.08.3.tar.xz", + "hash": "sha256-dW1PmJOSCGzSEVU9WGE9X+tBMQczuOo1xQxYaTgMlRg=" }, "kfourinline": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kfourinline-25.08.2.tar.xz", - "hash": "sha256-7I6wYJoswqS7FKz4MjTdNsRgYOHoi04VtfVnr/+VIss=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kfourinline-25.08.3.tar.xz", + "hash": "sha256-xVivDA8SiiV0wTNwsLIiWJ4tTKV4pUE6qDWmENyplxI=" }, "kgeography": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kgeography-25.08.2.tar.xz", - "hash": "sha256-V7sE53RPoB4rO5sqMy9DTHkgOUbg4yaNt5oC8intIj0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kgeography-25.08.3.tar.xz", + "hash": "sha256-jIBortFwkZanbey9t33GHyq/U5vzwrJgcCR1vy4sZ7I=" }, "kget": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kget-25.08.2.tar.xz", - "hash": "sha256-YhTVgBrOpaen8eh8JoxhdjchMpe9OqgXCKbpfDs3ch8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kget-25.08.3.tar.xz", + "hash": "sha256-veDkZTVSqOs5qNMiCs214QQsdv7XcbgWJ4lTPwOn440=" }, "kgoldrunner": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kgoldrunner-25.08.2.tar.xz", - "hash": "sha256-ePuHxhhHeX79SfLh0QeEu+ez/+TBiU6GXXwhjQcLERY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kgoldrunner-25.08.3.tar.xz", + "hash": "sha256-7l+twe+Oytb2acTGLnZ6NwrzQPDAkoL/m/V6gL+Jtcw=" }, "kgpg": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kgpg-25.08.2.tar.xz", - "hash": "sha256-OZTEwUaMAoaLWLImYLuqyEX9QgNIjWj2rJFcBKYWfEo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kgpg-25.08.3.tar.xz", + "hash": "sha256-5B6fbhRohlNM2G8UnlgWyiz2bavHuCTw81AGkxhC+K8=" }, "kgraphviewer": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kgraphviewer-25.08.2.tar.xz", - "hash": "sha256-bqzj6xA9HmILLYMuU5CTIwHc/aKgwUSdWyw2oVY3Kyc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kgraphviewer-25.08.3.tar.xz", + "hash": "sha256-jyT6eUpePzAig6CHv2y81QqYxAI646ol4ve0lx6oZgU=" }, "khangman": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/khangman-25.08.2.tar.xz", - "hash": "sha256-rIodkzSHyWdcaQp5NW2/BXXIjTSmWzby5vzGqgIMF/0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/khangman-25.08.3.tar.xz", + "hash": "sha256-tF9Vxx+l4tBbyPmM/anQduONRlwyXLQ9OZQu62dBr3I=" }, "khealthcertificate": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/khealthcertificate-25.08.2.tar.xz", - "hash": "sha256-bngpKnIR2pcd/jazEd9RcwDRvibhavaehlCUA9UPJ6U=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/khealthcertificate-25.08.3.tar.xz", + "hash": "sha256-bO0XoVXevMHhn0DO4sccX0g882bUgx3rxewyI/slbdo=" }, "khelpcenter": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/khelpcenter-25.08.2.tar.xz", - "hash": "sha256-63nlRUk3t7r0REJKwCqXV5q4B1OQjbvrVR7dcfZ4sNo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/khelpcenter-25.08.3.tar.xz", + "hash": "sha256-T7S7Qk2u8xUxtR0fr5NZTIdvMBwP0gsIzXiFwT1Jm6A=" }, "kidentitymanagement": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kidentitymanagement-25.08.2.tar.xz", - "hash": "sha256-15I5E6TYsNn+7L4th4Pd4PcRcLNRIzzkfdrL3bC965E=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kidentitymanagement-25.08.3.tar.xz", + "hash": "sha256-+7Ie/0TQAgZuOsSmkFrZFeetNVqn00+OYwcwizhP99s=" }, "kig": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kig-25.08.2.tar.xz", - "hash": "sha256-YNOAQBVvOwEmOI2UBegNRrUu/E+4lUMuTmGHnQuz+fM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kig-25.08.3.tar.xz", + "hash": "sha256-ETHgBXmdAOo0/q2zlMaPj7hrvbwBuYLNKjD3BsV1ToY=" }, "kigo": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kigo-25.08.2.tar.xz", - "hash": "sha256-lyv55XsYItZ2YmFl+/E7pBhidSe82VxgtbrI5M/3Jp8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kigo-25.08.3.tar.xz", + "hash": "sha256-BTrTCeGvGk9rQVOv7D/qqUhm+x6V08ag/FLH9jV/OTs=" }, "killbots": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/killbots-25.08.2.tar.xz", - "hash": "sha256-PhdZcV0F3Fz3OnJ646bEeqPZ0RI0fMehXk5ZelHgzPA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/killbots-25.08.3.tar.xz", + "hash": "sha256-yqVxIJ52AmiLaAS3o44ET9IkVhaOYdwXWFqBFWSqOqs=" }, "kimagemapeditor": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kimagemapeditor-25.08.2.tar.xz", - "hash": "sha256-+DnGsk2X0PDdqP4btWB9h+ya7kddRD8Fuj0e7J9dY1M=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kimagemapeditor-25.08.3.tar.xz", + "hash": "sha256-tmqzf7iiIBTjkxCY9fRU/TDJHHcr94sV1Hqm0BlMVpI=" }, "kimap": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kimap-25.08.2.tar.xz", - "hash": "sha256-/9Sud0FwN/NldnKqLKFBXQr1V64pwad6hJbmFqYw6Gc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kimap-25.08.3.tar.xz", + "hash": "sha256-1rgwfLK4gzqN9IW4d4PVgVGiiQW3tueQgnxSQzSJqz0=" }, "kio-admin": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kio-admin-25.08.2.tar.xz", - "hash": "sha256-tY42MP0RT5pEPXKcJjdAIT8QiAL2E2S5yVlZ0zi7n+c=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kio-admin-25.08.3.tar.xz", + "hash": "sha256-WrOsvyja0G9myC+mhqVaFKAT9cXFbsFgfKhHp/RtIU0=" }, "kio-extras": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kio-extras-25.08.2.tar.xz", - "hash": "sha256-ho+fLg9XJyU4fqMR8ZnS+gRKzANlbzdR58omQAhhN18=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kio-extras-25.08.3.tar.xz", + "hash": "sha256-mflm3MZjvoyzyQZ3jIKzLaSxeL0pbYzYW54/VujpwtI=" }, "kio-gdrive": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kio-gdrive-25.08.2.tar.xz", - "hash": "sha256-5sNxWCRU9TqbgH8ODDQMFV1h+so88aJHwY+g5PDRYyU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kio-gdrive-25.08.3.tar.xz", + "hash": "sha256-LA8ct2X1wA3B6f77GEnscJ4zTi9WGO3k3UqGzeLkS5M=" }, "kio-zeroconf": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kio-zeroconf-25.08.2.tar.xz", - "hash": "sha256-eD33N5dHimorDVSrxm27wZeKqKnaSCWxw8h+TYHrCrI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kio-zeroconf-25.08.3.tar.xz", + "hash": "sha256-3nuyMp3bkMBKjBt6t+EiXico7Yu3VUAp5LS0HkS1c+A=" }, "kirigami-gallery": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kirigami-gallery-25.08.2.tar.xz", - "hash": "sha256-t6orBu29tawT/o0ogVd4S0BlLEaResFP1ryMYosqEug=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kirigami-gallery-25.08.3.tar.xz", + "hash": "sha256-3+flmIXsSBpn6IeivvGgkSj8OoYuALRKTJYv2HJmFoY=" }, "kiriki": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kiriki-25.08.2.tar.xz", - "hash": "sha256-/F7pUItS+uwL8dzbRhcMCy7+erPzm3vfY3T7XOQIS0Y=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kiriki-25.08.3.tar.xz", + "hash": "sha256-gmEkYfdbe/aT9Vf5PbxsAncG+8Kv5mpcqSUWmWchYxU=" }, "kiten": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kiten-25.08.2.tar.xz", - "hash": "sha256-YeytqWt3xmvWJQBiIomo13Aaho73170w+mIIH7iDZXI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kiten-25.08.3.tar.xz", + "hash": "sha256-7pUwcbfbzCkMg32KHlF3ZCELpdWJim8VcAgTF28LvFQ=" }, "kitinerary": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kitinerary-25.08.2.tar.xz", - "hash": "sha256-4P2xwp88du5RlyeOVbasLB7AuB6Awmhb3TSzDLWSWG0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kitinerary-25.08.3.tar.xz", + "hash": "sha256-s3QG/balE1+8F8iMy38tCIjm1T4W9C2BlOphiRH0ciA=" }, "kjournald": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kjournald-25.08.2.tar.xz", - "hash": "sha256-JJU+F9pt+tjGN8ScimR7xim8aM9h8lDcEDbReJuXM50=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kjournald-25.08.3.tar.xz", + "hash": "sha256-Ce6AgQJxJgc/jP6/v7+Jh+PQsGEsHnxSXa3Tt8w6X24=" }, "kjumpingcube": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kjumpingcube-25.08.2.tar.xz", - "hash": "sha256-kf+2hyOpB2BJ2yyunbHBMBwSR/BMnfcPPdtNeoUI1aU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kjumpingcube-25.08.3.tar.xz", + "hash": "sha256-oAWb720t3hH0WNbd9NXqnoCfcyPC9nsEG9tByJr0QOM=" }, "kldap": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kldap-25.08.2.tar.xz", - "hash": "sha256-kgZ7nNBjw/2X9nBheHgZUbmmKGG/MWBK+/P9BMS35Uk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kldap-25.08.3.tar.xz", + "hash": "sha256-YheAQ/cjuVme+G1EZmJ9VTeAd4LJzu/kq3lZGxr3wDI=" }, "kleopatra": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kleopatra-25.08.2.tar.xz", - "hash": "sha256-FoNYJnSLT/+cuube0YGbGMNCL/YNohxqat3Sff7rT8w=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kleopatra-25.08.3.tar.xz", + "hash": "sha256-PC9lIH7KzW9yYx6DKpM0KmxDJg6JevzChdGAO1HMZ2Y=" }, "klettres": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/klettres-25.08.2.tar.xz", - "hash": "sha256-p7VvRvkeAnJGQrkys1AgubxlL+ARJuHwEfz55sxEkMM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/klettres-25.08.3.tar.xz", + "hash": "sha256-cGUurM+AAXa6P1Ep/ROoKSuXF8MISYgBtV5VOk8XmHM=" }, "klickety": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/klickety-25.08.2.tar.xz", - "hash": "sha256-JmhLJpoHKmdssz6KwkkCcoCvBvaEyilYq4b/8Zzn0lo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/klickety-25.08.3.tar.xz", + "hash": "sha256-/GWRi1rRBOVXLmG/xa+kbWi6MU0V8gjukGBEPJEv7Jg=" }, "klines": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/klines-25.08.2.tar.xz", - "hash": "sha256-CXCgFkpD0ydEF+IRKbqTQI29A8sizHeOEersrmeY7l0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/klines-25.08.3.tar.xz", + "hash": "sha256-CRE1uZF2YFpBpHI3L0umm8vqLzYFMTEEmu2ecYfJmnc=" }, "kmag": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmag-25.08.2.tar.xz", - "hash": "sha256-8zQ5mKa4hEU/yXOOek9WD3FuNKUyj58N8SXutTJ0wIE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmag-25.08.3.tar.xz", + "hash": "sha256-xDB5Dlk7g0ZXFyuUq9oP8MElv2rESUayR8c32yGqtGg=" }, "kmahjongg": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmahjongg-25.08.2.tar.xz", - "hash": "sha256-7ER5SNKpmgc5pjjpJIVi5FRQOXgFElXTMlCOnoTh3wY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmahjongg-25.08.3.tar.xz", + "hash": "sha256-KWpQulk5yUiDSoUU8u9rr7E3auUFpc+CmO7sMRnp8SM=" }, "kmail": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmail-25.08.2.tar.xz", - "hash": "sha256-I+Z9+IMbvLKh9SZA51CQBFW1FFl3VjwCFJWmL/MdH/8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmail-25.08.3.tar.xz", + "hash": "sha256-pUTofOL63026oJnAGKGeWTu7gC4KmTAWvD6RTt1qkfQ=" }, "kmail-account-wizard": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmail-account-wizard-25.08.2.tar.xz", - "hash": "sha256-dQeRJ0qN3JkUL0vd5lMixbmL7IY0puRxk5yVlI3lM7c=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmail-account-wizard-25.08.3.tar.xz", + "hash": "sha256-M2XxYVMgGinDF5mxCPwI4/aUwjOuFwQmiJ+BUcSYw0Q=" }, "kmailtransport": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmailtransport-25.08.2.tar.xz", - "hash": "sha256-9vnYr/JlTGqjE1gFlom5sQhGz+BeU0Rfy5WLKw/lt5Q=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmailtransport-25.08.3.tar.xz", + "hash": "sha256-IfuF62TtJcrtJx0plwDxBmqTQxKYZH9drDbotvMlN64=" }, "kmbox": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmbox-25.08.2.tar.xz", - "hash": "sha256-KImwM4BLm7vEzonJEmPx1mHmUZX9PnywKcza6vLhuSs=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmbox-25.08.3.tar.xz", + "hash": "sha256-MWGF+jh+OFYb3S4KC5hKP8AIMqYicdBtz+vOHcfwVYw=" }, "kmime": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmime-25.08.2.tar.xz", - "hash": "sha256-99K6VbOqEukEiSIJrZ/icc1aOljCnDiibdIQA6pVDq8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmime-25.08.3.tar.xz", + "hash": "sha256-H0/KO/+Zn9hNnPPYBz3308FpOthVS1YAF05KmqGDfwE=" }, "kmines": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmines-25.08.2.tar.xz", - "hash": "sha256-FWhc4f+cJOm+6U3rnDnTXyfnVh/LDdjN5W9xnqjw+sU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmines-25.08.3.tar.xz", + "hash": "sha256-mfDaPNivn6Y0qPfTTkM77bxL+9okiGzV4L3eSOCtSj8=" }, "kmix": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmix-25.08.2.tar.xz", - "hash": "sha256-YPjTZTDBdqImDq5nSqwuckFQjcrWKH/7v6r6V5QqZec=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmix-25.08.3.tar.xz", + "hash": "sha256-+EKMFgrbaM2foA026VQ65PRPNk/VmTJ+dpSrYzEI95w=" }, "kmousetool": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmousetool-25.08.2.tar.xz", - "hash": "sha256-5GBrMRCNh7v6c1oJ3P0AWEI3of+NcIxSN91mLQFK6r8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmousetool-25.08.3.tar.xz", + "hash": "sha256-edPgAyHPZPEONVe1MdELxYc11r6qI3JDv3mG43Ak4I8=" }, "kmouth": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmouth-25.08.2.tar.xz", - "hash": "sha256-FC72jT0PxfKA0geHYZVdBaa7tZ6yxZrX0wwAk/JTaw4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmouth-25.08.3.tar.xz", + "hash": "sha256-L+9tjvkyAqLaysO7l/AtN3kMxiFMxtlJY7G7M7Hu034=" }, "kmplot": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kmplot-25.08.2.tar.xz", - "hash": "sha256-Anyx9LAOPTpQYseR7pEIul6DcX/iMQ1vM9j87uoNkeI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kmplot-25.08.3.tar.xz", + "hash": "sha256-JCNo7aVqMy9SmVKvC2JYw67GpZuQNQzfb+/OoNpnuIM=" }, "knavalbattle": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/knavalbattle-25.08.2.tar.xz", - "hash": "sha256-An4NjaYLt44qC7j3tBAwtWxd6jxHtJOUyD6QTgtfdso=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/knavalbattle-25.08.3.tar.xz", + "hash": "sha256-DYbxF2HZhYrbqgFua+uGfibr+f9SsxLXnNIm/xi+1i8=" }, "knetwalk": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/knetwalk-25.08.2.tar.xz", - "hash": "sha256-v8GAwbqLVEzPC16JS9uyN5VAp3YxFrxWDiuaUgVBBPM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/knetwalk-25.08.3.tar.xz", + "hash": "sha256-z62yo0fxZqLOPpG2InFkXj7FSQb99tgCaS2aLhSjoW8=" }, "knights": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/knights-25.08.2.tar.xz", - "hash": "sha256-S3SYsOFeGYRiLK6tFiKZEbAyIVZawc35XCmWm5BK+g4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/knights-25.08.3.tar.xz", + "hash": "sha256-ygibJTDdrR6CVpWgVwnGi6pwO5lu61hjrSabY30RKD0=" }, "koko": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/koko-25.08.2.tar.xz", - "hash": "sha256-xhtQqEo94Iph7je7fmIER5X57EyGXrNXqFSSvRRSGn4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/koko-25.08.3.tar.xz", + "hash": "sha256-zWcEO5aclGnZ6cEGfPQsLqPiLgInq+86d2INj80ll1c=" }, "kolf": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kolf-25.08.2.tar.xz", - "hash": "sha256-0fLsgPZaEWVCtBECQfGdKT8Qhb+jV//OeglYp6TIx6s=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kolf-25.08.3.tar.xz", + "hash": "sha256-PZStjMm19A8cMJj7UPm1ZPbVlwhDaqo8G6ouXpR0UJ0=" }, "kollision": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kollision-25.08.2.tar.xz", - "hash": "sha256-WPQsUDkCUE5NhULz4i2dU7d/b4FEuVqlZxnG+E4/70o=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kollision-25.08.3.tar.xz", + "hash": "sha256-nfXBZsVK6K14Y8fxV06df7C2V8HfXNzuTk/1Dtyilzo=" }, "kolourpaint": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kolourpaint-25.08.2.tar.xz", - "hash": "sha256-Ltr6ld26OUX1TzTlxhgnLsrNTGDV9avnCBnM8Gz2Sc0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kolourpaint-25.08.3.tar.xz", + "hash": "sha256-7ffBmyNhxQ2VVknbE8/JOVIwi1mpQKCUWO2JjE6xtAw=" }, "kompare": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kompare-25.08.2.tar.xz", - "hash": "sha256-B46EKx+MKyfJwZUvoTRo4Luxa3cPy0KG6C/IkTlWk7I=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kompare-25.08.3.tar.xz", + "hash": "sha256-zkMG4+6PIQ0f64h+SZgVcCt9OMT9OioKp1BJWc1BT+I=" }, "kongress": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kongress-25.08.2.tar.xz", - "hash": "sha256-HCo0kD444lchYnb0vDhzL50Wvd0Lqk7G3vT5kEE1ttc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kongress-25.08.3.tar.xz", + "hash": "sha256-nX9eeJU1U6Z/GAPe57DG4xgmhtwXPHZU8j86wtxVVds=" }, "konqueror": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/konqueror-25.08.2.tar.xz", - "hash": "sha256-M29xFdQPIevLT/De9T6428ZRVEpbN9OE7F5xSuFfqKA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/konqueror-25.08.3.tar.xz", + "hash": "sha256-PPJVeXyJh2kuq+/pS4bibpSurJB/ZZMISOB/YQRMQmQ=" }, "konquest": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/konquest-25.08.2.tar.xz", - "hash": "sha256-0noUGcNQNv/pyzTzooafXo7PV40Bq7A9DVrRWiE93A8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/konquest-25.08.3.tar.xz", + "hash": "sha256-CpDVgw6MY22JJWByJS453CkPZ81ZC1yDv0W+RO/DXvk=" }, "konsole": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/konsole-25.08.2.tar.xz", - "hash": "sha256-Ig+0SgLl3TEQvH2KBPTXyRC8mbWxh3o2vv0G0eZf43c=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/konsole-25.08.3.tar.xz", + "hash": "sha256-CVp/8Q3zxwd5s1b7O1mEBiu8aYu+2WYjDj28z2rzZhU=" }, "kontact": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kontact-25.08.2.tar.xz", - "hash": "sha256-G31bfbQu2P8D3eWnpUm8/ni5o9t792zn7Tl+ZJrAeRI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kontact-25.08.3.tar.xz", + "hash": "sha256-qEEb6WO4KCFWcStbsgs93mo743dpg3VY5ZCm1e0Fsvo=" }, "kontactinterface": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kontactinterface-25.08.2.tar.xz", - "hash": "sha256-6l6yL+uHVMUO1KGn4WWYZ2wGtS15/mMln+/iHlLJcyk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kontactinterface-25.08.3.tar.xz", + "hash": "sha256-e1nQOAevvoku0A58Im/Yft6Mp+Ond6EcIoaYs9gFl4g=" }, "kontrast": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kontrast-25.08.2.tar.xz", - "hash": "sha256-tuyd5u/iPFvgx9lFqeLgq4bgP3+WQPwe+YFc+FZOBa0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kontrast-25.08.3.tar.xz", + "hash": "sha256-UgvgiPpNWS34GYRybm5Ti3hvOx7MYoE/soArpzh1nGo=" }, "konversation": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/konversation-25.08.2.tar.xz", - "hash": "sha256-Sg5j1we9Of9uqRXXVMvKKvEcqNapO7atEGrFbiK086k=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/konversation-25.08.3.tar.xz", + "hash": "sha256-XkW3jDLY9ydczcUNl4DFrpA0GO2MeXTV2Ylo3DaFgI0=" }, "kopeninghours": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kopeninghours-25.08.2.tar.xz", - "hash": "sha256-D605x3tytxSpxbax4qsP2NI+8Uib/PvfG0ff6pmMcUM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kopeninghours-25.08.3.tar.xz", + "hash": "sha256-DmCIXSzbiP4L9C/jnwHJ4oTddVcnxYVxSDLrqYwRy3M=" }, "korganizer": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/korganizer-25.08.2.tar.xz", - "hash": "sha256-kGDTsN99L6BpkaPh6z+q6lYRj7kZ3L4wTFWh3zNNTEU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/korganizer-25.08.3.tar.xz", + "hash": "sha256-YqGg0VhbkthlL/GU/Mlrsog7zAGOy9T16u9ukPawuXU=" }, "kosmindoormap": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kosmindoormap-25.08.2.tar.xz", - "hash": "sha256-Oaf0CUc1Kj5EnO+ARfeAqU1a9NleGAD2pjGaZSkoMZs=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kosmindoormap-25.08.3.tar.xz", + "hash": "sha256-Giziw+UUv+Aeex/elDvwmRIcrYKoj0RL2sA7V1Cb498=" }, "kpat": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kpat-25.08.2.tar.xz", - "hash": "sha256-esAFdA2SXLEsrCrb/k8YwFLuE/V+C8y5gm7RijH2DZY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kpat-25.08.3.tar.xz", + "hash": "sha256-ZeAz17mquql1cBLUtQurzJG1wslBdMM05wQ7Z4WDJu4=" }, "kpimtextedit": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kpimtextedit-25.08.2.tar.xz", - "hash": "sha256-jZVgQsnSVZoOFpU6OAtD+QdqTAnueYofNcCL2h2lx7E=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kpimtextedit-25.08.3.tar.xz", + "hash": "sha256-Qpv/phStKz6nQkcCwcSBL4zC5C7iEM1av3yd1//kbUY=" }, "kpkpass": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kpkpass-25.08.2.tar.xz", - "hash": "sha256-RZnluLHbBHxHTMTPWiO/fUloCCdCmGJEoTh1q+hjQfM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kpkpass-25.08.3.tar.xz", + "hash": "sha256-OAKm8j7dkBvpdcA7PrY+R46ThDhtiDsiiftZjt8+dYs=" }, "kpmcore": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kpmcore-25.08.2.tar.xz", - "hash": "sha256-OQJDaeAQARGaX+ylwjD39y6ktiX08nZ8SPbjPAepVVU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kpmcore-25.08.3.tar.xz", + "hash": "sha256-QwIiSYs6DdS7YdryYfBkg4+NHoNzMGOk9je1knHtaOM=" }, "kpublictransport": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kpublictransport-25.08.2.tar.xz", - "hash": "sha256-st7J5F/WMcjW34HAjUufRwbuPUeBFlQxoEpLTAyMLtM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kpublictransport-25.08.3.tar.xz", + "hash": "sha256-7Yh98j0EoevRcbWcmd+uwm1iJU6aesT4pwhLowFYbBc=" }, "kqtquickcharts": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kqtquickcharts-25.08.2.tar.xz", - "hash": "sha256-hpkzB8squHs1bX51SuAvSuBJ8ekigMcrzOEoexJmthI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kqtquickcharts-25.08.3.tar.xz", + "hash": "sha256-jympyxr341HoW7d+ZtCC0wToWdJbtVDnTWX3WfARDBE=" }, "krdc": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/krdc-25.08.2.tar.xz", - "hash": "sha256-4y1lDpMyV1ZuDBuErgz87W3WpN/zOgR5Wk43W/hwXno=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/krdc-25.08.3.tar.xz", + "hash": "sha256-qjF7iiHANitt3WnxIsoX9ETt/uui9CK3XOUcZmlQkGo=" }, "krecorder": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/krecorder-25.08.2.tar.xz", - "hash": "sha256-BZWm2fMYmGn6sVtu3zyOlAL9oEA1hdXXfKO5zo6yCNE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/krecorder-25.08.3.tar.xz", + "hash": "sha256-Mnj73af7xEC2+SK2RKyNMtzGPU1EO3ecwssIMXomM2E=" }, "kreversi": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kreversi-25.08.2.tar.xz", - "hash": "sha256-NCj2A/q58mHBwbn5J5ZpB7Pkrx1fuz5002ecbiBiLSk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kreversi-25.08.3.tar.xz", + "hash": "sha256-gf/rj2ABjRLqKCvgKhd0Xkv2ofFsBnWulyG9+cNSlSQ=" }, "krfb": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/krfb-25.08.2.tar.xz", - "hash": "sha256-iBuKQpM+LVfMGZ1jq59KuQ9WeqX6Kn9JzV4RQ64rKNo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/krfb-25.08.3.tar.xz", + "hash": "sha256-4S+HkIm2qdS4/HK4IB5SIj6kUGZNKLo6Qxk6Yeud/0I=" }, "kruler": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kruler-25.08.2.tar.xz", - "hash": "sha256-m/X4uMG0zOER3PHys7I8EJUYcGuglewKAyoeHI7SSCE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kruler-25.08.3.tar.xz", + "hash": "sha256-lrIrTlkMtnaGcfEZlOENqUL4JS+sYvq57/0VYR0seaw=" }, "ksanecore": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksanecore-25.08.2.tar.xz", - "hash": "sha256-i62zyKTV1GapIpvEbrH0+woW84IAjmOZkDQT2PoKmLE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksanecore-25.08.3.tar.xz", + "hash": "sha256-4VZZmUGT7mDSn64J4n0uRT/DLkSfr4gIpXysip6rqZc=" }, "kshisen": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kshisen-25.08.2.tar.xz", - "hash": "sha256-pTDUxgJmT8AoSA/M+7zzzjACMWNS2r7SkAJUkRPoGqU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kshisen-25.08.3.tar.xz", + "hash": "sha256-0P9OhTLCd7Mptkd25Ye/dacIbX20RkL3cCve7GcIHqg=" }, "ksirk": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksirk-25.08.2.tar.xz", - "hash": "sha256-ZxJoE+D01cb91gDyJxsPSJmfm9LQwj0Xpugtrd7VgZ8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksirk-25.08.3.tar.xz", + "hash": "sha256-mSoRZ1ldy2px3lORdTFeQ0W3mSYu6Wa3UYv3c21N58Y=" }, "ksmtp": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksmtp-25.08.2.tar.xz", - "hash": "sha256-iF+C0SgxTPThJouZd0bDXExHspJmMkbNjKP7+Eqm2fA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksmtp-25.08.3.tar.xz", + "hash": "sha256-FQdBgHcj8c7ka8HoY5TXhf79ffgiUj1f5TgyouQVzOY=" }, "ksnakeduel": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksnakeduel-25.08.2.tar.xz", - "hash": "sha256-LyFMQpXR5o+bufyNNaIjVzHPbAmUBBYr82xU1Ugsy1I=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksnakeduel-25.08.3.tar.xz", + "hash": "sha256-G/5kAJ9iPfUDr1cZxzquUJNO31jBl3RjGGp8/8mjxsY=" }, "kspaceduel": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kspaceduel-25.08.2.tar.xz", - "hash": "sha256-9vEntOUi6jJ4v3r8WNYmmxSVWMowt8SZ2/sii97d8Ug=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kspaceduel-25.08.3.tar.xz", + "hash": "sha256-txLcpESv/zejpFdAwDcJSHwjaj+cjb4NiaezzFPz1P4=" }, "ksquares": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksquares-25.08.2.tar.xz", - "hash": "sha256-l1VFaidEq1YNqI10vawKQa7QuDMJCDLyz7LklL2ojdE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksquares-25.08.3.tar.xz", + "hash": "sha256-Wnc8jDtRj6LMXYzfvlBe6C1sDCvSeCiTeyKXcwrdtc8=" }, "ksudoku": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksudoku-25.08.2.tar.xz", - "hash": "sha256-PTSj/+mLMgaieN/dz7QQw6pH18s9xLF3oT2/OtQixRc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksudoku-25.08.3.tar.xz", + "hash": "sha256-1XexTOqFRtyLdIC1K5PT4LV+coySYjfVxoQQ7Ll9vdQ=" }, "ksystemlog": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ksystemlog-25.08.2.tar.xz", - "hash": "sha256-ou6JXgOweo/vK4iIaWo34nv9ItDZ1vQkj024B0ED7zw=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ksystemlog-25.08.3.tar.xz", + "hash": "sha256-41APVe04Ju1RhPzzd6R2ISHTbTBIso9DfVLeZZKzPnE=" }, "kteatime": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kteatime-25.08.2.tar.xz", - "hash": "sha256-sk+Wq6kwX/yEqt9BKsj4O5ehPMySTMrfc4srd6Dotjw=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kteatime-25.08.3.tar.xz", + "hash": "sha256-aKghjWcg/U4zlTJwdZbX0e7l7xizFE448nZW8Ntqp80=" }, "ktimer": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ktimer-25.08.2.tar.xz", - "hash": "sha256-stCkPaE7XECnso9xa/7wTC+hM9Vl1ng8d6dbAv39i68=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ktimer-25.08.3.tar.xz", + "hash": "sha256-pLQm1jQcE9i0yYO2JBjK2npmA8c4E1chOgPIXfmF4hg=" }, "ktnef": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ktnef-25.08.2.tar.xz", - "hash": "sha256-v+lFg1qWMJSghJJ9xkcO878j3dsbRJC+ZB2pwrAyeMc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ktnef-25.08.3.tar.xz", + "hash": "sha256-cBVHeVARnN252bTmuUMGsbaHb0YE9Jb+voJMpicF4hM=" }, "ktorrent": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ktorrent-25.08.2.tar.xz", - "hash": "sha256-m6Ku92a7EnBcHNEnHaK2NZpxslo396QxQHti+OsV4r0=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ktorrent-25.08.3.tar.xz", + "hash": "sha256-YsslNCYnT3YZYCgn0d4kaf/+2kN+9dlNyqTXyi3/TT4=" }, "ktouch": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ktouch-25.08.2.tar.xz", - "hash": "sha256-DgY7FX5goroYjH6oWB+zx6J85fqg2nxtZjPknke9p4U=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ktouch-25.08.3.tar.xz", + "hash": "sha256-RxvGm+NjhpVzekatA4FHHVLy/desOfZIaxgIChqZ+Bw=" }, "ktrip": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ktrip-25.08.2.tar.xz", - "hash": "sha256-DwQm3LD8tQa5BakTSzY6X1f9esKzscVNBB5YGYAclX4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ktrip-25.08.3.tar.xz", + "hash": "sha256-67XWgzjhKR80NFaRfB0nfelXJWRjv390MAXUUnUCIL8=" }, "ktuberling": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/ktuberling-25.08.2.tar.xz", - "hash": "sha256-54aMMBo2G8NG5wxpJUnYdFJFmU7ZNAl5CB9BvwtpLlE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/ktuberling-25.08.3.tar.xz", + "hash": "sha256-kn2uK63lPdEODGRlKSX34qr94ELSTuc8McfguntAYU0=" }, "kturtle": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kturtle-25.08.2.tar.xz", - "hash": "sha256-Ye/bDT78I8F8YlcSeNLc6LEANOMg/aKdTn9pmzN4u9k=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kturtle-25.08.3.tar.xz", + "hash": "sha256-niNZcCEncHPReW2prJ7ejD2G+huipyN+NyvBGuJrDgs=" }, "kubrick": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kubrick-25.08.2.tar.xz", - "hash": "sha256-SmMwjK7l9kxcpFe2vKi/8wnu5d8/MLoJ2hNqGNBNhUY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kubrick-25.08.3.tar.xz", + "hash": "sha256-wv90F0c7FKK17TONQ5AnsHGdM8CNnflPOa0SGfLsmRI=" }, "kunifiedpush": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kunifiedpush-25.08.2.tar.xz", - "hash": "sha256-KlxqGjB0dMqVAreaZf0c9GYhguCDGkfQOLBkDCBXiDI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kunifiedpush-25.08.3.tar.xz", + "hash": "sha256-6MkkQ41TWfD6CTCrNREQEgduOg/06VnWkpWVVxODMgo=" }, "kwalletmanager": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kwalletmanager-25.08.2.tar.xz", - "hash": "sha256-uqll+OnUbp5MKwzPqxn0KvAVaDJGNkrbstYzSffW+3I=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kwalletmanager-25.08.3.tar.xz", + "hash": "sha256-VLa2PrVf1VTTEhUxnCC7r9Lhv5SKtrT6TYS1YUttxS0=" }, "kwave": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kwave-25.08.2.tar.xz", - "hash": "sha256-4A4alB1WAj1QPt7G0nRozvLcF5T3IQKACiRJ3U8Mlwo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kwave-25.08.3.tar.xz", + "hash": "sha256-SNx4aADdyclG/OxxJY8896Ot7pHBMEuF2gVtJs6MolQ=" }, "kweather": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kweather-25.08.2.tar.xz", - "hash": "sha256-aB1RpiWotF09h+QnYZpeGMteME6Ky/esKHcH2Rtyw+s=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kweather-25.08.3.tar.xz", + "hash": "sha256-KNoeLq1scm5iMiMOqo8eDluaa5C3VgMOx/kVHRkNcy0=" }, "kweathercore": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kweathercore-25.08.2.tar.xz", - "hash": "sha256-DRSR2AEa6T1iku6bjie5YTiVM7K+/cVIIZ9fQtHsDRU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kweathercore-25.08.3.tar.xz", + "hash": "sha256-aTVzoCRb9l2s6rEnrEXJrPuznmt8UW2BevVBzTElsls=" }, "kwordquiz": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/kwordquiz-25.08.2.tar.xz", - "hash": "sha256-vvWWexyIiySBx36rX1HxBiOEvIYiirtBmF9TnoUl0j8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/kwordquiz-25.08.3.tar.xz", + "hash": "sha256-FD3tCu6gIDbeeq29O2zoENAGanPcyC02excZYqgSFoQ=" }, "libgravatar": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libgravatar-25.08.2.tar.xz", - "hash": "sha256-K9uwLdAQIwdbkDJBFCTUFazYsiolpKLgSs51khJrweY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libgravatar-25.08.3.tar.xz", + "hash": "sha256-lMd3JgKzraqLTUSiJ2mdlDCXAFrr/u9WPK6tt15vI/s=" }, "libkcddb": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkcddb-25.08.2.tar.xz", - "hash": "sha256-lgI1UJaRwh39juHFSTru5YWRK98YBqa0tZuPafmVqnE=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkcddb-25.08.3.tar.xz", + "hash": "sha256-HYXr8890TjVv8g/fADgyeUT+pDN4Yo2jvYuZDmXTdpc=" }, "libkcompactdisc": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkcompactdisc-25.08.2.tar.xz", - "hash": "sha256-dq+OIjKMN5hFpLxS1csdH2Bllz8stTGDUwK8pSjMZyg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkcompactdisc-25.08.3.tar.xz", + "hash": "sha256-PXqeirTcFJcIukWb7gumW+hU6ux4yX97p/j2YyrjhnA=" }, "libkdcraw": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkdcraw-25.08.2.tar.xz", - "hash": "sha256-CuQpKsI3YpMXGSUubaHgRDkNTwuJtOaBsSuH5q9EnSA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkdcraw-25.08.3.tar.xz", + "hash": "sha256-Uvp40BPhPHLGL7TWho7xCowR2JlIptJEFWR+kXqnLN8=" }, "libkdegames": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkdegames-25.08.2.tar.xz", - "hash": "sha256-Q/PP34LkbAdkrHeb/L48eHKOyfiA5x/PWH+zwFGV9Oc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkdegames-25.08.3.tar.xz", + "hash": "sha256-RvMFZ3+zeXjGtHvRerZVO1chUaYymbt7jccY03+0SKQ=" }, "libkdepim": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkdepim-25.08.2.tar.xz", - "hash": "sha256-k2tPCnF3aFQttGnj1Z/x5FB1XSTaNBWaPQFtu6JcvSg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkdepim-25.08.3.tar.xz", + "hash": "sha256-OspVtxvjWrNpkwXy9/x2bUvQDETrt2Mb/WQcEkzQsek=" }, "libkeduvocdocument": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkeduvocdocument-25.08.2.tar.xz", - "hash": "sha256-1lHduat2IaOR2pW8YvnR1zVOIcbaVius51z20lJcCt4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkeduvocdocument-25.08.3.tar.xz", + "hash": "sha256-tNzEPB2PcR1bmsCinXji7HcQtbzYDx7GJTTosbDr3cU=" }, "libkexiv2": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkexiv2-25.08.2.tar.xz", - "hash": "sha256-G4rqeHNmYq8X1q4DkTRZM3VPmM/8oVNSBIE+sn7/YiI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkexiv2-25.08.3.tar.xz", + "hash": "sha256-CAaJhVS2Km+DTTO7SBkj2CvekbFpK6exRv7JS5pQPQM=" }, "libkgapi": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkgapi-25.08.2.tar.xz", - "hash": "sha256-hQrGcoBVEPy7aKg4SiEsOMP/7COOWIebxVt0keLpAac=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkgapi-25.08.3.tar.xz", + "hash": "sha256-WmWQ2gTPSgw7U/Kgx9fJfN9X9jhUoKSXjAhZJDv70V4=" }, "libkleo": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkleo-25.08.2.tar.xz", - "hash": "sha256-vGuWNkTUx8AAAtoN8UPIze2k0/EusUCbZyEvq93g17g=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkleo-25.08.3.tar.xz", + "hash": "sha256-BVOxiilctfv/X66ZA0p4KuTQfUPSwWN+r2ejHKZQuBY=" }, "libkmahjongg": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkmahjongg-25.08.2.tar.xz", - "hash": "sha256-yZl1Nl3DRkvO16RnBW3KQ9XxdHAXgz0/Vq0RXKGoBww=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkmahjongg-25.08.3.tar.xz", + "hash": "sha256-SC+c76Nbpi0ScbOpsvC+zPDpVOt/2ECmHeTMSxi9xlc=" }, "libkomparediff2": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libkomparediff2-25.08.2.tar.xz", - "hash": "sha256-TVM+fXS+K2EnvZBvpNff4ejrRZ6QhnfmQS6L0LShwac=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libkomparediff2-25.08.3.tar.xz", + "hash": "sha256-bpNvhmHzNsuaz/eeJG4d+yhPnNVmoBxlq1oliec2yew=" }, "libksane": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libksane-25.08.2.tar.xz", - "hash": "sha256-2mtzd2CfB4lgB9sF4zIykbsW/NLWzZwsG1jg+Zn/ujM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libksane-25.08.3.tar.xz", + "hash": "sha256-cwv078ybgjupjGgUkuQTk3mrDD5gLh5u/ynATxdtb2g=" }, "libksieve": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libksieve-25.08.2.tar.xz", - "hash": "sha256-nw7m3ljGe4FYhz6X6GmUojjLYrkeW5HQK0BB6WbOJHg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libksieve-25.08.3.tar.xz", + "hash": "sha256-bgZj63oMQAfFZE+rg8Q2cTO7YbeuO3J4vINpcXdf/5k=" }, "libktorrent": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/libktorrent-25.08.2.tar.xz", - "hash": "sha256-RdgIjGzXU3iDZn4Ry/6Tf5ZMvYBw196l05vZOhG1WDY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/libktorrent-25.08.3.tar.xz", + "hash": "sha256-z6TZb062gnpK1mzAr3JNF3PLUW3uKYgjIEzEXgrRzWk=" }, "lokalize": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/lokalize-25.08.2.tar.xz", - "hash": "sha256-DjrFQUgDyJAe9KSOivqT4qWHNtX9OxTFEdbZ0gGNMNo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/lokalize-25.08.3.tar.xz", + "hash": "sha256-B54/zaOnTvessbMGPu6xAjfnNkZr1JlTdipl0I7xFIM=" }, "lskat": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/lskat-25.08.2.tar.xz", - "hash": "sha256-8qz6IhIZWoZj+btqE1H9RTeQ9er+dOm0VnHrYfI8IoA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/lskat-25.08.3.tar.xz", + "hash": "sha256-lTKIRVfvJGj4K2WmzlT9y8DfPKGS/njKy44k97coKb0=" }, "mailcommon": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/mailcommon-25.08.2.tar.xz", - "hash": "sha256-6miyUOO6PjsiwhvEDOTtQBUC0eWejtz3DFsfydSzTcc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/mailcommon-25.08.3.tar.xz", + "hash": "sha256-PEaG+HOUDgC3UlmT+s1aU+LH8tlECMb2inaqE7EXQ/o=" }, "mailimporter": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/mailimporter-25.08.2.tar.xz", - "hash": "sha256-z++flxJoJFGItEFfjn0boPfvqPmSXHpNsIhzZ/IPuEg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/mailimporter-25.08.3.tar.xz", + "hash": "sha256-8MsBq+JLOlMydW3tUZMSgT/w43lx1r+xk3wLe8xv2qk=" }, "marble": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/marble-25.08.2.tar.xz", - "hash": "sha256-ZV1wp2j/xn1dPy2CAAXepX/5r10Jg346urz/Evy3df8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/marble-25.08.3.tar.xz", + "hash": "sha256-ZcA02sx6LVu/U0/KZXQonosdvyvVDk9j/00atk/wcZg=" }, "markdownpart": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/markdownpart-25.08.2.tar.xz", - "hash": "sha256-8I1iQ2m+EP2VY6Ofatb88gDgmfD4Ov45AKhPeE7k50I=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/markdownpart-25.08.3.tar.xz", + "hash": "sha256-WVJLI3e+0JYjSotHHzwXVFU9HT8SI53rN3ycAtVDZT0=" }, "massif-visualizer": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/massif-visualizer-25.08.2.tar.xz", - "hash": "sha256-88nqICyX5ajDQ1pc0op5blDT9Fo7GNzJXwWQy8uSmhQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/massif-visualizer-25.08.3.tar.xz", + "hash": "sha256-Bx3Rj+LLsJIkmDpmByXVlvCbauZwM+7ATilZQbQAZ3U=" }, "mbox-importer": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/mbox-importer-25.08.2.tar.xz", - "hash": "sha256-J58Kp9PpK8qtVym/UP728LQ9WOMhwoJ96y/Lnm9vz2A=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/mbox-importer-25.08.3.tar.xz", + "hash": "sha256-vULK64dpOrPKzHxC2flA4iyHWvTU0wSyZWCT3kjZuCI=" }, "merkuro": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/merkuro-25.08.2.tar.xz", - "hash": "sha256-6n6ZhJO8a0bnNyMXO1882rOclclcrpA8sXz+KoeOs0U=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/merkuro-25.08.3.tar.xz", + "hash": "sha256-oCHLfVogUZN1pWv/hUH8Kzvd1evkhaub0l4wayETEq0=" }, "messagelib": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/messagelib-25.08.2.tar.xz", - "hash": "sha256-RkVrc9bN0QxdHduP5T/A/2HhzjjJXC/CEpnb6eSmR+4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/messagelib-25.08.3.tar.xz", + "hash": "sha256-p8h4gwpdeQdSyYs9lWPHbhowtqKM7FPL1Ka2ATL1Z/g=" }, "mimetreeparser": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/mimetreeparser-25.08.2.tar.xz", - "hash": "sha256-+jLUHCaEdMDkUk9WXEgyXl0dkIJ5bdZ2CKm+pRRr7bI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/mimetreeparser-25.08.3.tar.xz", + "hash": "sha256-6hbPP8h+HKlQpBSUvRbvoHBdAGG1W1RaiZeYQ8g1uXc=" }, "minuet": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/minuet-25.08.2.tar.xz", - "hash": "sha256-qV49m/Of++FJ5vy5pk5Cv1+7V/FyPriSGKDlaoB0iEo=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/minuet-25.08.3.tar.xz", + "hash": "sha256-ECs5JaDltDem8+Ezq8roZ2I4lyqdaMRmbBqnblG5ukQ=" }, "neochat": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/neochat-25.08.2.tar.xz", - "hash": "sha256-VDkkfJtnT2/U9yQOlJitwhlyxvw1BCrrs0K8/K84Q/U=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/neochat-25.08.3.tar.xz", + "hash": "sha256-X62WRyoLV3qfK9fMVe1/b0gcRIv3duPVlsoJV6/MjDU=" }, "okular": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/okular-25.08.2.tar.xz", - "hash": "sha256-3kAc00N21nihajYUc1FIRPeIALOY47Dba96FoJ5jU5I=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/okular-25.08.3.tar.xz", + "hash": "sha256-Ay496PxUZ5YUGFlpEYjm+ALG3kmLZczLzmCqYNhlcU8=" }, "palapeli": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/palapeli-25.08.2.tar.xz", - "hash": "sha256-EF2bCUncy3yN8hbvoyMgHlfLKfoY70sE5kjC6yZn1zk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/palapeli-25.08.3.tar.xz", + "hash": "sha256-j8fuZ+QiXLEvFh4ePo3evMLuH1Bo/eEM/QbuWkFgiUU=" }, "parley": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/parley-25.08.2.tar.xz", - "hash": "sha256-WUmrWVoRgeYYheHfCkOIzpq5FrRh6a55w+cCjFIxjhQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/parley-25.08.3.tar.xz", + "hash": "sha256-BMtueE6ChA1sp3mvriE+baW/7k3Kgrl3Er+4/RrFBWQ=" }, "partitionmanager": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/partitionmanager-25.08.2.tar.xz", - "hash": "sha256-gRfiToA45dMk7pNCnxeslklg40aFTCYut4MNhWrZBHs=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/partitionmanager-25.08.3.tar.xz", + "hash": "sha256-19HbCJIZgzqVzt0yp3hZxziuzqh6smc6ym5oCaH3sXE=" }, "picmi": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/picmi-25.08.2.tar.xz", - "hash": "sha256-GIqd3LbO/COPRpafbTQiHOLXUJVb2oFynhsBITY+sh8=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/picmi-25.08.3.tar.xz", + "hash": "sha256-3VzAh7jTcPHiWpNvsKjqzupoel/UnzDQASNItedoqXA=" }, "pim-data-exporter": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/pim-data-exporter-25.08.2.tar.xz", - "hash": "sha256-m45H9SxFMmLJOaT6pKP4zEmd2RgFZMBHdRtsWp3wTyc=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/pim-data-exporter-25.08.3.tar.xz", + "hash": "sha256-dHbHp7hZT53QhllmCh7zBCDIDUiWFIkjDMhQVosjags=" }, "pim-sieve-editor": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/pim-sieve-editor-25.08.2.tar.xz", - "hash": "sha256-+6zJfq56Br9N8Rqc3rvJ+lainoz8zABylY6OJKN0YnU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/pim-sieve-editor-25.08.3.tar.xz", + "hash": "sha256-nqMohVofxgLs4gvODqLJ4zHzvkFsbmro+YUYsCkqJoQ=" }, "pimcommon": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/pimcommon-25.08.2.tar.xz", - "hash": "sha256-3jQUmUBvMX2v6fo+XutgC70Oxp804o6OC7j/2r6OlQs=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/pimcommon-25.08.3.tar.xz", + "hash": "sha256-/oIGtot4tVXO7YPPLmjlNIQGxZrBW8Qzkotlv56He4g=" }, "plasmatube": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/plasmatube-25.08.2.tar.xz", - "hash": "sha256-TE8PZNcu4YvsAzNvs5G9uX54AKKqgLcZXmjnsNYlAlQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/plasmatube-25.08.3.tar.xz", + "hash": "sha256-qJ4ZBtN7Fvp2+ACWQO69jj29hzp+tjly594Jhj6MO1g=" }, "poxml": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/poxml-25.08.2.tar.xz", - "hash": "sha256-tCJsUSeByP5roUMZHzS0lUeuXysB1ISBqrqYQpi3ftU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/poxml-25.08.3.tar.xz", + "hash": "sha256-EpZ7UxNgVADo3jzzlHgTb1tmFrK0V3TcGFu2tcuue30=" }, "qmlkonsole": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/qmlkonsole-25.08.2.tar.xz", - "hash": "sha256-vskxw9ASMG/BaH8BBjF+jrnl+d9TeLUGiJVYmqyGjbI=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/qmlkonsole-25.08.3.tar.xz", + "hash": "sha256-SFD6lJeC2zMctKqFz2fXJ+3YBrd3Gr6C1KfVag6+/E0=" }, "qrca": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/qrca-25.08.2.tar.xz", - "hash": "sha256-A2VLarfZSiSj9ysHaUwpHHjpguo49WNY1aSJ4dwuFwU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/qrca-25.08.3.tar.xz", + "hash": "sha256-6lwXkYjD2pI5o1Ayw2USltVXtT2r5RNNpMFNi+qCMtc=" }, "rocs": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/rocs-25.08.2.tar.xz", - "hash": "sha256-BL+zxhB4ZTvHiZTSNiK6Qt08sDUJoMIhhXg5UfH6blU=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/rocs-25.08.3.tar.xz", + "hash": "sha256-R6dDofPt1J2LZwKjXyoOBV0E4FB7/wCf/dteQmEySss=" }, "signon-kwallet-extension": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/signon-kwallet-extension-25.08.2.tar.xz", - "hash": "sha256-amAuEs3fuSZqOLVID6yo5LeJkrhASqLIspsGl5qm51w=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/signon-kwallet-extension-25.08.3.tar.xz", + "hash": "sha256-R+ee39uX2SQOIu2fpiTrrDzSGeSi7ncMaGm4abU7mv8=" }, "skanlite": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/skanlite-25.08.2.tar.xz", - "hash": "sha256-YIJ16zKwEcfdNAARieNLADr+iblM3d8Uq5m4Dw2ICKg=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/skanlite-25.08.3.tar.xz", + "hash": "sha256-ga/hMhLF7a7sSlfBChBdMdwg2jteCO9l+/P3Q8CPAnY=" }, "skanpage": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/skanpage-25.08.2.tar.xz", - "hash": "sha256-G93TK6+yj1zKatkBBFUrdCmnxN1DBI7IH7PPU/LyBHk=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/skanpage-25.08.3.tar.xz", + "hash": "sha256-6EMcc/YpAduT5HAM7LdieZq94Far+P2Ar4cH0SnG1Fg=" }, "skladnik": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/skladnik-25.08.2.tar.xz", - "hash": "sha256-AmxD4/iLvoz6Ue9wOHlbWwclocI0RAymqoqyBKrFJ6c=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/skladnik-25.08.3.tar.xz", + "hash": "sha256-5NjDXHJpOcnaeX4c1F1W0KDQSnnasfwtp6ztZqMPzo8=" }, "step": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/step-25.08.2.tar.xz", - "hash": "sha256-wA0k//FkXrJJamFejkc2VE7jX9OMwbhLc15aJRrILDM=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/step-25.08.3.tar.xz", + "hash": "sha256-sd3OT1Kgt1GIYWwGK+T6etXT13JcIR7AEXGamtJ+hvk=" }, "svgpart": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/svgpart-25.08.2.tar.xz", - "hash": "sha256-T8+uQ8Q/RfnUS2VSM550FI8sXAd6jUh9H/9Oo+9tvKY=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/svgpart-25.08.3.tar.xz", + "hash": "sha256-l/b9tP8xEOQdjfayXw0YT1I12InYx8FcfGu7Gi8G3hc=" }, "sweeper": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/sweeper-25.08.2.tar.xz", - "hash": "sha256-4KCSw/g0cVCHo4knw8J/Thz/xZYkBNjj/vacO6bto60=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/sweeper-25.08.3.tar.xz", + "hash": "sha256-brC3wxqfvh+Q5NRyVIj4KFStA4lPnp/rVvYdOdBFZZ0=" }, "telly-skout": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/telly-skout-25.08.2.tar.xz", - "hash": "sha256-nf76OvOoHAUrpFlTlKKgnKb/MYYCL8oBeqj4ATwFQMA=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/telly-skout-25.08.3.tar.xz", + "hash": "sha256-RP12+uGbvD+ApoylGFN7n3B7SIQDBWSmmGYYM7RvYXA=" }, "tokodon": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/tokodon-25.08.2.tar.xz", - "hash": "sha256-8yYWdcDGq0IbSwGk/1WesUw+40xsxx5uoj77EQY7ojQ=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/tokodon-25.08.3.tar.xz", + "hash": "sha256-MyaPh3sIWJ6QF2UwsVr6u9V6uuZodPSQc+3zcGreoiE=" }, "umbrello": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/umbrello-25.08.2.tar.xz", - "hash": "sha256-7BQbgzSFFKXxRZbtV9Kt5J9ze07a/Y6G8Cv1FU55TH4=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/umbrello-25.08.3.tar.xz", + "hash": "sha256-kEimFZyEhiSKlblW7QjBlUrCFwi4moH+ajsKp6Ugeiw=" }, "yakuake": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/yakuake-25.08.2.tar.xz", - "hash": "sha256-cL7+ptmgaPbc67q/HrBYR4+dAEgDHdT4DPjcCH8MRRw=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/yakuake-25.08.3.tar.xz", + "hash": "sha256-2NPw/+z9mPAMhhin3PXPhe90X3BHF9+BmPYyHYNFHuw=" }, "zanshin": { - "version": "25.08.2", - "url": "mirror://kde/stable/release-service/25.08.2/src/zanshin-25.08.2.tar.xz", - "hash": "sha256-S5Ind8wxaE/NsKD3+seQ8g7k3iKSe8GQn/7TpCqpE5A=" + "version": "25.08.3", + "url": "mirror://kde/stable/release-service/25.08.3/src/zanshin-25.08.3.tar.xz", + "hash": "sha256-3A0QGC8qE1f+8jlbXo79rsTsTl9hZVEKNRKDjAspbYE=" } } \ No newline at end of file From d48622de0a435bb2b470e06b2936e821b3aa5ccc Mon Sep 17 00:00:00 2001 From: kyehn Date: Thu, 6 Nov 2025 17:25:43 +0000 Subject: [PATCH 1280/2279] v2rayn: 7.15.6 -> 7.15.7 --- pkgs/by-name/v2/v2rayn/deps.json | 42 ++++++++++++++++++------------ pkgs/by-name/v2/v2rayn/package.nix | 4 +-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index 3aca1d055f16..03b57f5c569e 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -74,11 +74,6 @@ "version": "11.3.8", "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw=" }, - { - "pname": "Avalonia.ReactiveUI", - "version": "11.3.8", - "hash": "sha256-QwIPrfoxNw/u/deWc5C3ps0eQDBFOocMH74nlVahQuM=" - }, { "pname": "Avalonia.Remote.Protocol", "version": "11.0.0", @@ -211,8 +206,13 @@ }, { "pname": "ReactiveUI", - "version": "20.4.1", - "hash": "sha256-YXd4A5akZ/dMOo9IalKPoNMGlBGxk60o3u6pGB4BCXY=" + "version": "22.2.1", + "hash": "sha256-MZNBNP2ajvfRU4OaG8JjbbaQ3xbE+FjE9RZK+TZdOCE=" + }, + { + "pname": "ReactiveUI.Avalonia", + "version": "11.3.8", + "hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo=" }, { "pname": "ReactiveUI.Fody", @@ -276,8 +276,23 @@ }, { "pname": "Splat", - "version": "15.3.1", - "hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU=" + "version": "17.1.1", + "hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo=" + }, + { + "pname": "Splat.Builder", + "version": "17.1.1", + "hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI=" + }, + { + "pname": "Splat.Core", + "version": "17.1.1", + "hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0=" + }, + { + "pname": "Splat.Logging", + "version": "17.1.1", + "hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY=" }, { "pname": "sqlite-net-pcl", @@ -309,11 +324,6 @@ "version": "4.5.0", "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" - }, { "pname": "System.Diagnostics.EventLog", "version": "6.0.0", @@ -336,8 +346,8 @@ }, { "pname": "System.Reactive", - "version": "6.0.1", - "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" + "version": "6.0.2", + "hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE=" }, { "pname": "System.Reactive", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 0faa6c9c91a3..9bcf2f643d49 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -20,13 +20,13 @@ buildDotnetModule (finalAttrs: { pname = "v2rayn"; - version = "7.15.6"; + version = "7.15.7"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = finalAttrs.version; - hash = "sha256-YBOfewVdFWjP47JIWJErqEqR8/vSJLaFkZ3uJblPK6Q="; + hash = "sha256-xTD1bdL/UUGqUxDmrguO6Oapv37clDD2b3YWCe7B+Bs="; fetchSubmodules = true; }; From 809179bd7e7d7cf07b6307f1e2cfa0e8b0a896c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 09:43:24 -0800 Subject: [PATCH 1281/2279] radicale: 3.5.7 -> 3.5.8 Diff: https://github.com/Kozea/Radicale/compare/v3.5.7...v3.5.8 Changelog: https://github.com/Kozea/Radicale/blob/v3.5.8/CHANGELOG.md --- pkgs/by-name/ra/radicale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index b820ceef3743..f95d46d1f528 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.5.7"; + version = "3.5.8"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE="; + hash = "sha256-kgtNk+MXanYB0RyNncfM3K/HJZlScat7RDuoclu5/i0="; }; build-system = with python3.pkgs; [ From 81a676c92b0620f29fad0c0b46e6495d11341173 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 4 Nov 2025 16:55:57 -0500 Subject: [PATCH 1282/2279] mocha: migrate from nodePackages --- pkgs/by-name/mo/mocha/package.nix | 33 +++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 216 ------------------ 4 files changed, 34 insertions(+), 217 deletions(-) create mode 100644 pkgs/by-name/mo/mocha/package.nix diff --git a/pkgs/by-name/mo/mocha/package.nix b/pkgs/by-name/mo/mocha/package.nix new file mode 100644 index 000000000000..8b358c766a57 --- /dev/null +++ b/pkgs/by-name/mo/mocha/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "mocha"; + version = "11.7.4"; + + src = fetchFromGitHub { + owner = "mochajs"; + repo = "mocha"; + tag = "v${finalAttrs.version}"; + hash = "sha256-mRXdAPKDNnQzr8oz6NrTeUFgT7aBbsTl4TxFvjcVqCs="; + }; + + npmDepsHash = "sha256-NTJ27KucQcrnpPVtEX3zr6qQZjaLzNHPhgJefntE8hg="; + + postInstall = '' + # Installed only for backwards compat, but should just be removed. + rm $out/bin/_mocha + ''; + + meta = { + changelog = "https://github.com/mochajs/mocha/blob/v${finalAttrs.version}/CHANGELOG.md"; + description = "Simple, flexible, fun Javascript test framework for Node.js & the browser"; + homepage = "https://mochajs.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "mocha"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 55848e3615de..830f5ba99fba 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -166,6 +166,7 @@ mapAliases { meat = throw "meat was removed because it was abandoned upstream."; # Added 2025-10-20 inherit (pkgs) mermaid-cli; # added 2023-10-01 meshcommander = throw "meshcommander was removed because it was abandoned upstream"; # added 2024-12-02 + inherit (pkgs) mocha; # Added 2025-11-04 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 neovim = pkgs.neovim-node-client; # added 2024-11-13 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c4209c708ead..443b3e9768bd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -97,7 +97,6 @@ , "madoko" , "mastodon-bot" , "mathjax" -, "mocha" , "multi-file-swagger" , "nijs" , "node-gyp-build" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1b7c6e92a8fb..76cef919a441 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5144,15 +5144,6 @@ let sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; }; - "ansi-colors-4.1.3" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"; - sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="; - }; - }; "ansi-escapes-1.4.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -6809,15 +6800,6 @@ let sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ=="; }; }; - "browser-stdout-1.3.1" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; - }; - }; "browser-sync-client-3.0.3" = { name = "browser-sync-client"; packageName = "browser-sync-client"; @@ -10167,15 +10149,6 @@ let sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; - "decamelize-4.0.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"; - sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; - }; - }; "decamelize-5.0.1" = { name = "decamelize"; packageName = "decamelize"; @@ -13344,15 +13317,6 @@ let sha512 = "Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA=="; }; }; - "flat-5.0.2" = { - name = "flat"; - packageName = "flat"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; - sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; - }; - }; "flat-cache-1.3.4" = { name = "flat-cache"; packageName = "flat-cache"; @@ -27728,15 +27692,6 @@ let sha512 = "v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA=="; }; }; - "serialize-javascript-6.0.2" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz"; - sha512 = "Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g=="; - }; - }; "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -33677,15 +33632,6 @@ let sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; }; }; - "yargs-unparser-2.0.0" = { - name = "yargs-unparser"; - packageName = "yargs-unparser"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; - sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; - }; - }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -44190,168 +44136,6 @@ in bypassCache = true; reconstructLock = true; }; - mocha = nodeEnv.buildNodePackage { - name = "mocha"; - packageName = "mocha"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-11.1.0.tgz"; - sha512 = "8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."ansi-colors-4.1.3" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."anymatch-3.1.3" - sources."argparse-2.0.1" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.3" - sources."browser-stdout-1.3.1" - sources."camelcase-6.3.0" - ( - sources."chalk-4.1.2" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."supports-color-7.2.0" - ]; - } - ) - sources."chokidar-3.6.0" - ( - sources."cliui-8.0.1" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - ]; - } - ) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.6" - sources."debug-4.4.0" - sources."decamelize-4.0.0" - sources."diff-5.2.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."escalade-3.2.0" - sources."escape-string-regexp-4.0.0" - sources."fill-range-7.1.1" - sources."find-up-5.0.0" - sources."flat-5.0.2" - sources."foreground-child-3.3.1" - sources."get-caller-file-2.0.5" - ( - sources."glob-10.4.5" - // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - } - ) - sources."glob-parent-5.1.2" - sources."has-flag-4.0.0" - sources."he-1.2.0" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" - sources."is-unicode-supported-0.1.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."js-yaml-4.1.0" - sources."locate-path-6.0.0" - sources."log-symbols-4.1.0" - sources."lru-cache-10.4.3" - sources."minimatch-5.1.6" - sources."minipass-7.1.2" - sources."ms-2.1.3" - sources."normalize-path-3.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."package-json-from-dist-1.0.1" - sources."path-exists-4.0.0" - sources."path-key-3.1.1" - sources."path-scurry-1.11.1" - sources."picomatch-2.3.1" - sources."randombytes-2.1.0" - sources."readdirp-3.6.0" - sources."require-directory-2.1.1" - sources."safe-buffer-5.2.1" - sources."serialize-javascript-6.0.2" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - ( - sources."string-width-cjs-4.2.3" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - } - ) - ( - sources."strip-ansi-7.1.0" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - } - ) - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-8.1.1" - sources."to-regex-range-5.0.1" - sources."which-2.0.2" - sources."workerpool-6.5.1" - sources."wrap-ansi-8.1.0" - ( - sources."wrap-ansi-cjs-7.0.0" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - } - ) - sources."y18n-5.0.8" - ( - sources."yargs-17.7.2" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - } - ) - sources."yargs-parser-21.1.1" - sources."yargs-unparser-2.0.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "simple, flexible, fun test framework"; - homepage = "https://mochajs.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; multi-file-swagger = nodeEnv.buildNodePackage { name = "multi-file-swagger"; packageName = "multi-file-swagger"; From e9d6401c5b86e054a60693f9ff5c9f8b2ec11854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 09:54:37 -0800 Subject: [PATCH 1283/2279] libdeltachat: 2.24.0 -> 2.25.0 Diff: https://github.com/chatmail/core/compare/v2.24.0...v2.25.0 Changelog: https://github.com/chatmail/core/blob/v2.25.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 1a117efebfc6..faa0400b20d8 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-OCC1qHeDSJJcbTmsyVKiwzXiIQAmofu/EhF56cRJ3kE="; + hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-/PRIVdW2pnioqaYoIX/87cBbPezRaSbX5RWN6yuwpe8="; + hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0="; }; nativeBuildInputs = [ From 136e4c0286e4d52157e34048c9cbf8813d057403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 09:51:46 -0800 Subject: [PATCH 1284/2279] python3Packages.pyfireservicerota: 0.0.46 -> 0.0.47 Diff: https://github.com/cyberjunky/python-fireservicerota/compare/0.0.46...0.0.47 Changelog: https://github.com/cyberjunky/python-fireservicerota/releases/tag/0.0.47 --- .../development/python-modules/pyfireservicerota/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index 2fb94c1b28df..f9f19b7680ee 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, pdm-backend, pytz, @@ -12,11 +11,9 @@ buildPythonPackage rec { pname = "pyfireservicerota"; - version = "0.0.46"; + version = "0.0.47"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-fireservicerota"; From 5be113d1360a9a82d1cf16e8551835cf26d98958 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Thu, 6 Nov 2025 21:22:35 +0300 Subject: [PATCH 1285/2279] pulumi-bin: allows to use gh account for update instead of GITHUB_TOKEN --- pkgs/tools/admin/pulumi-bin/update.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/update.sh b/pkgs/tools/admin/pulumi-bin/update.sh index fb583e5ad18e..16385373a272 100755 --- a/pkgs/tools/admin/pulumi-bin/update.sh +++ b/pkgs/tools/admin/pulumi-bin/update.sh @@ -3,9 +3,12 @@ # shellcheck shell=bash # Bash 3 compatible for Darwin -if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then - echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version" - exit 1 +if ! gh auth status --hostname github.com >/dev/null 2>&1; then + if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then + echo >&2 "Login to github.com with gh or provide GITHUB_TOKEN env" + echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version" + exit 1 + fi fi SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) From 9eeca9569b5c1ccd87124767101dd9a25912ade8 Mon Sep 17 00:00:00 2001 From: Arsenii Zorin Date: Thu, 6 Nov 2025 21:22:45 +0300 Subject: [PATCH 1286/2279] pulumi-bin: 3.205.0 -> 3.206.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 274 +++++++++++++-------------- 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 4963885fb804..3971df2f37c6 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,40 +1,40 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.205.0"; + version = "3.206.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-x64.tar.gz"; - sha256 = "14pqc1qvkb8jp2wisld02qm6zf68i3i3iyymiwgg2ngr1ps40191"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-linux-x64.tar.gz"; + sha256 = "1q6yrcq2cy81daknhqhx7kagg4wcrj057jgdnzssmhpazl5bnl79"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-amd64.tar.gz"; - sha256 = "0ch4bwh7vmgswkspcg3bdvvz5n72swgnfpq9hnr06ac40r7mw264"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-linux-amd64.tar.gz"; + sha256 = "1q7lny807ns4i6wzx9zybsnnkjr5k9hb6igzf3cmw6cg48qf1nqy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-linux-amd64.tar.gz"; - sha256 = "0r7hc0vvf95a87pk6v4sm7m1i9li9ymhijvwsxzjdbpmjcp65ywg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-linux-amd64.tar.gz"; + sha256 = "02c2i4kbbv24i6a3srsgzaxly0f6kkij2d58k61frsljffjmvkb9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-amd64.tar.gz"; - sha256 = "08s73nag5wb4i473krk87718p91q87xjp62riscffzv0xn68x343"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-linux-amd64.tar.gz"; + sha256 = "0z6rzkqk55870mqjnn6dx0l1lbxzs7jyp726ilb6vgcpzbgsl81y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-amd64.tar.gz"; sha256 = "02pgy8m9f32ky69vs7kw7fn8b41l0y4w2gg7s15nw5c069vvnpy4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-amd64.tar.gz"; - sha256 = "1nl1rzgxci67wj0l1gg89r8zxp284w0pjcqaxjmr8bv4whny5r01"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-linux-amd64.tar.gz"; + sha256 = "0ck5gh2xjqm7dkjvvhcx58nrgd7ik9max9y1vv0kr6m7cr646p58"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-amd64.tar.gz"; - sha256 = "11sgjzwspiyjimaqaad4rv8zfri1gk3cpi18cbxqvl02qc45nl2c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-linux-amd64.tar.gz"; + sha256 = "0zc5rmi24k3h0xii26pxh76n9g3jljrnhav5hxhbxakw1819ww5m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz"; - sha256 = "1kvcw8163ghfnrdgc2rzvhfc9npfql7c2d6y6p32j6arwf7h2k4m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-linux-amd64.tar.gz"; + sha256 = "162a1c80f3a20naljsz7v57npv96gzx84p7xspvpl2cydgn14ac8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-amd64.tar.gz"; @@ -45,8 +45,8 @@ sha256 = "0agh234zr757kx6b41k1q7p9rpzb3jv30nkyzs5xqhjnv44lky97"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-amd64.tar.gz"; - sha256 = "03r7s8g17gpp5zhckjmii67hlkpp49nwlx7jcr6bipd7g21isx1b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-linux-amd64.tar.gz"; + sha256 = "0wjn3qrpzr2irfz50vy9nh5jpn14rc6ddv1bx6byj5q14ldapw8w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-amd64.tar.gz"; @@ -69,16 +69,16 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-linux-amd64.tar.gz"; - sha256 = "0sm8gqay51g12l20n08pih9vhpm2b95aj71zj6nmqiq5gym89v6z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-linux-amd64.tar.gz"; + sha256 = "1db5ji7dg3q2n5pmf0vaxj68p019q0j4whks827k6ph0q075r4xk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-linux-amd64.tar.gz"; - sha256 = "04m8b9d1dsfm3kw3n214g46i946fgn56j0k10dzfa2l023y491gc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-linux-amd64.tar.gz"; + sha256 = "1zw9qrx4byrxh12hpkyr2hjlg9q410h2s2c7yxdykxn0q29p3l1a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-amd64.tar.gz"; - sha256 = "0f07prmwm0rgd5r2amd3fxm9cpnfrgj2282d6iczl7pnnl5jn7wp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-linux-amd64.tar.gz"; + sha256 = "19kw4m7nmwzs7722mb59hjis2mvrmzp8w64nf44l96n1vml4hcm2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-amd64.tar.gz"; @@ -89,20 +89,20 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-amd64.tar.gz"; - sha256 = "02dwixm2islad74jm7d3b7n1a9lsrm028np4j47s0959hmkqq7c1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-linux-amd64.tar.gz"; + sha256 = "0gwaaszwbpvfrk67xxd7jck3h3nmh7y89h4vgfpc4d94jb68s1cd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-amd64.tar.gz"; - sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-amd64.tar.gz"; + sha256 = "12b143kpb54nc543gdazpbl4bnslamsvz60iby03g0fsxjwhswpr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-amd64.tar.gz"; sha256 = "11zb5z8yzb87irf7sqc8b664wibicwk6vnmbshsrf41nv4lrys1r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-amd64.tar.gz"; - sha256 = "1ysfm0iq2g2x8ml4dlisyf5g5lfdwjzf8spzc2670kk11vxsb0sy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-linux-amd64.tar.gz"; + sha256 = "123bfr7ydz560dzj49kjmrilc4n0r9ndq2lskx839m4vly8qwqzs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-amd64.tar.gz"; @@ -121,12 +121,12 @@ sha256 = "12xw7fc5xsdbjlwbxwp0jdyv89l2af0hh6b2890fh1g83jp80rxs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-amd64.tar.gz"; - sha256 = "0gphzxkpr7fk8jw5mqldqp1vk2l0xlrcjy7lycwc71921nid3knn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-linux-amd64.tar.gz"; + sha256 = "1shl25vl3q8myzjjxnvcsq7jyd1l7w6gqy7fj83gahxbc3nlhab3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-amd64.tar.gz"; - sha256 = "06znwpzjl5gxbsy55qvjz4g75ji90rljp5afmm5wsglcr2qi4ai6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-amd64.tar.gz"; + sha256 = "05vxzsg0869rg0ap36pasxxwbslndns6jss9d0cydf8v0kna30hx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "1vh28r2gk85a82c7jsa95n21my19hzavkyc9pjdpw517r63gvyjw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-amd64.tar.gz"; - sha256 = "168a1hqpildnal3xnivpimlmfr9dgkcrc1fp03www96qvnwa5b0c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-linux-amd64.tar.gz"; + sha256 = "1wrsz1s727jhxwlympxqd0fdm93scl132lv8d5j0wd4z81lq67dx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-amd64.tar.gz"; @@ -163,36 +163,36 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-x64.tar.gz"; - sha256 = "1vscn2idp2qjrmz9gzykb4jqcyyipkndyjk8r424qp95v6w6vrkb"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-darwin-x64.tar.gz"; + sha256 = "057qfllfbwlga1g5w517rpl7nw6ngcsqn6azgy4r51vrfc01a9j8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-amd64.tar.gz"; - sha256 = "095n5p8i3cgjma90930dhfj9bxqsydci1qyjh9fnsd6lk3sdqx02"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-darwin-amd64.tar.gz"; + sha256 = "155q33fcnafhqygr0big2rk52rlc9a4zx1whlrlfpw1g1l8jsbdg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-darwin-amd64.tar.gz"; - sha256 = "0mw37ncmm78j9gx7nw3400jrmzirqkwqhp957p36q193gnsd4747"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-darwin-amd64.tar.gz"; + sha256 = "1xhsxzcjy689bg0zsbcv120j8a0bfn99vnfwid1y14yp5jc3f2gp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-amd64.tar.gz"; - sha256 = "0wd7gsghsbchb2gj6yv7lis8ni640dhrklgjipgbw61zhv6ib0ci"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-darwin-amd64.tar.gz"; + sha256 = "0rcxnrwfyr38g9z611m4bpmdhbak1c82afarkax9yhyw20lbk6ma"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-amd64.tar.gz"; sha256 = "09c2kdhad10c6g1j955dxkvvfapk6qqc8wdd69qcl85lkpgzn3cz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-amd64.tar.gz"; - sha256 = "1nxfxi3gj92lqyqiagh31j5gd6s4ah24k96pgja50xvpsbsz3kbj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-darwin-amd64.tar.gz"; + sha256 = "0dwplcrwadwxslwl944nfaz52d6d5l9gw2vh6wnqh27m72d84bkx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-amd64.tar.gz"; - sha256 = "120cdkrw9rqj6p8pqh3g13khciqnzfr6w7lcg3q5k8fvbj8inyn1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-darwin-amd64.tar.gz"; + sha256 = "1q1xdm0qbcbksr8v6azs8kfa7hv3qni8391i23lmx0653vfwcqya"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz"; - sha256 = "1cdpx3540y3kp76ml1qi0awfzvm3172bzc76khdbsdcz9b8f3kb7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-darwin-amd64.tar.gz"; + sha256 = "0z6d8a71k5r6vka7f446ik1xj6nxg1ibx76i0wslzh5lwq2ybsmh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-amd64.tar.gz"; @@ -203,8 +203,8 @@ sha256 = "0b7ryynm4np70d4si2i9jwjjqd1nd3b6m23fgv9c2cwwnrg2xmiz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-amd64.tar.gz"; - sha256 = "019w76n8zksz62chnbdfhbjar2z1g3359pamahdcm415kdghhar2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-darwin-amd64.tar.gz"; + sha256 = "1m9mfb64b49q6a1z8dbyk8idd3zacnlrly8bsh4lpm0abjp2ms76"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-amd64.tar.gz"; @@ -227,16 +227,16 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-darwin-amd64.tar.gz"; - sha256 = "12yzgpz05pf1y401p94p063c2yj8i5mlmy5bxdd69n4537z17z02"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-darwin-amd64.tar.gz"; + sha256 = "0l11xyy8ajxr8l7iyp2il3nahgidqydkg6qw20yqligppx75v59g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-darwin-amd64.tar.gz"; - sha256 = "1hphg8mhpgzmm9hz12fdpzjgrx35b4bhxinm74slw8fki3vpgqdl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-darwin-amd64.tar.gz"; + sha256 = "16af5bj7i8pkz8idjgw0q876k22834icn3p6565jv1gbvxipsk3q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-amd64.tar.gz"; - sha256 = "1d2chprn9xjdm9qrvdzma3r5f0v457ksfxbc98i753ncqr7cnzf3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-darwin-amd64.tar.gz"; + sha256 = "0hykd3azxymnriv7vlz57ckhycn5j1xnv4g56813bqi027iys158"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-amd64.tar.gz"; @@ -247,20 +247,20 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-amd64.tar.gz"; - sha256 = "1q3nhm48rdxh2br72l8lgdks5m869v2ia67gwchkzsjjrjiysbqh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-darwin-amd64.tar.gz"; + sha256 = "0fxii20q2hwgwpbwchws91hq75lhhq4rgymwy0ik0a0xirn8xqha"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-amd64.tar.gz"; + sha256 = "11ra4b2jd2gkd5fhfhaxkyxgg8hwlmzhh036fr8l69l93nawi8c7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-amd64.tar.gz"; sha256 = "1v309axkjh9gv8cy3y7wpdq7b88129b5p5q030qdrk2hzalxvvrh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-amd64.tar.gz"; - sha256 = "1yabhr80yvnwzvn0gd95kpicng99j8m06y6cdz9lwq63kycsnghc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-darwin-amd64.tar.gz"; + sha256 = "1lyz86zwhnhasxhccx229fppwgz1wrjmk7b24cx3mg92craazypc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-amd64.tar.gz"; @@ -279,12 +279,12 @@ sha256 = "0zbmrhh5f19r9rg3pcmry325l2lfpam9j6krqdbcwsals971qvw6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "1vafsy1ah61y3qwiv3cc8y8lx6c9pimr0hnknah22k6cxshm0bg9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-darwin-amd64.tar.gz"; + sha256 = "1m6gfvnfa0r5k777ccskgkdi6kic69jk74liklrh6mnn9isbp1by"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-amd64.tar.gz"; - sha256 = "0h62401y99hhqs32y8blx1p0cd87ssd2zi6fzakv72ry4v2xhcnj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-amd64.tar.gz"; + sha256 = "0b62i9bmqdqjw0qk3m97x9274vn3ib8xwc6lxsshywkakf1zw0cg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "1ji9zz1r7rj57w7spf6mwa9fxl1jgiy0qmxvlia21hpj60b536f5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-amd64.tar.gz"; - sha256 = "15hyg61id2r7b7l6279grabvfphhj22ffi4y0q20zzypx98xr599"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-darwin-amd64.tar.gz"; + sha256 = "1zzqfx6qyah32lvj82jm31cbygpf1ss58jmig8ckn5scpjjifd7g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-amd64.tar.gz"; @@ -321,36 +321,36 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-arm64.tar.gz"; - sha256 = "0i80py5r711k58yh14c5d8vhlsl5jd5f41gxfqq3gllhwy3q54db"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-linux-arm64.tar.gz"; + sha256 = "11lwmmdwv5jag1n283hl4psvdg7766qx15pynpjfvhvdmwaviagj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-arm64.tar.gz"; - sha256 = "071cy9b0n7h8x3m0lnw8yywpjj2q9pzp5svh0cfqz7c43ssamkqk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-linux-arm64.tar.gz"; + sha256 = "1b6sbhbbcymrs6g62pr7pbd6zx3zvwypzbl9xi5252f1y6ap2hqx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-linux-arm64.tar.gz"; - sha256 = "16jd9hrv60jy6qzl57h9fmk955ll05ng7cfmn4af1vjsyay6knjl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-linux-arm64.tar.gz"; + sha256 = "11cvffvjgwc1b1v30ivkmw7lva6qzhkm5r4m0y4lc9sh0mjfvgsb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-arm64.tar.gz"; - sha256 = "0jy2za4z4f63i51a06nwy1pv4nma9rl46pl39gkkgq5kslhgah5h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-linux-arm64.tar.gz"; + sha256 = "1pj3hj3yqmpjsz4lsbvswymf4sv6ylrpx6c2lcgyvdvsg0l5nfxp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-arm64.tar.gz"; sha256 = "03as3y5bflq1m8qfcx7h916vlxa7qn5xla2d1gi2q87gz4giki24"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-arm64.tar.gz"; - sha256 = "0mx7yx96xnalrpsqc4dp14gck7p8hciasgkkk89v3dsjmjlk1wwi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-linux-arm64.tar.gz"; + sha256 = "1qikx8r384r49c4b3wqhhzdglkdsji2z2zrakbk73ir006q1s6a4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-arm64.tar.gz"; - sha256 = "04sq78vzcyc8dm3cx0f5gizkdwy03j2fsw3vcjxpk75pkkhxh2gf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-linux-arm64.tar.gz"; + sha256 = "19gv23rqd94p9jhfcq7j44n2prlxm9k9y0s0gs2bfq89s2s7a9w3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz"; - sha256 = "17lndnmwmxshxz7n2zhgc07gr8cqfd06b1mgblyzbx8n2lc0x0sv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-linux-arm64.tar.gz"; + sha256 = "1zapqg7ggkz9q2sh1jkp9p5670hpa5nhvmjvq50pwx0i2xnfpvsl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-arm64.tar.gz"; @@ -361,8 +361,8 @@ sha256 = "0hg628ik9vvadxs249v4z53y36nzrw3bgjdh1fgjahx875z23m06"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-arm64.tar.gz"; - sha256 = "1x5iqm07zjf637w14pzhhifgi7vs1imvqjqr2xmi1z5cqfjknm5j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-linux-arm64.tar.gz"; + sha256 = "1cdjz021bc1r5bqsnm114acmyc7ikmyxp08pmnndrmm9mmf5xr96"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-arm64.tar.gz"; @@ -385,16 +385,16 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-linux-arm64.tar.gz"; - sha256 = "0f4bxwj7liyijbsqh0r43s823n02gvpkk0rdxwhg1li4d1mpsqxp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-linux-arm64.tar.gz"; + sha256 = "0pqkh6i3pigw5ab83bxnq5wccn8jmavj8g445ywd65rf3cgqnbns"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-linux-arm64.tar.gz"; - sha256 = "111rblka8wz87pqd9v27gmv4lz5048kwdj9i252r7bnd1gw92i4x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-linux-arm64.tar.gz"; + sha256 = "1nlxqvicd266xvb2rwqspcmkm9z6fhjvm7vswy3c7a7sjhscvz3j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-arm64.tar.gz"; - sha256 = "0nnap94wign1vydi56k29s0cp1xgdngm1yj3hwz5s02fkhkcvw6f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-linux-arm64.tar.gz"; + sha256 = "1xq1p9mwazy00c45g92if1hiy8iclsrh7x25fxs29zayp0lcf3s5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-arm64.tar.gz"; @@ -405,20 +405,20 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-arm64.tar.gz"; - sha256 = "0lxxdqx9g9zd0m3zzpgfcwv3h51sigzldh5fzrn2m6pnqniamqbw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-linux-arm64.tar.gz"; + sha256 = "0arbz7simas9a4bg0mm00gw89z6dzjykbf198zf8k0vbx47h6m2h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-arm64.tar.gz"; - sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-arm64.tar.gz"; + sha256 = "12xf6nbvv4r5q93495cddfbyj0rg5slpbcqaykk5jydr45arms2y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-arm64.tar.gz"; sha256 = "0l33hzkgcm9lr39k7dndga36k3f0agbsj7q4wx0rwhfabz1fgcd1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-arm64.tar.gz"; - sha256 = "0b2yrfxxrkwxsp76ihv06vibwg86lpyz2c92mi49bldrp767ibys"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-linux-arm64.tar.gz"; + sha256 = "09jdr8pr7pb8ixjvlvggnxq7ccp94nx6mfq0m6rlkmsh3dk46v68"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-arm64.tar.gz"; @@ -437,12 +437,12 @@ sha256 = "0a5gl6fpl6w8bcy1bl1z7dynrpm42kg0hq45hzhs7h667bgaqkzs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-arm64.tar.gz"; - sha256 = "02b1alm53isvmzs7crgjqbpyskr3l2nnzwkxvfkhpsa3rbpnf42f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-linux-arm64.tar.gz"; + sha256 = "10ix183lkl96n3iclvbnj09snz7h423fi1paja286fqgg7yv8p5w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-arm64.tar.gz"; - sha256 = "07n3q2bm44acikvjnz7mgpg0mxycs1qwc1bxmr2gibnz9n9x1f5k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-arm64.tar.gz"; + sha256 = "1f983sfqqab9zfn30ypzmzixh65fjgpqd4v8id3zrh74k5mjil50"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "1zbm7ql3rqypqmckbmlzbiy4akmqjkbzfkl7788q6sm7xh6bm8q1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-arm64.tar.gz"; - sha256 = "185rjhfcr8hh7vxyb91dfsmq7vc78z17qrvn0gn7bxf2sd0zfnap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-linux-arm64.tar.gz"; + sha256 = "07aai8ssmm3vvydmr6nwf32s64mz6xjqlb6cp3l0j13g34wpva4m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-arm64.tar.gz"; @@ -479,36 +479,36 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-arm64.tar.gz"; - sha256 = "07bxw10xcm5s8c8zssqh461v9rj4c5l27nzxzg84q3vyzil02460"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-darwin-arm64.tar.gz"; + sha256 = "0yizh6hy9xq2gmshbln21fq7az7k5j3fisyj12a2q2frh8fv03dx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-arm64.tar.gz"; - sha256 = "18j48pfmrr6m1qna8ac95l1i6pg4gf7g887yc68h0gxdx2q2xbr2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-darwin-arm64.tar.gz"; + sha256 = "0fcl1445yaywqbsl16ipydfg2z0j15bsdsppdr3vfzgiyimrn321"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-darwin-arm64.tar.gz"; - sha256 = "1fig9bn080dbnibm0dp76ygyg1g2sv2295kyyknx3wlap0nrj2w3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-darwin-arm64.tar.gz"; + sha256 = "09baqy0kl8p4ij3c7yhwq4dlgbh4fkp4dpq59xfmi90l4r4j6623"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-arm64.tar.gz"; - sha256 = "0p87dqzhpra4s1hxnzc63xk1pvw2n6pa8nxisgbrlrf4bxy229wq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-darwin-arm64.tar.gz"; + sha256 = "0v6w6n85iaynsjv7hz7f1syvy8z473cfj62vhwidq4bivbiad0i1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-arm64.tar.gz"; sha256 = "0sqmpk1n98vs079qrs1nf9ifjmjz4s9s0f406c8r0cxpn3l08zvp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-arm64.tar.gz"; - sha256 = "1dz54wc5aw9rfhwx2hrmvdfl9xd3fd26jx00f5asb4gjlirasdhl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-darwin-arm64.tar.gz"; + sha256 = "1hl90018i53qx3mhy1acnq61nmbai2shv80pv5aigg1y7mg9p54b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-arm64.tar.gz"; - sha256 = "0jqpviykdsvb6zfk021wl27i2aa1v7mv08kalxn73r8zbj2hh1ls"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-darwin-arm64.tar.gz"; + sha256 = "12w7kjk2a4vhn3kcn6mwdblflpagd3br06hk196k0pkj46l04rlk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz"; - sha256 = "0b4srhyq2adbpzh74s0kcmfflayrk6c7jbq63s2l3zfq2zln4sbm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-darwin-arm64.tar.gz"; + sha256 = "061xs9y8wdaa61zzhaprwnmn78bcgycnhsfd19dihv94qnbzpn79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-arm64.tar.gz"; @@ -519,8 +519,8 @@ sha256 = "0jidnrvvk2d6jdfx795yrnkpwmw1843nfylchhynlidf279z21vm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-arm64.tar.gz"; - sha256 = "1kiq9771rqz935bfnrl06c561xw7g583a9hm1dn4yclssn02pshf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-darwin-arm64.tar.gz"; + sha256 = "1qmgsji9aa7plbv06k1l0a10fvazcjybrcr5l276wz650c412g6d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-arm64.tar.gz"; @@ -543,16 +543,16 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-darwin-arm64.tar.gz"; - sha256 = "0a1fy15bf66gvy7jvimbnycxb51z85svrpa9flly1ch3g7276w60"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-darwin-arm64.tar.gz"; + sha256 = "0rfdmixsr8q93r25k736mr3gngf4xz5k88394frpywc0sbkmckzv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-darwin-arm64.tar.gz"; - sha256 = "0nd7hv0yf40xc566wg76k8h91ig88lvd6y0f0ffsjfyb40kgm7sc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-darwin-arm64.tar.gz"; + sha256 = "1y1mb41flv2f64wy5vmfcf9hxqskjcnmdwgh10mn6nb3nsq1l4b1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-arm64.tar.gz"; - sha256 = "17naiz9k71dc0ax1x7843slna1cycjgd9yvy5xhg5613rrl7h4nc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-darwin-arm64.tar.gz"; + sha256 = "092zvhh96cpgkfq14lp4pahd8nz6x5bd0dcvs5cx7xpdl745bzs9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-arm64.tar.gz"; @@ -563,20 +563,20 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-arm64.tar.gz"; - sha256 = "17dr3i20y5f120mq4b8j85jwb5xwid3bbpw2vdfc1qgs1ib17yav"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-darwin-arm64.tar.gz"; + sha256 = "1r1wbw7fi3ivd225p6pyd8gsbycx0qjlicfaabjlg7lqlakv8cfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-arm64.tar.gz"; + sha256 = "0z66mps5rm42ga6c9n59zahkj3pg78583p4cmf73fap3y8gpfmd2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-arm64.tar.gz"; sha256 = "0fjlp0afa5z6x85ldw8bwl4zgxz2rmwinihw1vbqa33pyjrk08xn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-arm64.tar.gz"; - sha256 = "02fpl2jrawswcyhiqfgjrhhxc153pdgij3f5kpjqdn1h6dyhv4iz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-darwin-arm64.tar.gz"; + sha256 = "03rg7hgxxkkx10kba2kgr25kxs48wq2fcrsv7j9v5w6sddaqf7w3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-arm64.tar.gz"; @@ -595,12 +595,12 @@ sha256 = "0vygxiqrx70i03d3p1mmc26zkai4cxzwjzjf6bszz6cmqvnc5pnr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-arm64.tar.gz"; - sha256 = "0hzrqqk78hgxrn3fxmnmy9y8l5011ifs6smbs2wrm9na9lag3frb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-darwin-arm64.tar.gz"; + sha256 = "16x1apq9chj090a9zwzk3247500fsbzz5gz3v2rz8cmiy4n0is46"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-arm64.tar.gz"; - sha256 = "0mznjz1m1l6qcgb3x9h4q7r5msffla1s6x0j9k5jr5izm50z4wxb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-arm64.tar.gz"; + sha256 = "09xwsyjlrrci8gn0zg97jlx0fa9mnzbz0v42myzzdrq6vvidss9y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "1qih4kprfaa82p7mg4zg8amy8vp4c76vqkmwf3df2x8bn69jdrc0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-arm64.tar.gz"; - sha256 = "0r80rz0fs8w4iqnq1rsqxqvbs1plfr7hvlsr2dik4k8ngiwvbfps"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-darwin-arm64.tar.gz"; + sha256 = "0mwc3z11zjx4sy9a1iclxj2ymabcbg2abzpk93khrqqsa7943h1r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-arm64.tar.gz"; From a97ad4bf5babed0da2d1625abd60177630c645b2 Mon Sep 17 00:00:00 2001 From: RaHoni Date: Wed, 5 Nov 2025 15:11:19 +0100 Subject: [PATCH 1287/2279] jameica: jameica now has version 2.12.0 tagged As discussed in PR #457801 since the tag was added we switch to the tag. --- pkgs/by-name/ja/jameica/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix index 9c805d57fbb9..88300186770b 100644 --- a/pkgs/by-name/ja/jameica/package.nix +++ b/pkgs/by-name/ja/jameica/package.nix @@ -46,8 +46,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "willuhn"; repo = "jameica"; - # Releases currently happen on branches named like the version number. Rev of the "2.12.0" branch. - rev = "b74b160643b18171d2d185b80b60e82a02a75898"; + tag = version; hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i"; }; From 9620d2b9b12f490b4cb82a3226057d909af9d103 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Thu, 6 Nov 2025 19:42:58 +0100 Subject: [PATCH 1288/2279] onedrive: 2.5.7 -> 2.5.9 --- pkgs/by-name/on/onedrive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix index 5b0199afa241..829c58e104e8 100644 --- a/pkgs/by-name/on/onedrive/package.nix +++ b/pkgs/by-name/on/onedrive/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "onedrive"; - version = "2.5.7"; + version = "2.5.9"; src = fetchFromGitHub { owner = "abraunegg"; repo = "onedrive"; tag = "v${finalAttrs.version}"; - hash = "sha256-IllPh4YJvoAAyXDmSNwWDHN/EUtUuUqS7TOnBpr3Yts="; + hash = "sha256-Vrr7KR4yMH+IZ56IUTp9eAhxEtiXx+ppleUd7jSLzxc="; }; outputs = [ From d87cf12725769045615b3dccca15df1143fea43c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 18:52:52 +0000 Subject: [PATCH 1289/2279] unciv: 4.18.11 -> 4.18.12 --- pkgs/by-name/un/unciv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index b8eaa299e3bb..dee5c524f0fc 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.18.11"; + version = "4.18.12"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-k6jIvJvEfLgcYexpzjg7GFGGw9HhFGnhdShEX6zUxiQ="; + hash = "sha256-h0Y7a/wvmYOwr+AhVjY+P7uQQQbofpqkX5/Nd8tL3Cg="; }; dontUnpack = true; From 10cf625fb9fe4bba3f844e39ec0ba0011399c1db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 18:56:36 +0000 Subject: [PATCH 1290/2279] cloudflared: 2025.10.0 -> 2025.10.1 --- pkgs/by-name/cl/cloudflared/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index b6e17a5f80a7..f666fc411b1d 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2025.10.0"; + version = "2025.10.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = version; - hash = "sha256-20w702JEdW+4gENvP5heleE09tJPeG4QiW5F4qcdVp0="; + hash = "sha256-5GEvmal1ZaUp1wOEsjngDSXj9AuAm1PyUw92xq/YT58="; }; vendorHash = null; From 1344e91ac98626f3a36ad03af63259892e8c11dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 19:01:07 +0000 Subject: [PATCH 1291/2279] soft-serve: 0.10.0 -> 0.11.0 --- pkgs/by-name/so/soft-serve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index a51249a1e827..da94b27f8806 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-Lg7cESGMbVCNx0KQBIAP/UsfvO3IO+DO9bYiQbg9Fls="; + hash = "sha256-qwUPRIOUFCsTuwRxFXSbGd3vwIwb8mEPlCX0em8OBBU="; }; vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc="; From 93854af520229f92274d7a915025183c58af1ffb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 19:06:42 +0000 Subject: [PATCH 1292/2279] scooter: 0.8.2 -> 0.8.3 --- pkgs/by-name/sc/scooter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index cdb4399de160..62ef79c329f4 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-Fgq1FJIvgnbBGkFrFCzjIPjyTyCxxknRGtzBGUuZfIY="; + hash = "sha256-DgxyurJmhpTHdmLyRaZkfiPYdMYdqeQOC+ZncfW5GdQ="; }; - cargoHash = "sha256-kPJvwZhpE8k4Kv+Jai/Fp+b/YI8F7cR8acM1sc2fkf4="; + cargoHash = "sha256-vq2d6UX4TbPO6Uya3m8uKff7+w1+VfV4Bec4Uyx/8pQ="; # Ensure that only the `scooter` package is built (excluding `xtask`) cargoBuildFlags = [ From 4ba16e4dfe2518aa61906cc91f44e1c0aa48caa9 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 14:14:21 -0500 Subject: [PATCH 1293/2279] nodePackages.fx: alias to pkgs.fx Literally the same package. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 830f5ba99fba..5825fe0b683d 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -113,6 +113,7 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 inherit (pkgs) fixjson; # added 2024-06-26 flood = pkgs.flood; # Added 2023-07-25 + inherit (pkgs) fx; # Added 2025-11-06 ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02 inherit (pkgs) gatsby-cli; # Added 2025-11-05 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 443b3e9768bd..ccdb654c4503 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -72,7 +72,6 @@ , "fkill-cli" , "fleek-cli" , "forever" -, "fx" , "grunt-cli" , "makam" , "gulp-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 76cef919a441..a5953db51ca9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -41866,24 +41866,6 @@ in bypassCache = true; reconstructLock = true; }; - fx = nodeEnv.buildNodePackage { - name = "fx"; - packageName = "fx"; - version = "35.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fx/-/fx-35.0.0.tgz"; - sha512 = "O07q+Lknrom5RUX/u53tjo2KTTLUnL0K703JbqMYb19ORijfJNvijzFqqYXEjdk25T9R14S6t6wHD8fCWXCM0g=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Command-line JSON viewer"; - homepage = "https://fx.wtf"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; From 27becf6fea400696967de6adc526ff66fe541d36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 19:23:39 +0000 Subject: [PATCH 1294/2279] opentofu: 1.10.6 -> 1.10.7 --- pkgs/by-name/op/opentofu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index 93007668e11d..f2f33b9301ff 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -15,16 +15,16 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; tag = "v${version}"; - hash = "sha256-IEdnESrhDT2rDha7TNgUnGnPioNPnKrUuOXSGRnUOBI="; + hash = "sha256-aCNXOEYA+6pKBrGLf/u6RkLw5YbKJHbVPltZko3aGgs="; }; - vendorHash = "sha256-ZnQDRiLdg12Dx9RdK1xBWUrAm3QQLGhwH1vxh4ieVv0="; + vendorHash = "sha256-rOSl5WE1/WcgCVpcAOXVl8cBSxjrlG7fxzpRO/5i5GA="; ldflags = [ "-s" "-w" From b9c22a91106e84e5cd3839107ce9dc519eb9f6b6 Mon Sep 17 00:00:00 2001 From: FKouhai Date: Sun, 26 Oct 2025 22:20:48 +0100 Subject: [PATCH 1295/2279] opencloud-desktop: fix client startup --- pkgs/by-name/op/opencloud-desktop/package.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix index 208765ebc128..64bef0d25e2b 100644 --- a/pkgs/by-name/op/opencloud-desktop/package.nix +++ b/pkgs/by-name/op/opencloud-desktop/package.nix @@ -3,6 +3,7 @@ cmake, kdePackages, fetchFromGitHub, + fetchFromGitLab, libre-graph-api-cpp-qt-client, kdsingleapplication, nix-update-script, @@ -10,6 +11,25 @@ versionCheckHook, stdenv, }: +let + # See issue https://github.com/NixOS/nixpkgs/issues/455981 + # It was spotted upstream that ecm 6.19.0 caused this issue + # Therefore we pin ecm 6.18.0 which makes opencloud function correctly + ecm618 = kdePackages.extra-cmake-modules.overrideAttrs ( + finalAttrs: prevAttrs: { + version = "6.18.0"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "frameworks"; + repo = "extra-cmake-modules"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hpqczRaV32yyXXRWxR30tOBEUNWDkeSzVrv0SHMrz1Y="; + }; + patches = [ ]; + } + ); + +in stdenv.mkDerivation (finalAttrs: { pname = "opencloud-desktop"; version = "2.0.0"; @@ -21,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - kdePackages.extra-cmake-modules + ecm618 qt6.qtbase qt6.qtdeclarative qt6.qttools From 834bfc40437f50342a4c3da37fb0fda4c9f66b2c Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Thu, 6 Nov 2025 20:24:39 +0100 Subject: [PATCH 1296/2279] go-away: add meta.mainProgram Signed-off-by: Christoph Heiss --- pkgs/by-name/go/go-away/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix index b9ca2a2dcec6..a7235a4a7268 100644 --- a/pkgs/by-name/go/go-away/package.nix +++ b/pkgs/by-name/go/go-away/package.nix @@ -72,5 +72,6 @@ buildGoModule (finalAttrs: { homepage = "https://git.gammaspectra.live/git/go-away"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ hexa ]; + mainProgram = "go-away"; }; }) From e9c3642c327f5047c9ec22e5c5880bd63294fc8d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Thu, 6 Nov 2025 20:25:08 +0100 Subject: [PATCH 1297/2279] go-away: add passthru.updateScript Signed-off-by: Christoph Heiss --- pkgs/by-name/go/go-away/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix index a7235a4a7268..612fe330b962 100644 --- a/pkgs/by-name/go/go-away/package.nix +++ b/pkgs/by-name/go/go-away/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitea, + nix-update-script, # asset compression brotli, @@ -57,6 +58,12 @@ buildGoModule (finalAttrs: { cp -rv examples/snippets $out/lib/go-away/ ''; + passthru.updateScript = nix-update-script { + # the main repository does not have the releases feed enabled, so use the + # codeberg mirror + url = "https://codeberg.org/gone/go-away"; + }; + meta = { changelog = "https://git.gammaspectra.live/git/go-away/releases/tag/${finalAttrs.src.tag}"; description = "Self-hosted abuse detection and rule enforcement against low-effort mass AI scraping and bots"; From f56221596a841f4a5a319b2ca5d0bb874cb32fab Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 14:33:26 -0500 Subject: [PATCH 1298/2279] js-beautify: migrate from nodePackages --- pkgs/by-name/js/js-beautify/package.nix | 46 ++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 138 ------------------ 4 files changed, 47 insertions(+), 139 deletions(-) create mode 100644 pkgs/by-name/js/js-beautify/package.nix diff --git a/pkgs/by-name/js/js-beautify/package.nix b/pkgs/by-name/js/js-beautify/package.nix new file mode 100644 index 000000000000..fd8dca953546 --- /dev/null +++ b/pkgs/by-name/js/js-beautify/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, +}: + +buildNpmPackage (finalAttrs: { + pname = "js-beautify"; + version = "1.15.4"; + + src = fetchFromGitHub { + owner = "beautifier"; + repo = "js-beautify"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7heFAt8ArwBox0R2UFAYyzqyARPLnVtlWmPr0txuxOM="; + }; + + dontNpmBuild = true; + + preBuild = '' + patchShebangs ./* + + substituteInPlace Makefile \ + --replace-fail "/bin/bash" "bash" \ + --replace-fail "\$(SCRIPT_DIR)/node" "${nodejs}/bin/node" \ + --replace-fail "\$(SCRIPT_DIR)/npm" "${nodejs}/bin/npm" + ''; + + buildPhase = '' + runHook preBuild + make js + runHook postBuild + ''; + + npmDepsHash = "sha256-Tr8kYawvPBt+jC7SW8dnKJVWynQyOpKbRD8yd+qbvIs="; + + meta = { + changelog = "https://github.com/beautifier/js-beautify/blob/v${finalAttrs.version}/CHANGELOG.md"; + description = "Beautifier for javascript"; + homepage = "https://beautifier.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "js-beautify"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 830f5ba99fba..76ad3eaa942e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -146,6 +146,7 @@ mapAliases { ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 + inherit (pkgs) js-beautify; # Added 2025-11-06 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 443b3e9768bd..5c0a0546ad15 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -79,7 +79,6 @@ , "he" , "hs-airdrop" , "imapnotify" -, "js-beautify" , "js-yaml" , "jsdoc" , "jshint" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 76cef919a441..d5bb1a068661 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2165,15 +2165,6 @@ let sha512 = "yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg=="; }; }; - "@one-ini/wasm-0.1.1" = { - name = "_at_one-ini_slash_wasm"; - packageName = "@one-ini/wasm"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz"; - sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw=="; - }; - }; "@orval/angular-7.7.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; @@ -8609,15 +8600,6 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-10.0.1" = { - name = "commander"; - packageName = "commander"; - version = "10.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"; - sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="; - }; - }; "commander-11.1.0" = { name = "commander"; packageName = "commander"; @@ -11220,15 +11202,6 @@ let sha512 = "pk+k0oK0PVXdlT4oRp4lwh+unuKB7Ng4iZ2HB+EZ7QCEQizX360Rp/F4aRpgpRgdP2ufB35N+1KppHmYjqIGSg=="; }; }; - "editorconfig-1.0.4" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz"; - sha512 = "L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q=="; - }; - }; "ee-first-1.1.1" = { name = "ee-first"; packageName = "ee-first"; @@ -17574,15 +17547,6 @@ let sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="; }; }; - "js-cookie-3.0.5" = { - name = "js-cookie"; - packageName = "js-cookie"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz"; - sha512 = "cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="; - }; - }; "js-levenshtein-1.1.6" = { name = "js-levenshtein"; packageName = "js-levenshtein"; @@ -21247,15 +21211,6 @@ let sha512 = "sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw=="; }; }; - "minimatch-9.0.1" = { - name = "minimatch"; - packageName = "minimatch"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz"; - sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w=="; - }; - }; "minimatch-9.0.5" = { name = "minimatch"; packageName = "minimatch"; @@ -42187,99 +42142,6 @@ in bypassCache = true; reconstructLock = true; }; - js-beautify = nodeEnv.buildNodePackage { - name = "js-beautify"; - packageName = "js-beautify"; - version = "1.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz"; - sha512 = "9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."@one-ini/wasm-0.1.1" - sources."abbrev-2.0.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-10.0.1" - sources."config-chain-1.1.13" - sources."cross-spawn-7.0.6" - sources."eastasianwidth-0.2.0" - sources."editorconfig-1.0.4" - sources."emoji-regex-9.2.2" - sources."foreground-child-3.3.1" - ( - sources."glob-10.4.5" - // { - dependencies = [ - sources."minimatch-9.0.5" - ]; - } - ) - sources."ini-1.3.8" - sources."is-fullwidth-code-point-3.0.0" - sources."isexe-2.0.0" - sources."jackspeak-3.4.3" - sources."js-cookie-3.0.5" - sources."lru-cache-10.4.3" - sources."minimatch-9.0.1" - sources."minipass-7.1.2" - sources."nopt-7.2.1" - sources."package-json-from-dist-1.0.1" - sources."path-key-3.1.1" - sources."path-scurry-1.11.1" - sources."proto-list-1.2.4" - sources."semver-7.7.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - ( - sources."string-width-cjs-4.2.3" - // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - } - ) - ( - sources."strip-ansi-7.1.0" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - ]; - } - ) - sources."strip-ansi-cjs-6.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - ( - sources."wrap-ansi-cjs-7.0.0" - // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - } - ) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "beautifier.io for node"; - homepage = "https://beautifier.io/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; From 2df0be874e169725d5af8f6a87d5242aed0c4d61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 19:35:21 +0000 Subject: [PATCH 1299/2279] python3Packages.django-webpack-loader: 3.2.1 -> 3.2.2 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 1d9693514dca..201c5546a2aa 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; src = fetchFromGitHub { owner = "django-webpack"; repo = "django-webpack-loader"; tag = version; - hash = "sha256-2CmIaVDSZlqfSJVPVBmOcT89znjxQhe7ZHhe7i6DCGY="; + hash = "sha256-ZT+c6oYpES+3idHO1Dty3r8DHGNtD44ljEbBVOlEmW0="; }; build-system = [ setuptools-scm ]; From 4a540db6aa6535fc75933f9a04f8b2bd56804dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 3 Nov 2025 21:45:58 +0100 Subject: [PATCH 1300/2279] licenses: add mit-enna --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index b3d4a82b87c8..dfdfbef9c16c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -988,6 +988,11 @@ lib.mapAttrs mkLicense ( fullName = "CMU License"; }; + mit-enna = { + spdxId = "MIT-enna"; + fullName = "enna License"; + }; + mit-feh = { spdxId = "MIT-feh"; fullName = "feh License"; From 77b44c97c989f59f78328910eb6b234cc85825a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 3 Nov 2025 21:46:31 +0100 Subject: [PATCH 1301/2279] epeg: replace license with mit-enna Full match according to https://tools.spdx.org/app/check_license/ --- pkgs/by-name/ep/epeg/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix index 6f02069ab731..0fb3be941948 100644 --- a/pkgs/by-name/ep/epeg/package.nix +++ b/pkgs/by-name/ep/epeg/package.nix @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mattes/epeg"; description = "Insanely fast JPEG/ JPG thumbnail scaling"; platforms = platforms.linux ++ platforms.darwin; - license = { - url = "https://github.com/mattes/epeg#license"; - }; + license = lib.licenses.mit-enna; maintainers = with maintainers; [ nh2 ]; mainProgram = "epeg"; }; From 23bc5f181bd1ecb54fab28040c2b19fb091d1b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 2 Nov 2025 16:35:51 -0800 Subject: [PATCH 1302/2279] deltatouch: 1.14.3 -> 2.22.0 Diff: https://codeberg.org/lk108/deltatouch/compare/v1.14.3...v2.22.0 Changelog: https://codeberg.org/lk108/deltatouch/src/tag/v2.22.0/CHANGELOG --- pkgs/by-name/de/deltatouch/package.nix | 75 ++++++++++++++------------ 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index d2dfbb4ce306..273011a02a71 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -2,26 +2,56 @@ lib, stdenv, fetchFromGitea, + fetchFromGitHub, + fetchpatch, cmake, intltool, libdeltachat, lomiri, qt5, quirc, + rustPlatform, }: +let + libdeltachat' = libdeltachat.overrideAttrs rec { + version = "2.22.0"; + src = fetchFromGitHub { + owner = "chatmail"; + repo = "core"; + tag = "v${version}"; + hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY="; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + pname = "chatmail-core"; + inherit version src; + hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ="; + }; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "deltatouch"; - version = "1.14.3"; + version = "2.22.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lk108"; repo = "deltatouch"; - rev = "v${finalAttrs.version}"; - hash = "sha256-vumMAMm9+dKlmi5a6ehIDePpQKkco/smYSM1K/QiXu4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-e8kS6kAjOZ2V33XJuJbvDZ9mfRknDh9un0dn5HtD3UY="; }; + patches = [ + (fetchpatch { + url = "https://codeberg.org/lk108/deltatouch/commit/b19c088ce95e8ca6ff1102c36d91b1db937e3a3a.patch"; + hash = "sha256-58WPUSFaAUqVVU3iq05tae5Gvvr405zDA145V9DbJ54="; + }) + (fetchpatch { + url = "https://codeberg.org/lk108/deltatouch/commit/139f3a4abd772b17142a7f61ef9b442200728f4a.patch"; + hash = "sha256-bEX4g88CCt7AFok8kTeItzCripXFoG2ED7R9lGYoCAw="; + }) + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook intltool @@ -32,50 +62,25 @@ stdenv.mkDerivation (finalAttrs: { qt5.qtbase qt5.qtwebengine qt5.qtquickcontrols2 + libdeltachat' lomiri.lomiri-ui-toolkit lomiri.lomiri-ui-extras lomiri.lomiri-api lomiri.qqc2-suru-style + quirc ]; - postPatch = '' - # Fix all sorts of install locations - substituteInPlace CMakeLists.txt \ - --replace-fail 'set(DATA_DIR /)' 'set(DATA_DIR ''${CMAKE_INSTALL_DATAROOTDIR})' \ - --replace-fail 'RUNTIME DESTINATION ''${CMAKE_INSTALL_PREFIX}' 'RUNTIME DESTINATION ''${CMAKE_INSTALL_BINDIR}' \ - --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \ - --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications" - - substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \ - --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")' - - # Fix import of library dependencies - substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \ - --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"' - substituteInPlace plugins/DeltaHandler/CMakeLists.txt \ - --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"' - - # Fix icon reference in desktop file - substituteInPlace deltatouch.desktop.in \ - --replace-fail 'Icon=assets/logo.svg' 'Icon=deltatouch' - ''; - - postInstall = '' - # Remove clickable metadata & helpers from out - rm $out/{manifest.json,share/push*} - ''; - - meta = with lib; { - changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.rev}/CHANGELOG"; + meta = { + changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.tag}/CHANGELOG"; description = "Messaging app for Ubuntu Touch, powered by Delta Chat core"; longDescription = '' DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core. Delta Chat works over email. ''; homepage = "https://codeberg.org/lk108/deltatouch"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ link2xt ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ link2xt ]; mainProgram = "deltatouch"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) From 9580e43fd11745d007556394f148edbe65ad6aef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 19:49:10 +0000 Subject: [PATCH 1303/2279] python3Packages.types-markdown: 3.9.0.20250906 -> 3.10.0.20251106 --- pkgs/development/python-modules/types-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-markdown/default.nix b/pkgs/development/python-modules/types-markdown/default.nix index 06d4c059603b..cb0860d93fde 100644 --- a/pkgs/development/python-modules/types-markdown/default.nix +++ b/pkgs/development/python-modules/types-markdown/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-markdown"; - version = "3.9.0.20250906"; + version = "3.10.0.20251106"; pyproject = true; src = fetchPypi { pname = "types_markdown"; inherit version; - hash = "sha256-8C3BotEwsJPeSRDGSy0KgRrnAg8DYk30HGZ4GNL+4FA="; + hash = "sha256-EoNvf8vXIh24uusNOi+CC5UFDQgkv6lmXGe00UShr6E="; }; build-system = [ setuptools ]; From 1abb1060755d67d69799197c80f32020b81f3a5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:02:08 +0000 Subject: [PATCH 1304/2279] halo: 2.21.9 -> 2.21.10 --- pkgs/by-name/ha/halo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index ee60138ce9f9..d2cba968efcb 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.21.9"; + version = "2.21.10"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-VSpLdYA0wGcgV9a8w/aRohRCGdBjXmvvRVTIszHUnIE="; + hash = "sha256-AvQbD+1mlAV73WJ3uM/vIwwv/aiEkovUkxatH54chNA="; }; nativeBuildInputs = [ From 216eb4f1d3d4d93844b8eab441cc6b729bb21c58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:05:15 +0000 Subject: [PATCH 1305/2279] sentry-native: 0.12.0 -> 0.12.1 --- 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 09c04b2381d3..bd1675b7e8cd 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 rec { pname = "sentry-native"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-f9G2sCh49ChFcLaDALpfgrOwHh2mxMaUEQTeYffjXks="; + hash = "sha256-zjg5WSa/zKIyFmkXsmtghHaPoexxqE7m9kAA5V9f5Nc="; }; nativeBuildInputs = [ From 3512d725919d709278790e201896d33b242f5999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:09:40 +0000 Subject: [PATCH 1306/2279] qwen-code: 0.1.1 -> 0.1.4 --- pkgs/by-name/qw/qwen-code/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index 78273cb98b48..9b8245cbf7c2 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.1.1"; + version = "0.1.4"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-AciiXcSbRWZJ8+79h8Np2DphzUvxoJ1krsXw4rZxv/E="; + hash = "sha256-go5fjs5aSG6wqxw3y2/OrhPSWGawUjpq+ZxAnVW7Xe8="; }; - npmDepsHash = "sha256-MKpfLzmWIATAPEf8USr2ZJR8ZGTWKkdlXuA4ByYW/jg="; + npmDepsHash = "sha256-UP1pV1CAwGspzUzhHw8yWxIBb7D5jHFdCn7DH4KjdO4="; nativeBuildInputs = [ jq From 89541d18dbaf7089994fb9a6587b231f53fe58dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:16:10 +0000 Subject: [PATCH 1307/2279] openapi-python-client: 0.27.0 -> 0.27.1 --- pkgs/by-name/op/openapi-python-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index fc1e89340071..b7a23b4a0a88 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "openapi-python-client"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${version}"; - hash = "sha256-fQm6BlBqCztV3lqXTHwXece80TYJZ1bGoIJwGye3F2I="; + hash = "sha256-T8EC9wpkHVps7rNgwLx7VdIt1O7v021gUZHbVY6QT/Q="; }; nativeBuildInputs = [ From be4d9c27325718e0d9530f12f7ea6eb86baa65e8 Mon Sep 17 00:00:00 2001 From: Tert0 Date: Thu, 6 Nov 2025 21:23:16 +0100 Subject: [PATCH 1308/2279] nixos/tests/restic-rest-server: fix setting time in tests Use `date -s` instead of `timedatectl set-time` because it fails with `Failed to set time: Requested to set the clock to time before build time, refusing.` --- nixos/tests/restic-rest-server.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/restic-rest-server.nix b/nixos/tests/restic-rest-server.nix index 9e6753d91b2a..c224515b586e 100644 --- a/nixos/tests/restic-rest-server.nix +++ b/nixos/tests/restic-rest-server.nix @@ -86,7 +86,7 @@ in "touch /opt/excluded_file_1 /opt/excluded_file_2", # test that remotebackup runs custom commands and produces a snapshot - "timedatectl set-time '2016-12-13 13:45'", + "date -s '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", 'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', @@ -97,23 +97,23 @@ in "diff -ru ${testDir} /tmp/restore-1/opt", # test that we can create four snapshots in remotebackup and rclonebackup - "timedatectl set-time '2017-12-13 13:45'", + "date -s '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", - "timedatectl set-time '2018-12-13 13:45'", + "date -s '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", - "timedatectl set-time '2018-12-14 13:45'", + "date -s '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", - "timedatectl set-time '2018-12-15 13:45'", + "date -s '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", - "timedatectl set-time '2018-12-16 13:45'", + "date -s '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", From 976c52f8d6c89cf8d222ce724e7a8d4e6c9e7f33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:26:11 +0000 Subject: [PATCH 1309/2279] vue-language-server: 3.1.2 -> 3.1.3 --- pkgs/by-name/vu/vue-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 2765c73bdb0c..a646b93cb859 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -9,19 +9,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-IW7lNvUA2y85nl+xu7vZXtIYNrVdsz5/0o7r+S0kEig="; + hash = "sha256-bzVqlO6Q3pgw9Kor6agpAlqyp3nj96+7f8j2nOzyEZ0="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-BBhTx5pAM+7MlMig11fjodJ2YL1SP+zvdI0JSCLv5lo="; + hash = "sha256-VcQbzvPa5FL8OH4Sk0j64M9D4Si/N4rm9nvIAN/xODs="; }; nativeBuildInputs = [ From 86cfef9c19dfec0bd096b4ecdc82f2539bd81f5a Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 15:26:46 -0500 Subject: [PATCH 1310/2279] json-server: migrate from nodePackages --- pkgs/by-name/js/json-server/package.nix | 29 ++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 379 ------------------ 4 files changed, 30 insertions(+), 380 deletions(-) create mode 100644 pkgs/by-name/js/json-server/package.nix diff --git a/pkgs/by-name/js/json-server/package.nix b/pkgs/by-name/js/json-server/package.nix new file mode 100644 index 000000000000..1ae45a94041b --- /dev/null +++ b/pkgs/by-name/js/json-server/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "json-server"; + version = "1.0.0-beta.3"; + + src = fetchFromGitHub { + owner = "typicode"; + repo = "json-server"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NDSmlW5SiA81Tf6kfkaaKUh05aGZEBajqkLZoxBv0Wc="; + }; + + npmDepsHash = "sha256-HZmCxMKgxJ+ZiRDXh/iVmytNMbPoYzSuI0F8YmkcfZI="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Get a full fake REST API with zero coding in less than 30 seconds"; + homepage = "https://github.com/typicode/json-server"; + license = lib.licenses.fairsource09; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5825fe0b683d..b7953150a3ab 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -148,6 +148,7 @@ mapAliases { inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 + inherit (pkgs) json-server; # Added 2025-11-06 joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ccdb654c4503..2396c250711b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -85,7 +85,6 @@ , "json" , "json-diff" , "json-refs" -, "json-server" , "jsonlint" , "katex" , "lcov-result-merger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a5953db51ca9..f57fbd568fde 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2462,15 +2462,6 @@ let sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA=="; }; }; - "@polka/url-1.0.0-next.28" = { - name = "_at_polka_slash_url"; - packageName = "@polka/url"; - version = "1.0.0-next.28"; - src = fetchurl { - url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz"; - sha512 = "8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw=="; - }; - }; "@prisma/config-6.5.0" = { name = "_at_prisma_slash_config"; packageName = "@prisma/config"; @@ -3317,177 +3308,6 @@ let sha512 = "DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA=="; }; }; - "@tinyhttp/accepts-2.2.3" = { - name = "_at_tinyhttp_slash_accepts"; - packageName = "@tinyhttp/accepts"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.3.tgz"; - sha512 = "9pQN6pJAJOU3McmdJWTcyq7LLFW8Lj5q+DadyKcvp+sxMkEpktKX5sbfJgJuOvjk6+1xWl7pe0YL1US1vaO/1w=="; - }; - }; - "@tinyhttp/app-2.5.2" = { - name = "_at_tinyhttp_slash_app"; - packageName = "@tinyhttp/app"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.5.2.tgz"; - sha512 = "DcB3Y8GQppLQlO2VxRYF7LzTEAoZb+VRQXuIsErcu2fNaM1xdx6NQZDso5rlZUiaeg6KYYRfU34N4XkZbv6jSA=="; - }; - }; - "@tinyhttp/content-disposition-2.2.2" = { - name = "_at_tinyhttp_slash_content-disposition"; - packageName = "@tinyhttp/content-disposition"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.2.tgz"; - sha512 = "crXw1txzrS36huQOyQGYFvhTeLeG0Si1xu+/l6kXUVYpE0TjFjEZRqTbuadQLfKGZ0jaI+jJoRyqaWwxOSHW2g=="; - }; - }; - "@tinyhttp/content-type-0.1.4" = { - name = "_at_tinyhttp_slash_content-type"; - packageName = "@tinyhttp/content-type"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/content-type/-/content-type-0.1.4.tgz"; - sha512 = "dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ=="; - }; - }; - "@tinyhttp/cookie-2.1.1" = { - name = "_at_tinyhttp_slash_cookie"; - packageName = "@tinyhttp/cookie"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.1.tgz"; - sha512 = "h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA=="; - }; - }; - "@tinyhttp/cookie-signature-2.1.1" = { - name = "_at_tinyhttp_slash_cookie-signature"; - packageName = "@tinyhttp/cookie-signature"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz"; - sha512 = "VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw=="; - }; - }; - "@tinyhttp/cors-2.0.1" = { - name = "_at_tinyhttp_slash_cors"; - packageName = "@tinyhttp/cors"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.1.tgz"; - sha512 = "qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A=="; - }; - }; - "@tinyhttp/encode-url-2.1.1" = { - name = "_at_tinyhttp_slash_encode-url"; - packageName = "@tinyhttp/encode-url"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/encode-url/-/encode-url-2.1.1.tgz"; - sha512 = "AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw=="; - }; - }; - "@tinyhttp/etag-2.1.2" = { - name = "_at_tinyhttp_slash_etag"; - packageName = "@tinyhttp/etag"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.2.tgz"; - sha512 = "j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw=="; - }; - }; - "@tinyhttp/forwarded-2.1.2" = { - name = "_at_tinyhttp_slash_forwarded"; - packageName = "@tinyhttp/forwarded"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.2.tgz"; - sha512 = "9H/eulJ68ElY/+zYpTpNhZ7vxGV+cnwaR6+oQSm7bVgZMyuQfgROW/qvZuhmgDTIxnGMXst+Ba4ij6w6Krcs3w=="; - }; - }; - "@tinyhttp/logger-2.1.0" = { - name = "_at_tinyhttp_slash_logger"; - packageName = "@tinyhttp/logger"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/logger/-/logger-2.1.0.tgz"; - sha512 = "Ma1fJ9CwUbn9r61/4HW6+nflsVoslpOnCrfQ6UeZq7GGIgwLzofms3HoSVG7M+AyRMJpxlfcDdbH5oFVroDMKA=="; - }; - }; - "@tinyhttp/proxy-addr-2.2.1" = { - name = "_at_tinyhttp_slash_proxy-addr"; - packageName = "@tinyhttp/proxy-addr"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.2.1.tgz"; - sha512 = "BicqMqVI91hHq2BQmnqJUh0FQUnx7DncwSGgu2ghlh+JZG2rHK2ZN/rXkfhrx1rrUw6hnd0L36O8GPMh01+dDQ=="; - }; - }; - "@tinyhttp/req-2.2.5" = { - name = "_at_tinyhttp_slash_req"; - packageName = "@tinyhttp/req"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.5.tgz"; - sha512 = "trfsXwtmsNjMcGKcLJ+45h912kLRqBQCQD06ams3Tq0kf4gHLxjHjoYOC1Z9yGjOn81XllRx8wqvnvr+Kbe3gw=="; - }; - }; - "@tinyhttp/res-2.2.5" = { - name = "_at_tinyhttp_slash_res"; - packageName = "@tinyhttp/res"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.5.tgz"; - sha512 = "yBsqjWygpuKAVz4moWlP4hqzwiDDqfrn2mA0wviJAcgvGiyOErtlQwXY7aj3aPiCpURvxvEFO//Gdy6yV+xEpA=="; - }; - }; - "@tinyhttp/router-2.2.3" = { - name = "_at_tinyhttp_slash_router"; - packageName = "@tinyhttp/router"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/router/-/router-2.2.3.tgz"; - sha512 = "O0MQqWV3Vpg/uXsMYg19XsIgOhwjyhTYWh51Qng7bxqXixxx2PEvZWnFjP7c84K7kU/nUX41KpkEBTLnznk9/Q=="; - }; - }; - "@tinyhttp/send-2.2.3" = { - name = "_at_tinyhttp_slash_send"; - packageName = "@tinyhttp/send"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.3.tgz"; - sha512 = "o4cVHHGQ8WjVBS8UT0EE/2WnjoybrfXikHwsRoNlG1pfrC/Sd01u1N4Te8cOd/9aNGLr4mGxWb5qTm2RRtEi7g=="; - }; - }; - "@tinyhttp/type-is-2.2.4" = { - name = "_at_tinyhttp_slash_type-is"; - packageName = "@tinyhttp/type-is"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.4.tgz"; - sha512 = "7F328NheridwjIfefBB2j1PEcKKABpADgv7aCJaE8x8EON77ZFrAkI3Rir7pGjopV7V9MBmW88xUQigBEX2rmQ=="; - }; - }; - "@tinyhttp/url-2.1.1" = { - name = "_at_tinyhttp_slash_url"; - packageName = "@tinyhttp/url"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/url/-/url-2.1.1.tgz"; - sha512 = "POJeq2GQ5jI7Zrdmj22JqOijB5/GeX+LEX7DUdml1hUnGbJOTWDx7zf2b5cCERj7RoXL67zTgyzVblBJC+NJWg=="; - }; - }; - "@tinyhttp/vary-0.1.3" = { - name = "_at_tinyhttp_slash_vary"; - packageName = "@tinyhttp/vary"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/vary/-/vary-0.1.3.tgz"; - sha512 = "SoL83sQXAGiHN1jm2VwLUWQSQeDAAl1ywOm6T0b0Cg1CZhVsjoiZadmjhxF6FHCCY7OHHVaLnTgSMxTPIDLxMg=="; - }; - }; "@tokenizer/token-0.3.0" = { name = "_at_tokenizer_slash_token"; packageName = "@tokenizer/token"; @@ -10041,15 +9861,6 @@ let sha512 = "GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw=="; }; }; - "dayjs-1.11.13" = { - name = "dayjs"; - packageName = "dayjs"; - version = "1.11.13"; - src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"; - sha512 = "oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="; - }; - }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -11589,15 +11400,6 @@ let sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="; }; }; - "es-escape-html-0.1.1" = { - name = "es-escape-html"; - packageName = "es-escape-html"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-escape-html/-/es-escape-html-0.1.1.tgz"; - sha512 = "yUx1o+8RsG7UlszmYPtks+dm6Lho2m8lgHMOsLJQsFI0R8XwUJwiMhM1M4E/S8QLeGyf6MkDV/pWgjQ0tdTSyQ=="; - }; - }; "es-get-iterator-1.1.3" = { name = "es-get-iterator"; packageName = "es-get-iterator"; @@ -12228,15 +12030,6 @@ let sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; - "eta-3.5.0" = { - name = "eta"; - packageName = "eta"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz"; - sha512 = "e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug=="; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -15045,15 +14838,6 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "header-range-parser-1.1.3" = { - name = "header-range-parser"; - packageName = "header-range-parser"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/header-range-parser/-/header-range-parser-1.1.3.tgz"; - sha512 = "B9zCFt3jH8g09LR1vHL4pcAn8yMEtlSlOUdQemzHMRKMImNIhhszdeosYFfNW0WXKQtXIlWB+O4owHJKvEJYaA=="; - }; - }; "heap-0.2.7" = { name = "heap"; packageName = "heap"; @@ -15396,15 +15180,6 @@ let sha512 = "YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q=="; }; }; - "http-status-emojis-2.2.0" = { - name = "http-status-emojis"; - packageName = "http-status-emojis"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-status-emojis/-/http-status-emojis-2.2.0.tgz"; - sha512 = "ompKtgwpx8ff0hsbpIB7oE4ax1LXoHmftsHHStMELX56ivG3GhofTX8ZHWlUaFKfGjcGjw6G3rPk7dJRXMmbbg=="; - }; - }; "http2-client-1.3.5" = { name = "http2-client"; packageName = "http2-client"; @@ -15828,15 +15603,6 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; - "inflection-3.0.2" = { - name = "inflection"; - packageName = "inflection"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inflection/-/inflection-3.0.2.tgz"; - sha512 = "+Bg3+kg+J6JUWn8J6bzFmOWkTQ6L/NHfDRSYU+EVvuKHDxUDHAXgqixHfVlzuBQaPOTac8hn43aPhMNk6rMe3g=="; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -19509,15 +19275,6 @@ let sha512 = "RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ=="; }; }; - "lowdb-7.0.1" = { - name = "lowdb"; - packageName = "lowdb"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lowdb/-/lowdb-7.0.1.tgz"; - sha512 = "neJAj8GwF0e8EpycYIDFqEPcx9Qz4GUho20jWFR7YiFeXzF1YMLdxB36PypcTSPMA+4+LvgyMacYhlr18Zlymw=="; - }; - }; "lower-case-2.0.2" = { name = "lower-case"; packageName = "lower-case"; @@ -20995,15 +20752,6 @@ let sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; }; - "milliparsec-4.0.0" = { - name = "milliparsec"; - packageName = "milliparsec"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/milliparsec/-/milliparsec-4.0.0.tgz"; - sha512 = "/wk9d4Z6/9ZvoEH/6BI4TrTCgmkpZPuSRN/6fI9aUHOfXdNTuj/VhLS7d+NqG26bi6L9YmGXutVYvWC8zQ0qtA=="; - }; - }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -21022,15 +20770,6 @@ let sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; }; - "mime-4.0.4" = { - name = "mime"; - packageName = "mime"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz"; - sha512 = "v8yqInVjhXyqP6+Kw4fV3ZzeMRqEW6FotRsKXjRS5VMTNIuXsdRoAvklpoRgSqXm6o9VNH4/C0mgedko9DdLsQ=="; - }; - }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -21544,15 +21283,6 @@ let sha512 = "tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA=="; }; }; - "mrmime-2.0.1" = { - name = "mrmime"; - packageName = "mrmime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz"; - sha512 = "Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ=="; - }; - }; "ms-0.7.3" = { name = "ms"; packageName = "ms"; @@ -26018,15 +25748,6 @@ let sha512 = "dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA=="; }; }; - "regexparam-2.0.2" = { - name = "regexparam"; - packageName = "regexparam"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regexparam/-/regexparam-2.0.2.tgz"; - sha512 = "A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w=="; - }; - }; "registry-auth-token-3.3.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; @@ -28160,15 +27881,6 @@ let sha512 = "awzaaIPtYFdexLr6TBpcZSGPB6D1RInNO/qNetgaJloPDF/D0GkVtLvGEp8InfmLV7CyLyQ5fIRP+tVN/JmWQA=="; }; }; - "sirv-2.0.4" = { - name = "sirv"; - packageName = "sirv"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz"; - sha512 = "94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ=="; - }; - }; "skin-tone-4.0.0" = { name = "skin-tone"; packageName = "skin-tone"; @@ -28502,15 +28214,6 @@ let sha512 = "aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg=="; }; }; - "sort-on-6.1.0" = { - name = "sort-on"; - packageName = "sort-on"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-on/-/sort-on-6.1.0.tgz"; - sha512 = "WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA=="; - }; - }; "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; @@ -28970,15 +28673,6 @@ let sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; }; }; - "steno-4.0.2" = { - name = "steno"; - packageName = "steno"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/steno/-/steno-4.0.2.tgz"; - sha512 = "yhPIQXjrlt1xv7dyPQg2P17URmXbuM5pdGkpiMB3RenprfiBlvK415Lctfe0eshk90oA7/tNq7WEiMK8RSP39A=="; - }; - }; "stop-iteration-iterator-1.1.0" = { name = "stop-iteration-iterator"; packageName = "stop-iteration-iterator"; @@ -30302,15 +29996,6 @@ let sha512 = "F+3tYmXnpO2gyhZQ7o8yakELJH3FtKISI/FU0iWvchOWFUXiFnjbEBoumSzfcK1P71Qxzx2az4lVK4Dkq4KSew=="; }; }; - "totalist-3.0.1" = { - name = "totalist"; - packageName = "totalist"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz"; - sha512 = "sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ=="; - }; - }; "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -42515,70 +42200,6 @@ in bypassCache = true; reconstructLock = true; }; - json-server = nodeEnv.buildNodePackage { - name = "json-server"; - packageName = "json-server"; - version = "1.0.0-beta.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-1.0.0-beta.3.tgz"; - sha512 = "DwE69Ep5ccwIJZBUIWEENC30Yj8bwr4Ax9W9VoIWAYnB8Sj4ReptscO8/DRHv/nXwVlmb3Bk73Ls86+VZdYkkA=="; - }; - dependencies = [ - sources."@polka/url-1.0.0-next.28" - sources."@tinyhttp/accepts-2.2.3" - sources."@tinyhttp/app-2.5.2" - sources."@tinyhttp/content-disposition-2.2.2" - sources."@tinyhttp/content-type-0.1.4" - sources."@tinyhttp/cookie-2.1.1" - sources."@tinyhttp/cookie-signature-2.1.1" - sources."@tinyhttp/cors-2.0.1" - sources."@tinyhttp/encode-url-2.1.1" - sources."@tinyhttp/etag-2.1.2" - sources."@tinyhttp/forwarded-2.1.2" - sources."@tinyhttp/logger-2.1.0" - sources."@tinyhttp/proxy-addr-2.2.1" - sources."@tinyhttp/req-2.2.5" - sources."@tinyhttp/res-2.2.5" - sources."@tinyhttp/router-2.2.3" - sources."@tinyhttp/send-2.2.3" - sources."@tinyhttp/type-is-2.2.4" - sources."@tinyhttp/url-2.1.1" - sources."@tinyhttp/vary-0.1.3" - sources."chalk-5.4.1" - sources."chokidar-4.0.3" - sources."colorette-2.0.20" - sources."dayjs-1.11.13" - sources."dot-prop-9.0.0" - sources."es-escape-html-0.1.1" - sources."eta-3.5.0" - sources."header-range-parser-1.1.3" - sources."http-status-emojis-2.2.0" - sources."inflection-3.0.2" - sources."ipaddr.js-2.2.0" - sources."json5-2.2.3" - sources."lowdb-7.0.1" - sources."milliparsec-4.0.0" - sources."mime-4.0.4" - sources."mrmime-2.0.1" - sources."negotiator-0.6.4" - sources."readdirp-4.1.2" - sources."regexparam-2.0.2" - sources."sirv-2.0.4" - sources."sort-on-6.1.0" - sources."steno-4.0.2" - sources."totalist-3.0.1" - sources."type-fest-4.37.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "[![Node.js CI](https://github.com/typicode/json-server/actions/workflows/node.js.yml/badge.svg)](https://github.com/typicode/json-server/actions/workflows/node.js.yml)"; - homepage = "https://github.com/typicode/json-server#readme"; - license = "SEE LICENSE IN ./LICENSE"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; jsonlint = nodeEnv.buildNodePackage { name = "jsonlint"; packageName = "jsonlint"; From 8259d2c7928b9f83ae7b03a9e693f7a48c75792a Mon Sep 17 00:00:00 2001 From: ghpzin Date: Thu, 6 Nov 2025 23:18:05 +0300 Subject: [PATCH 1311/2279] olive-editor: cleanup - replace `version` with correct format --- pkgs/by-name/ol/olive-editor/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix index 6d98955eea6c..09d1b26ac1df 100644 --- a/pkgs/by-name/ol/olive-editor/package.nix +++ b/pkgs/by-name/ol/olive-editor/package.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { pname = "olive-editor"; - version = "unstable-2023-06-12"; + version = "0.1.2-unstable-2023-06-12"; src = fetchFromGitHub { fetchSubmodules = true; From cdbbcc23f586faeef6439edeaebbf68bf7e0dddb Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 15:57:29 -0800 Subject: [PATCH 1312/2279] python3Packages.fickling: cleanup --- pkgs/development/python-modules/fickling/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix index e535f4e96912..bb657156768a 100644 --- a/pkgs/development/python-modules/fickling/default.nix +++ b/pkgs/development/python-modules/fickling/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, flit-core, pytestCheckHook, - pythonOlder, torch, torchvision, }: @@ -16,7 +15,6 @@ buildPythonPackage rec { version = "0.1.3"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "trailofbits"; @@ -43,11 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "fickling" ]; - meta = with lib; { + meta = { description = "Python pickling decompiler and static analyzer"; homepage = "https://github.com/trailofbits/fickling"; changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}"; - license = licenses.lgpl3Plus; + license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; } From eabba2c232f2b5fd3154bbce0223f27496ce678f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 15:57:29 -0800 Subject: [PATCH 1313/2279] python3Packages.fickling: 0.1.3 -> 0.1.4 --- .../python-modules/fickling/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix index bb657156768a..e4887b4a2836 100644 --- a/pkgs/development/python-modules/fickling/default.nix +++ b/pkgs/development/python-modules/fickling/default.nix @@ -5,22 +5,23 @@ distutils, fetchFromGitHub, flit-core, + numpy, pytestCheckHook, torch, torchvision, + stdlib-list, }: buildPythonPackage rec { pname = "fickling"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; - src = fetchFromGitHub { owner = "trailofbits"; repo = "fickling"; tag = "v${version}"; - hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ="; + hash = "sha256-EgVtMYPwSVBlw1bmX3qEeUKvEY7Awv6DOB5tgSLG+xQ="; }; build-system = [ @@ -28,10 +29,16 @@ buildPythonPackage rec { flit-core ]; - dependencies = [ astunparse ]; + dependencies = [ + astunparse + stdlib-list + ]; + + pythonRelaxDeps = [ "stdlib_list" ]; optional-dependencies = { torch = [ + numpy torch torchvision ]; @@ -39,12 +46,18 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + disabledTestPaths = [ + # https://github.com/trailofbits/fickling/issues/162 + # AttributeError: module 'numpy.lib.format' has no attribute... + "test/test_polyglot.py" + ]; + pythonImportsCheck = [ "fickling" ]; meta = { description = "Python pickling decompiler and static analyzer"; homepage = "https://github.com/trailofbits/fickling"; - changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}"; + changelog = "https://github.com/trailofbits/fickling/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; From 6f9fc9138c6daec085b4596150ee0446a000fb09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:37:35 +0000 Subject: [PATCH 1314/2279] duc: 1.4.5 -> 1.4.6 --- pkgs/by-name/du/duc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix index 7da393dae979..be1dead197cc 100644 --- a/pkgs/by-name/du/duc/package.nix +++ b/pkgs/by-name/du/duc/package.nix @@ -15,13 +15,13 @@ assert enableCairo -> cairo != null && pango != null; stdenv.mkDerivation rec { pname = "duc"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "zevv"; repo = "duc"; rev = version; - sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk="; + sha256 = "sha256-hZ8bhPXS/trt6ZePjfuwx8PEfv0xCBqSJxRonLB7Ui0="; }; nativeBuildInputs = [ From 888865f645e67586e1da3cebb679f4aa7c506313 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:26:37 -0500 Subject: [PATCH 1315/2279] coc-cmake: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-cmake/package.nix | 54 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------- 6 files changed, 61 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-cmake/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 72f38d3e94d4..d9cc90058d09 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -2,6 +2,7 @@ buildVimPlugin, coc-basedpyright, coc-clangd, + coc-cmake, coc-css, coc-diagnostic, coc-docker, @@ -23,6 +24,11 @@ final: prev: { src = "${coc-clangd}/lib/node_modules/coc-clangd"; }; + coc-cmake = buildVimPlugin { + inherit (coc-cmake) pname version meta; + src = "${coc-cmake}/lib/node_modules/coc-cmake"; + }; + coc-css = buildVimPlugin { inherit (coc-css) pname version meta; src = "${coc-css}/lib/node_modules/coc-css"; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 3a24fa7562fe..d13078156e7b 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -6,7 +6,6 @@ final: prev: let nodePackageNames = [ - "coc-cmake" "coc-emmet" "coc-eslint" "coc-flutter" diff --git a/pkgs/by-name/co/coc-cmake/package.nix b/pkgs/by-name/co/coc-cmake/package.nix new file mode 100644 index 000000000000..74bbc83fc6f4 --- /dev/null +++ b/pkgs/by-name/co/coc-cmake/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + nodejs, + pnpm_8, + fetchFromGitHub, + npmHooks, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "coc-cmake"; + version = "0-unstable-2024-10-21"; + + src = fetchFromGitHub { + owner = "voldikss"; + repo = "coc-extensions"; + rev = "69c81e04fd3350bb75b09232d8ccf26d20075111"; + hash = "sha256-VZRHpy0OTmoQyOEa0vIJl/VkV52r0HEtTzY1fjr6yQ0="; + }; + + pnpmDeps = pnpm_8.fetchDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + fetcherVersion = 2; + hash = "sha256-wQ9dcqY7BVXc7wpsHlYNpc7utL1+MkdTCu77Wh8+QWc="; + }; + + pnpmWorkspaces = [ "coc-cmake" ]; + + nativeBuildInputs = [ + nodejs + pnpm_8.configHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm run build coc-cmake + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/node_modules + mv packages/coc-cmake $out/lib/node_modules/coc-cmake + mv node_modules/.pnpm/ $out/lib/node_modules/.pnpm + runHook postInstall + ''; + +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5825fe0b683d..713e3d8c64c5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -72,6 +72,7 @@ mapAliases { inherit (pkgs) cdktf-cli; # added 2025-10-02 inherit (pkgs) clean-css-cli; # added 2023-08-18 inherit (pkgs) coc-clangd; # added 2024-06-29 + inherit (pkgs) coc-cmake; # Added 2025-11-05 inherit (pkgs) coc-css; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29 inherit (pkgs) coc-docker; # added 2025-10-01 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ccdb654c4503..6ef2af231cc8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,7 +21,6 @@ , "browser-sync" , "cdk8s-cli" , "clipboard-cli" -, "coc-cmake" , "coc-emmet" , "coc-eslint" , "coc-flutter" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a5953db51ca9..97c0d10608dc 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37670,24 +37670,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-cmake = nodeEnv.buildNodePackage { - name = "coc-cmake"; - packageName = "coc-cmake"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.2.2.tgz"; - sha512 = "CfZzfacIlFZqG5fjXDHiAu3ucy5YkhuW3+pv5iIGakChSuWoNYenG1LPDG7DEtlLRtFjfAkUbE7StcpMTUiaDw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "coc.nvim extension for cmake language"; - homepage = "https://github.com/voldikss/coc-cmake#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-emmet = nodeEnv.buildNodePackage { name = "coc-emmet"; packageName = "coc-emmet"; From f66077b5a85046bb7ed0f938e3be0981e3d7e8a2 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:28:31 -0500 Subject: [PATCH 1316/2279] coc-emmet: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-emmet/package.nix | 45 +++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 50 ------------------- 6 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/co/coc-emmet/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index d9cc90058d09..8fdc7d5fbb32 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -6,6 +6,7 @@ coc-css, coc-diagnostic, coc-docker, + coc-emmet, coc-explorer, coc-git, coc-pyright, @@ -44,6 +45,11 @@ final: prev: { src = "${coc-docker}/lib/node_modules/coc-docker"; }; + coc-emmet = buildVimPlugin { + inherit (coc-emmet) pname version meta; + src = "${coc-emmet}/lib/node_modules/coc-emmet"; + }; + coc-explorer = buildVimPlugin { inherit (coc-explorer) pname version meta; src = "${coc-explorer}/lib/node_modules/coc-explorer"; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index d13078156e7b..355e0a6d30f2 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -6,7 +6,6 @@ final: prev: let nodePackageNames = [ - "coc-emmet" "coc-eslint" "coc-flutter" "coc-go" diff --git a/pkgs/by-name/co/coc-emmet/package.nix b/pkgs/by-name/co/coc-emmet/package.nix new file mode 100644 index 000000000000..78b43c0d3196 --- /dev/null +++ b/pkgs/by-name/co/coc-emmet/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-emmet"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-emmet"; + tag = finalAttrs.version; + hash = "sha256-0f9wSn7W+8Pxce7hbdfNpL33oykuVGNifNnSPPdhKb8="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-8oo/XG9WxgKIbhfBWiGry+SZJdQIFe/T5i9S0hgjmp0="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Emmet extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-emmet"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 713e3d8c64c5..a0bbb78b1c31 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -76,6 +76,7 @@ mapAliases { inherit (pkgs) coc-css; # added 2024-06-29 inherit (pkgs) coc-diagnostic; # added 2024-06-29 inherit (pkgs) coc-docker; # added 2025-10-01 + inherit (pkgs) coc-emmet; # Added 2025-11-05 inherit (pkgs) coc-explorer; # added 2025-10-01 inherit (pkgs) coc-git; # added 2025-10-01 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6ef2af231cc8..288f743b0067 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,7 +21,6 @@ , "browser-sync" , "cdk8s-cli" , "clipboard-cli" -, "coc-emmet" , "coc-eslint" , "coc-flutter" , "coc-go" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 97c0d10608dc..cb4a041ab17e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -914,15 +914,6 @@ let sha512 = "YfASnrhJ+ve6Q43ZiDwmpBgYgi2u0bYjeAVi2tDfN7YWAKO8X9EEOuPGtqbJpPLM6TfAHimghICjWe2eaJ8BAg=="; }; }; - "@emmetio/extract-abbreviation-0.1.6" = { - name = "_at_emmetio_slash_extract-abbreviation"; - packageName = "@emmetio/extract-abbreviation"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz"; - sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; - }; - }; "@eslint-community/eslint-utils-4.5.1" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -17943,15 +17934,6 @@ let sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; - "jsonc-parser-1.0.3" = { - name = "jsonc-parser"; - packageName = "jsonc-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-1.0.3.tgz"; - sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g=="; - }; - }; "jsonc-parser-2.2.1" = { name = "jsonc-parser"; packageName = "jsonc-parser"; @@ -32516,15 +32498,6 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vscode-emmet-helper-1.2.17" = { - name = "vscode-emmet-helper"; - packageName = "vscode-emmet-helper"; - version = "1.2.17"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.2.17.tgz"; - sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; - }; - }; "vscode-json-languageservice-4.2.1" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; @@ -37670,29 +37643,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-emmet = nodeEnv.buildNodePackage { - name = "coc-emmet"; - packageName = "coc-emmet"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-emmet/-/coc-emmet-1.1.6.tgz"; - sha512 = "lvHA9iSgU/46Iw7E14tSP+Hh1e6STYUegqTBGDPQ/9L9JOicE2USqwuo2y5cbslc2RQqv3EdUIr9nQf0T725mQ=="; - }; - dependencies = [ - sources."@emmetio/extract-abbreviation-0.1.6" - sources."jsonc-parser-1.0.3" - sources."vscode-emmet-helper-1.2.17" - sources."vscode-languageserver-types-3.17.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "emmet extension for coc"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; From 6667711e2c0c903f96064f16ba0c072809f75ec6 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:29:45 -0500 Subject: [PATCH 1317/2279] coc-eslint: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-eslint/package.nix | 29 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------ 6 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-eslint/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 8fdc7d5fbb32..386ca166259c 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -7,6 +7,7 @@ coc-diagnostic, coc-docker, coc-emmet, + coc-eslint, coc-explorer, coc-git, coc-pyright, @@ -50,6 +51,11 @@ final: prev: { src = "${coc-emmet}/lib/node_modules/coc-emmet"; }; + coc-eslint = buildVimPlugin { + inherit (coc-eslint) pname version meta; + src = "${coc-eslint}/lib/node_modules/coc-eslint"; + }; + coc-explorer = buildVimPlugin { inherit (coc-explorer) pname version meta; src = "${coc-explorer}/lib/node_modules/coc-explorer"; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 355e0a6d30f2..2aa9373bf7be 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -6,7 +6,6 @@ final: prev: let nodePackageNames = [ - "coc-eslint" "coc-flutter" "coc-go" "coc-haxe" diff --git a/pkgs/by-name/co/coc-eslint/package.nix b/pkgs/by-name/co/coc-eslint/package.nix new file mode 100644 index 000000000000..c6380b7cf82e --- /dev/null +++ b/pkgs/by-name/co/coc-eslint/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-eslint"; + version = "3.0.15"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-eslint"; + tag = finalAttrs.version; + hash = "sha256-41mUQpiFzBWMRoK7aQu0Gu4FBsYZdHbHPzrSMZR6RLQ="; + }; + + npmDepsHash = "sha256-g5gLAtBmwsHBCDHPfcVPETH7+djh0piJ6nJYSsy9GJQ="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Eslint extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-eslint"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a0bbb78b1c31..fc4ddcf9e584 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -77,6 +77,7 @@ mapAliases { inherit (pkgs) coc-diagnostic; # added 2024-06-29 inherit (pkgs) coc-docker; # added 2025-10-01 inherit (pkgs) coc-emmet; # Added 2025-11-05 + inherit (pkgs) coc-eslint; # Added 2025-11-05; inherit (pkgs) coc-explorer; # added 2025-10-01 inherit (pkgs) coc-git; # added 2025-10-01 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 288f743b0067..a49371e2cbed 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,7 +21,6 @@ , "browser-sync" , "cdk8s-cli" , "clipboard-cli" -, "coc-eslint" , "coc-flutter" , "coc-go" , "coc-haxe" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index cb4a041ab17e..f58b8c1d4c14 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37643,24 +37643,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-eslint = nodeEnv.buildNodePackage { - name = "coc-eslint"; - packageName = "coc-eslint"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.7.0.tgz"; - sha512 = "NCL4qXmj9CClh9E87BagmHx4wLmKL7OzK0eLBZMovXphG5woHKPLwMfDOfoNEthloE4G3bG3TzoMsQIwhKvayA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Eslint extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-eslint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-flutter = nodeEnv.buildNodePackage { name = "coc-flutter"; packageName = "coc-flutter"; From 57a98fb2839429ba0330dd465395058e9ed81a68 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:30:59 -0500 Subject: [PATCH 1318/2279] coc-flutter: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-flutter/package.nix | 72 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ----- 6 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/co/coc-flutter/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 386ca166259c..4d8d6d752d1b 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -9,6 +9,7 @@ coc-emmet, coc-eslint, coc-explorer, + coc-flutter, coc-git, coc-pyright, coc-sh, @@ -61,6 +62,11 @@ final: prev: { src = "${coc-explorer}/lib/node_modules/coc-explorer"; }; + coc-flutter = buildVimPlugin { + inherit (coc-flutter) pname version meta; + src = "${coc-flutter}/lib/node_modules/coc-flutter"; + }; + coc-git = buildVimPlugin { inherit (coc-git) pname version meta; src = "${coc-git}/lib/node_modules/coc-git"; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 2aa9373bf7be..be6d66429ff2 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -6,7 +6,6 @@ final: prev: let nodePackageNames = [ - "coc-flutter" "coc-go" "coc-haxe" "coc-highlight" diff --git a/pkgs/by-name/co/coc-flutter/package.nix b/pkgs/by-name/co/coc-flutter/package.nix new file mode 100644 index 000000000000..e720ed66bc48 --- /dev/null +++ b/pkgs/by-name/co/coc-flutter/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + esbuild, + buildGoModule, + yarnBuildHook, + yarnInstallHook, + yarnConfigHook, + nodejs, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script, +}: +let + esbuild' = + let + version = "0.9.0"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-+4oNM39cN7zCld4WwLVDHQFyvVhdsqKTLLiF2a9+KP0="; + }; + vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + } + ); + }; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "coc-flutter"; + version = "0-unstable-2023-03-22"; + + src = fetchFromGitHub { + owner = "iamcco"; + repo = "coc-flutter"; + rev = "883c269eaacbeddbd4fb08e32e6a05051933429d"; + hash = "sha256-K3NvqZnAEj/qfsvomYl7dPtEo3ad7w1dCfZHjMRwbAA="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-aEjfhjkMlHSdISfG9baRfaUiTUbj8TPZi2edAFiqKlg="; + }; + + nativeBuildInputs = [ + yarnBuildHook + yarnConfigHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Flutter support for (Neo)vim"; + homepage = "https://github.com/iamcco/coc-flutter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index fc4ddcf9e584..03ec60b68424 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -79,6 +79,7 @@ mapAliases { inherit (pkgs) coc-emmet; # Added 2025-11-05 inherit (pkgs) coc-eslint; # Added 2025-11-05; inherit (pkgs) coc-explorer; # added 2025-10-01 + inherit (pkgs) coc-flutter; # Added 2025-11-05 inherit (pkgs) coc-git; # added 2025-10-01 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a49371e2cbed..099817681e41 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,7 +21,6 @@ , "browser-sync" , "cdk8s-cli" , "clipboard-cli" -, "coc-flutter" , "coc-go" , "coc-haxe" , "coc-highlight" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f58b8c1d4c14..745982865423 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37643,23 +37643,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-flutter = nodeEnv.buildNodePackage { - name = "coc-flutter"; - packageName = "coc-flutter"; - version = "1.9.10"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-flutter/-/coc-flutter-1.9.10.tgz"; - sha512 = "Of3V4dn76ZdBp0ZjUq0c600Z1IMzT9k6574a7V/pnxMIb1gYP8+MgDqO1Mw/YzNTU/ovXQLb2zGJm6UnJhgQ3g=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "flutter support for (Neo)vim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; From 9ec68a08a425c0a56de07bd711d41235ba44f4fc Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:32:07 -0500 Subject: [PATCH 1319/2279] coc-haxe: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-haxe/package.nix | 31 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----------- 6 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-haxe/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 4d8d6d752d1b..779c2f122198 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -11,6 +11,7 @@ coc-explorer, coc-flutter, coc-git, + coc-haxe, coc-pyright, coc-sh, coc-spell-checker, @@ -72,6 +73,11 @@ final: prev: { src = "${coc-git}/lib/node_modules/coc-git"; }; + coc-haxe = buildVimPlugin { + inherit (coc-haxe) pname version meta; + src = "${coc-haxe}/lib/node_modules/coc-haxe"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index be6d66429ff2..ef789c87c9ee 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-haxe" "coc-highlight" "coc-html" "coc-java" diff --git a/pkgs/by-name/co/coc-haxe/package.nix b/pkgs/by-name/co/coc-haxe/package.nix new file mode 100644 index 000000000000..ba184cbf75fe --- /dev/null +++ b/pkgs/by-name/co/coc-haxe/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-haxe"; + version = "0.21.1"; + + src = fetchFromGitHub { + owner = "vantreeseba"; + repo = "coc-haxe"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iveWhxkrX8EaBfh8IwKrTLw1AiGBmNva9G0p3rMwOi8="; + }; + + npmDepsHash = "sha256-1RrhUyICnYDM9qC9dEZLDPQdsFqcu8Nn/enfm+PgM00="; + + npmBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Haxe language server extension for coc.nvim"; + homepage = "https://github.com/vantreeseba/coc-haxe"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 03ec60b68424..f58b18ef74cd 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -81,6 +81,7 @@ mapAliases { inherit (pkgs) coc-explorer; # added 2025-10-01 inherit (pkgs) coc-flutter; # Added 2025-11-05 inherit (pkgs) coc-git; # added 2025-10-01 + inherit (pkgs) coc-haxe; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 099817681e41..d62643d581f3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-haxe" , "coc-highlight" , "coc-html" , "coc-java" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 745982865423..f3018c07041c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,24 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-haxe = nodeEnv.buildNodePackage { - name = "coc-haxe"; - packageName = "coc-haxe"; - version = "0.21.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.21.1.tgz"; - sha512 = "oz4kKSH/rw3pk/T3Ecro2qDpG4nt64BuyKyJkiETEIf2HMgbmYzFdz6e8TklobclQTbOic903+3azwze95BVsQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Haxe language server extension for coc.nvim"; - homepage = "https://github.com/vantreeseba/coc-haxe#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-highlight = nodeEnv.buildNodePackage { name = "coc-highlight"; packageName = "coc-highlight"; From 8c72d3555bfebe44fb482a0dad9b14c72e2ffd62 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:34:22 -0500 Subject: [PATCH 1320/2279] coc-highlight: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-highlight/package.nix | 45 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ------- 6 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/co/coc-highlight/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 779c2f122198..ad047a6edec0 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -12,6 +12,7 @@ coc-flutter, coc-git, coc-haxe, + coc-highlight, coc-pyright, coc-sh, coc-spell-checker, @@ -78,6 +79,11 @@ final: prev: { src = "${coc-haxe}/lib/node_modules/coc-haxe"; }; + coc-highlight = buildVimPlugin { + inherit (coc-highlight) pname version meta; + src = "${coc-highlight}/lib/node_modules/coc-highlight"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index ef789c87c9ee..5ea1f4f27b5d 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-highlight" "coc-html" "coc-java" "coc-jest" diff --git a/pkgs/by-name/co/coc-highlight/package.nix b/pkgs/by-name/co/coc-highlight/package.nix new file mode 100644 index 000000000000..1e013743718e --- /dev/null +++ b/pkgs/by-name/co/coc-highlight/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-highlight"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-highlight"; + tag = finalAttrs.version; + hash = "sha256-VksCqyB8b3Bk2BsnYFr6cJINqUzVY+px3TCiWzqFTzE="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-z9pJXGdUXNU8Bfhp7PUPZk7rCCAhnQpcmXUoHUaFAIU="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + yarnBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Highlight extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-highlight"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f58b18ef74cd..79a20cc46c01 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -82,6 +82,7 @@ mapAliases { inherit (pkgs) coc-flutter; # Added 2025-11-05 inherit (pkgs) coc-git; # added 2025-10-01 inherit (pkgs) coc-haxe; # Added 2025-11-05 + inherit (pkgs) coc-highlight; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d62643d581f3..e2c788b4009c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-highlight" , "coc-html" , "coc-java" , "coc-jest" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f3018c07041c..944468075c9b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,23 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-highlight = nodeEnv.buildNodePackage { - name = "coc-highlight"; - packageName = "coc-highlight"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-2.0.4.tgz"; - sha512 = "X6VGCqpDML0oRcyH77ANoQ0BAxEsQqVMB9OPbfXB/nSdN3xcO8+M1hNSJm4pBekvywxm6VQUsh/zFD4V55nxLw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Highlight extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html"; From 5028d9b6441991f24988e6439cf8f2f06b648ae3 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:35:32 -0500 Subject: [PATCH 1321/2279] coc-html: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-html/package.nix | 43 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 21 --------- 6 files changed, 50 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/co/coc-html/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index ad047a6edec0..72041c1658a5 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -13,6 +13,7 @@ coc-git, coc-haxe, coc-highlight, + coc-html, coc-pyright, coc-sh, coc-spell-checker, @@ -84,6 +85,11 @@ final: prev: { src = "${coc-highlight}/lib/node_modules/coc-highlight"; }; + coc-html = buildVimPlugin { + inherit (coc-html) pname version meta; + src = "${coc-html}/lib/node_modules/coc-html"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 5ea1f4f27b5d..9c0072aadb14 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-html" "coc-java" "coc-jest" "coc-json" diff --git a/pkgs/by-name/co/coc-html/package.nix b/pkgs/by-name/co/coc-html/package.nix new file mode 100644 index 000000000000..b1cb3dc0b246 --- /dev/null +++ b/pkgs/by-name/co/coc-html/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-html"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-html"; + tag = finalAttrs.version; + hash = "sha256-dMjkG/djycRhRPIMCQ1PYvfXVxlWHtcNjouW+bCm59I="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-hb8H7tI4OouLBTwuSx3UVw7I52HTYxOFkAVJGaIKHzI="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Html language server extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-html"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 79a20cc46c01..f3e7213e750c 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -83,6 +83,7 @@ mapAliases { inherit (pkgs) coc-git; # added 2025-10-01 inherit (pkgs) coc-haxe; # Added 2025-11-05 inherit (pkgs) coc-highlight; # Added 2025-11-05 + inherit (pkgs) coc-html; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index e2c788b4009c..23b4797648c1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-html" , "coc-java" , "coc-jest" , "coc-json" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 944468075c9b..a17628a0d3b0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,27 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-html = nodeEnv.buildNodePackage { - name = "coc-html"; - packageName = "coc-html"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-html/-/coc-html-1.8.0.tgz"; - sha512 = "NXmTfHF/TxysUeSstDyLUcfv6LlK08PnltVZCe1J7XpG/QHRRq0sjhkNqkHJVfFT/Vo2NC4lv5Bc9UIWdjGGuw=="; - }; - dependencies = [ - sources."typescript-4.9.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Html extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-html#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; From 2e191e2b1a51fb55c816e01261b4460fbcbb749b Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:37:07 -0500 Subject: [PATCH 1322/2279] coc-java: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-java/package.nix | 29 ++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 34 ------------------- 6 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 pkgs/by-name/co/coc-java/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 72041c1658a5..10e1e691cec4 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -14,6 +14,7 @@ coc-haxe, coc-highlight, coc-html, + coc-java, coc-pyright, coc-sh, coc-spell-checker, @@ -90,6 +91,11 @@ final: prev: { src = "${coc-html}/lib/node_modules/coc-html"; }; + coc-java = buildVimPlugin { + inherit (coc-java) pname version meta; + src = "${coc-java}/lib/node_modules/coc-java"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 9c0072aadb14..b1ec84635187 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-java" "coc-jest" "coc-json" "coc-lists" diff --git a/pkgs/by-name/co/coc-java/package.nix b/pkgs/by-name/co/coc-java/package.nix new file mode 100644 index 000000000000..ff4341114e2e --- /dev/null +++ b/pkgs/by-name/co/coc-java/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-java"; + version = "1.26.1"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-java"; + tag = finalAttrs.version; + hash = "sha256-OKqZk1pt8qt6O+kHYdhAAha5S8YTJBFQPn7oIrjGZgI="; + }; + + npmDepsHash = "sha256-FF7EAf6SvO1sGMIE8FCS7MbnpVwVUwVg0SVUsX+i7zg="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Java extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-java"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f3e7213e750c..9d0b168ef9d7 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -85,6 +85,7 @@ mapAliases { inherit (pkgs) coc-highlight; # Added 2025-11-05 inherit (pkgs) coc-html; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) coc-java; # Added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 23b4797648c1..a20a619a2d51 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-java" , "coc-jest" , "coc-json" , "coc-lists" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a17628a0d3b0..7b2011931045 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,40 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-java = nodeEnv.buildNodePackage { - name = "coc-java"; - packageName = "coc-java"; - version = "1.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.26.1.tgz"; - sha512 = "1hKYhoTtfhVV+tEo/hdWnDMEMMZxSI++wzku/uVPkdqKa69RPUKpSbytFoNoAJYh+Ad2gPOGJWMF7NDJApbkUA=="; - }; - dependencies = [ - sources."anymatch-3.1.3" - sources."binary-extensions-2.3.0" - sources."braces-3.0.3" - sources."chokidar-3.6.0" - sources."fill-range-7.1.1" - sources."glob-parent-5.1.2" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."normalize-path-3.0.0" - sources."picomatch-2.3.1" - sources."readdirp-3.6.0" - sources."to-regex-range-5.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Java language extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-java#readme"; - license = "EPL-1.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-jest = nodeEnv.buildNodePackage { name = "coc-jest"; packageName = "coc-jest"; From e1e09af914c0d2676cce14f780be55a4474b19d1 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:38:10 -0500 Subject: [PATCH 1323/2279] coc-jest: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - .../co/coc-jest/package-lock-fix.patch | 61 +++++++++++++++++++ pkgs/by-name/co/coc-jest/package.nix | 34 +++++++++++ pkgs/by-name/co/coc-jest/update.sh | 20 ++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------ 8 files changed, 122 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-jest/package-lock-fix.patch create mode 100644 pkgs/by-name/co/coc-jest/package.nix create mode 100755 pkgs/by-name/co/coc-jest/update.sh diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 10e1e691cec4..c6e9119d56aa 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -15,6 +15,7 @@ coc-highlight, coc-html, coc-java, + coc-jest, coc-pyright, coc-sh, coc-spell-checker, @@ -96,6 +97,11 @@ final: prev: { src = "${coc-java}/lib/node_modules/coc-java"; }; + coc-jest = buildVimPlugin { + inherit (coc-jest) pname version meta; + src = "${coc-jest}/lib/node_modules/coc-jest"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index b1ec84635187..a3bddfcd4526 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-jest" "coc-json" "coc-lists" "coc-ltex" diff --git a/pkgs/by-name/co/coc-jest/package-lock-fix.patch b/pkgs/by-name/co/coc-jest/package-lock-fix.patch new file mode 100644 index 000000000000..2a00c3d4843f --- /dev/null +++ b/pkgs/by-name/co/coc-jest/package-lock-fix.patch @@ -0,0 +1,61 @@ +diff --git i/package-lock.json w/package-lock.json +index 9ffdc5f..1aac77b 100644 +--- i/package-lock.json ++++ w/package-lock.json +@@ -23,6 +23,8 @@ + }, + "node_modules/@chemzqm/tsconfig": { + "version": "0.0.3", ++ "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz", ++ "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==", + "dev": true, + "license": "MIT" + }, +@@ -453,16 +455,22 @@ + }, + "node_modules/@types/node": { + "version": "13.11.1", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz", ++ "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/which": { + "version": "1.3.2", ++ "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz", ++ "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==", + "dev": true, + "license": "MIT" + }, + "node_modules/coc.nvim": { + "version": "0.0.79-next.11", ++ "resolved": "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.79-next.11.tgz", ++ "integrity": "sha512-1AAP2N4dno8ee2Sn2EHcVhuyhz7GS+VosqBq1W18KGmN/Ht3ry1kNsX7rsTeM/qroadvjtsIC5kM2ke239AiJw==", + "dev": true, + "license": "MIT", + "engines": { +@@ -516,11 +524,15 @@ + }, + "node_modules/isexe": { + "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", ++ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/typescript": { + "version": "4.1.3", ++ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz", ++ "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==", + "dev": true, + "license": "Apache-2.0", + "bin": { +@@ -533,6 +545,8 @@ + }, + "node_modules/which": { + "version": "2.0.2", ++ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", ++ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { diff --git a/pkgs/by-name/co/coc-jest/package.nix b/pkgs/by-name/co/coc-jest/package.nix new file mode 100644 index 000000000000..7880a4a69630 --- /dev/null +++ b/pkgs/by-name/co/coc-jest/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage { + pname = "coc-jest"; + version = "1.1.5-unstable-2025-04-19"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-jest"; + rev = "0ce2cd21c535e0c6c86102bc4da95337cb29948b"; + hash = "sha256-jEwQxZWyKh5tgdRD0f/jQ3q9B/fIGD9Pd8AYDsBj4LQ="; + }; + + patches = [ + ./package-lock-fix.patch + ]; + + npmDepsHash = "sha256-4X6lmblZnAF+4ZmrWYwfigO90Ah7I+B4tbMpFrguxMU="; + + npmBuildScript = "prepare"; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Jest extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-jest"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/co/coc-jest/update.sh b/pkgs/by-name/co/coc-jest/update.sh new file mode 100755 index 000000000000..22bf46d8400a --- /dev/null +++ b/pkgs/by-name/co/coc-jest/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nodejs nix-update git + +WORKDIR=$(mktemp -d) +PACKAGE_DIR="$(realpath "$(dirname "$0")")" + +# Clone source +git clone "https://github.com/neoclide/coc-jest" "$WORKDIR/src" +pushd "$WORKDIR/src" +npx --yes npm-package-lock-add-resolved + +# Update package-lock patch +git diff >"$PACKAGE_DIR/package-lock-fix.patch" +popd + +# Run nix-update +nix-update --version=branch "$UPDATE_NIX_PNAME" + +# Cleanup +rm -rf "$WORKDIR" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 9d0b168ef9d7..3b0c42cdd059 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -86,6 +86,7 @@ mapAliases { inherit (pkgs) coc-html; # Added 2025-11-05 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-java; # Added 2025-11-05 + inherit (pkgs) coc-jest; # Added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a20a619a2d51..96d1bc4c23a7 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-jest" , "coc-json" , "coc-lists" , "coc-ltex" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7b2011931045..f5262e7556af 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,24 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-jest = nodeEnv.buildNodePackage { - name = "coc-jest"; - packageName = "coc-jest"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.5.tgz"; - sha512 = "H6j4hqmsF2b4hSfGQqaXeCahs3LnyYQc6vbtrSkuMQRdosh0gcZQx186kbxph8/5Mecw22Y9BGcsEaF2/RLEbw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "jest extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-jest#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; From 63ff9dd0c3a786d77d155084c4c5d7d634d3e36d Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:39:27 -0500 Subject: [PATCH 1324/2279] coc-json: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-json/package.nix | 31 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ---------- 6 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/co/coc-json/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index c6e9119d56aa..b0f88bbd7850 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -16,6 +16,7 @@ coc-html, coc-java, coc-jest, + coc-json, coc-pyright, coc-sh, coc-spell-checker, @@ -102,6 +103,11 @@ final: prev: { src = "${coc-jest}/lib/node_modules/coc-jest"; }; + coc-json = buildVimPlugin { + inherit (coc-json) pname version meta; + src = "${coc-json}/lib/node_modules/coc-json"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index a3bddfcd4526..44e08184f477 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-json" "coc-lists" "coc-ltex" "coc-markdownlint" diff --git a/pkgs/by-name/co/coc-json/package.nix b/pkgs/by-name/co/coc-json/package.nix new file mode 100644 index 000000000000..bf70392609dc --- /dev/null +++ b/pkgs/by-name/co/coc-json/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-json"; + version = "1.9.3"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-json"; + tag = finalAttrs.version; + hash = "sha256-iYGhjU9qaRh7Jlc/LLbZIvfPsJR+2FMy2L3weVn2rFA="; + }; + + npmDepsHash = "sha256-ois2uyIrF8dRgSGt5NhjYoWw8OqFPRmlG5y952boj1Y="; + + npmBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "JSON language extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-json"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 3b0c42cdd059..4a680a70d5e1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -87,6 +87,7 @@ mapAliases { coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 inherit (pkgs) coc-java; # Added 2025-11-05 inherit (pkgs) coc-jest; # Added 2025-11-05 + inherit (pkgs) coc-json; # Added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 96d1bc4c23a7..3682f594070e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-json" , "coc-lists" , "coc-ltex" , "coc-markdownlint" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f5262e7556af..93083935ccef 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,23 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-json = nodeEnv.buildNodePackage { - name = "coc-json"; - packageName = "coc-json"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.9.2.tgz"; - sha512 = "6fflZTS2d8bJFKXGBIb9uGSkB8tRa+VIcSvX6GAxKRyiz4ft4116c6MGG9bPh+qe7Gwe/+FomBMW7gB08GEjTQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Json extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; From d43cfa79ee8eee752f83f9dfdf9901383a2f00b5 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:40:39 -0500 Subject: [PATCH 1325/2279] coc-lists: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-lists/package.nix | 31 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----------- 6 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-lists/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index b0f88bbd7850..fa99da464469 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -17,6 +17,7 @@ coc-java, coc-jest, coc-json, + coc-lists, coc-pyright, coc-sh, coc-spell-checker, @@ -108,6 +109,11 @@ final: prev: { src = "${coc-json}/lib/node_modules/coc-json"; }; + coc-lists = buildVimPlugin { + inherit (coc-lists) pname version meta; + src = "${coc-lists}/lib/node_modules/coc-lists"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 44e08184f477..b3bb3da2a910 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -7,7 +7,6 @@ final: prev: let nodePackageNames = [ "coc-go" - "coc-lists" "coc-ltex" "coc-markdownlint" "coc-pairs" diff --git a/pkgs/by-name/co/coc-lists/package.nix b/pkgs/by-name/co/coc-lists/package.nix new file mode 100644 index 000000000000..18ebcc1978be --- /dev/null +++ b/pkgs/by-name/co/coc-lists/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-lists"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-lists"; + tag = finalAttrs.version; + hash = "sha256-jt7JnGRXGgG+tbk0GySZeVAlOeTL/pX6+6WK3Qv6mYg="; + }; + + npmDepsHash = "sha256-9GndvIt7kQwT/wcS0qmeB0aIRNI/8UoW5b1JfoVAfn0="; + + npmBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Common lists for coc.nvim"; + homepage = "https://github.com/neoclide/coc-lists"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4a680a70d5e1..4231679060ba 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -88,6 +88,7 @@ mapAliases { inherit (pkgs) coc-java; # Added 2025-11-05 inherit (pkgs) coc-jest; # Added 2025-11-05 inherit (pkgs) coc-json; # Added 2025-11-05 + inherit (pkgs) coc-lists; # Added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3682f594070e..94d523381210 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,7 +22,6 @@ , "cdk8s-cli" , "clipboard-cli" , "coc-go" -, "coc-lists" , "coc-ltex" , "coc-markdownlint" , "coc-pairs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 93083935ccef..a362d8cf60e1 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37668,24 +37668,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-lists = nodeEnv.buildNodePackage { - name = "coc-lists"; - packageName = "coc-lists"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.4.tgz"; - sha512 = "RROel79iUEzY3ICwqLIfWkftdA95mlluSa933CxfxvZxQiPcnlSd9XWGc770RZOEv6R5TCihht2LRt0Lj1PrGQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Basic list sources for coc.nvim"; - homepage = "https://github.com/neoclide/coc-lists#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-ltex = nodeEnv.buildNodePackage { name = "coc-ltex"; packageName = "coc-ltex"; From 6c67d0ee2dc62806500de7a4582e423175342250 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:41:49 -0500 Subject: [PATCH 1326/2279] coc-markdownlint: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-markdownlint/package.nix | 29 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 3 +- .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------ 6 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 pkgs/by-name/co/coc-markdownlint/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index fa99da464469..e0c47aebbed7 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -18,6 +18,7 @@ coc-jest, coc-json, coc-lists, + coc-markdownlint, coc-pyright, coc-sh, coc-spell-checker, @@ -114,6 +115,11 @@ final: prev: { src = "${coc-lists}/lib/node_modules/coc-lists"; }; + coc-markdownlint = buildVimPlugin { + inherit (coc-markdownlint) pname version meta; + src = "${coc-markdownlint}/lib/node_modules/coc-markdownlint"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index b3bb3da2a910..24a47936201d 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-markdownlint" "coc-pairs" "coc-prettier" "coc-r-lsp" diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix new file mode 100644 index 000000000000..94ebe58feec0 --- /dev/null +++ b/pkgs/by-name/co/coc-markdownlint/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage { + pname = "coc-markdownlint"; + version = "0-unstable-2025-11-01"; + + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-markdownlint"; + rev = "4e507d516ccb0e0287c95d909db85676d786e9bd"; + hash = "sha256-fNUmrwjCiMYZHXkI4RPn4BMRxiWW+BoVEvaSMIsEMeQ="; + }; + + npmDepsHash = "sha256-JMXeWQZMYkhUqE5DdYBRRhyHDAqr9VkKATRQE6eOGys="; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Markdownlint extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-markdownlint"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4231679060ba..b9ad6ef8e292 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -89,8 +89,9 @@ mapAliases { inherit (pkgs) coc-jest; # Added 2025-11-05 inherit (pkgs) coc-json; # Added 2025-11-05 inherit (pkgs) coc-lists; # Added 2025-11-05 - inherit (pkgs) coc-pyright; # added 2024-07-14 + inherit (pkgs) coc-markdownlint; # Added 2025-11-05 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 + inherit (pkgs) coc-pyright; # added 2024-07-14 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 inherit (pkgs) coc-sh; # added 2025-10-02 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 94d523381210..8e058c6ef2c1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-markdownlint" , "coc-pairs" , "coc-prettier" , "coc-r-lsp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a362d8cf60e1..444e0518d246 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37686,24 +37686,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-markdownlint = nodeEnv.buildNodePackage { - name = "coc-markdownlint"; - packageName = "coc-markdownlint"; - version = "1.36.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.36.0.tgz"; - sha512 = "tVp32LukGXEFfz3y8H2Pq4fcpoxy9Xptw/jIAZAJz4S/725hCsWLCySwoVE7qhSLOeUHmVMQdoW7A11EHru+lg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Markdownlint extension for coc.nvim"; - homepage = "https://github.com/fannheyward/coc-markdownlint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; From b96b2c33bb5a6209a453206efee1367badf30260 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:42:36 -0500 Subject: [PATCH 1327/2279] coc-pairs: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - .../co/coc-pairs/package-lock-fix.patch | 28 ++++++++++++++++ pkgs/by-name/co/coc-pairs/package.nix | 32 +++++++++++++++++++ pkgs/by-name/co/coc-pairs/update.sh | 28 ++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----------- 8 files changed, 95 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-pairs/package-lock-fix.patch create mode 100644 pkgs/by-name/co/coc-pairs/package.nix create mode 100755 pkgs/by-name/co/coc-pairs/update.sh diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index e0c47aebbed7..a0daa890a590 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -19,6 +19,7 @@ coc-json, coc-lists, coc-markdownlint, + coc-pairs, coc-pyright, coc-sh, coc-spell-checker, @@ -120,6 +121,11 @@ final: prev: { src = "${coc-markdownlint}/lib/node_modules/coc-markdownlint"; }; + coc-pairs = buildVimPlugin { + inherit (coc-pairs) pname version meta; + src = "${coc-pairs}/lib/node_modules/coc-pairs"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 24a47936201d..75c0b98e19cc 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-pairs" "coc-prettier" "coc-r-lsp" "coc-rust-analyzer" diff --git a/pkgs/by-name/co/coc-pairs/package-lock-fix.patch b/pkgs/by-name/co/coc-pairs/package-lock-fix.patch new file mode 100644 index 000000000000..05f1a8c9970a --- /dev/null +++ b/pkgs/by-name/co/coc-pairs/package-lock-fix.patch @@ -0,0 +1,28 @@ +diff --git c/package-lock.json i/package-lock.json +index ee9b22f..4d693ab 100644 +--- c/package-lock.json ++++ i/package-lock.json +@@ -1,12 +1,12 @@ + { + "name": "coc-pairs", +- "version": "1.5.1", ++ "version": "1.5.2", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "coc-pairs", +- "version": "1.5.1", ++ "version": "1.5.2", + "license": "MIT", + "devDependencies": { + "@chemzqm/tsconfig": "^0.0.3", +@@ -20,6 +20,8 @@ + }, + "node_modules/@chemzqm/tsconfig": { + "version": "0.0.3", ++ "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz", ++ "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==", + "dev": true, + "license": "MIT" + }, diff --git a/pkgs/by-name/co/coc-pairs/package.nix b/pkgs/by-name/co/coc-pairs/package.nix new file mode 100644 index 000000000000..7cd3e79d9533 --- /dev/null +++ b/pkgs/by-name/co/coc-pairs/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-pairs"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-pairs"; + tag = finalAttrs.version; + hash = "sha256-CUNnNS8mRjyVyjFw4dLnFpskdZNn/+UjVwOcuZJkeNw="; + }; + + patches = [ + ./package-lock-fix.patch + ]; + + npmDepsHash = "sha256-yIMed7x5EzJMMhsA/O08kLpVYMujyJq1qol/KilxxTs="; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Basic auto pairs extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-pairs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/co/coc-pairs/update.sh b/pkgs/by-name/co/coc-pairs/update.sh new file mode 100755 index 000000000000..cd854c58b701 --- /dev/null +++ b/pkgs/by-name/co/coc-pairs/update.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nodejs nix-update git curl jq + +WORKDIR=$(mktemp -d) +PACKAGE_DIR="$(realpath "$(dirname "$0")")" + +# Get latest tag +NEW_VERSION=$(curl "https://api.github.com/repos/neoclide/coc-pairs/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1) + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "package is up to date: $UPDATE_NIX_OLD_VERSION" + exit 0 +fi + +# Clone source +git clone "https://github.com/neoclide/coc-pairs" -b "$NEW_VERSION" "$WORKDIR/src" +pushd "$WORKDIR/src" +npx --yes npm-package-lock-add-resolved + +# Update package-lock patch +git diff >"$PACKAGE_DIR/package-lock-fix.patch" +popd + +# Run nix-update +nix-update "$UPDATE_NIX_PNAME" + +# Cleanup +rm -rf "$WORKDIR" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b9ad6ef8e292..f41719a54684 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -91,6 +91,7 @@ mapAliases { inherit (pkgs) coc-lists; # Added 2025-11-05 inherit (pkgs) coc-markdownlint; # Added 2025-11-05 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 + inherit (pkgs) coc-pairs; # added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8e058c6ef2c1..7accc20a6cfd 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-pairs" , "coc-prettier" , "coc-r-lsp" , "coc-rust-analyzer" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 444e0518d246..a81ae174a66b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37686,24 +37686,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-pairs = nodeEnv.buildNodePackage { - name = "coc-pairs"; - packageName = "coc-pairs"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.5.1.tgz"; - sha512 = "/wQOKlptsj2KB4yoIBYN3xtTbCKSsGbRdkNAeYCKCQZX0J5uVMFNgo363+k1BVp9KrkWQDlvVluF3Xf1ei8PfA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Auto pair extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-pairs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; From 5b047f88c5eab03db5ffae1c97b894aacf83f1e7 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:43:23 -0500 Subject: [PATCH 1328/2279] coc-prettier: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-prettier/package.nix | 31 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 30 ------------------ 6 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 pkgs/by-name/co/coc-prettier/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index a0daa890a590..6f97d234a45e 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -20,6 +20,7 @@ coc-lists, coc-markdownlint, coc-pairs, + coc-prettier, coc-pyright, coc-sh, coc-spell-checker, @@ -126,6 +127,11 @@ final: prev: { src = "${coc-pairs}/lib/node_modules/coc-pairs"; }; + coc-prettier = buildVimPlugin { + inherit (coc-prettier) pname version meta; + src = "${coc-prettier}/lib/node_modules/coc-prettier"; + }; + coc-pyright = buildVimPlugin { pname = "coc-pyright"; inherit (coc-pyright) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 75c0b98e19cc..eaf61edc4852 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-prettier" "coc-r-lsp" "coc-rust-analyzer" "coc-smartf" diff --git a/pkgs/by-name/co/coc-prettier/package.nix b/pkgs/by-name/co/coc-prettier/package.nix new file mode 100644 index 000000000000..d632e4ec547a --- /dev/null +++ b/pkgs/by-name/co/coc-prettier/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-prettier"; + version = "11.0.1"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-prettier"; + tag = finalAttrs.version; + hash = "sha256-QD31kF7HIsh7C6ykt+x7utLEmN7msprGstoRa3PC7j8="; + }; + + npmDepsHash = "sha256-vKkW3PbeN3KtJHLvr0HBMiDx9XZgyBZD40gENDnoOSs="; + + npmBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Prettier extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-prettier"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f41719a54684..5912ce1b158d 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -92,6 +92,7 @@ mapAliases { inherit (pkgs) coc-markdownlint; # Added 2025-11-05 coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16 inherit (pkgs) coc-pairs; # added 2025-11-05 + inherit (pkgs) coc-prettier; # added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7accc20a6cfd..836422e69316 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-prettier" , "coc-r-lsp" , "coc-rust-analyzer" , "coc-smartf" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a81ae174a66b..43d47b8e11c4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -24776,15 +24776,6 @@ let sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; }; }; - "prettier-3.5.3" = { - name = "prettier"; - packageName = "prettier"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz"; - sha512 = "QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw=="; - }; - }; "pretty-hrtime-1.0.3" = { name = "pretty-hrtime"; packageName = "pretty-hrtime"; @@ -37686,27 +37677,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-prettier = nodeEnv.buildNodePackage { - name = "coc-prettier"; - packageName = "coc-prettier"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-11.0.0.tgz"; - sha512 = "QksBbo3rpqNdVljuzhnjyJGb6J6O+Q7vKhIqyB7nt4Jz3s9eAPI1NAqMaVhptE+V95D2A6srMl+YiBObZu94Qg=="; - }; - dependencies = [ - sources."prettier-3.5.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Prettier extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-prettier#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; From 8d8538bdc19c0c02104f1eb23410957b301d52b8 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:44:19 -0500 Subject: [PATCH 1329/2279] coc-r-lsp: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-r-lsp/package.nix | 45 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 41 ----------------- 6 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/co/coc-r-lsp/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 6f97d234a45e..96a0d3668fda 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -22,6 +22,7 @@ coc-pairs, coc-prettier, coc-pyright, + coc-r-lsp, coc-sh, coc-spell-checker, coc-toml, @@ -138,6 +139,11 @@ final: prev: { src = "${coc-pyright}/lib/node_modules/coc-pyright"; }; + coc-r-lsp = buildVimPlugin { + inherit (coc-r-lsp) pname version meta; + src = "${coc-r-lsp}/lib/node_modules/coc-r-lsp"; + }; + coc-sh = buildVimPlugin { pname = "coc-sh"; inherit (coc-sh) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index eaf61edc4852..0f06c534971b 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-r-lsp" "coc-rust-analyzer" "coc-smartf" "coc-snippets" diff --git a/pkgs/by-name/co/coc-r-lsp/package.nix b/pkgs/by-name/co/coc-r-lsp/package.nix new file mode 100644 index 000000000000..af8c885ff0ac --- /dev/null +++ b/pkgs/by-name/co/coc-r-lsp/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-r-lsp"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-r-lsp"; + tag = finalAttrs.version; + hash = "sha256-pjxnNzWOqlVWNNvEF9Yx1aQa4i3BpJoenuGQmY/k1QA="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-BUg1ZhJn3pF2cQB6b1Fe0jsd9gi2ZyMhCt7SXtjvY54="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "R LSP client for coc.nvim"; + homepage = "https://github.com/neoclide/coc-r-lsp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5912ce1b158d..443b606592bd 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -95,6 +95,7 @@ mapAliases { inherit (pkgs) coc-prettier; # added 2025-11-05 inherit (pkgs) coc-pyright; # added 2024-07-14 coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 + inherit (pkgs) coc-r-lsp; # added 2025-11-05 coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 inherit (pkgs) coc-sh; # added 2025-10-02 inherit (pkgs) coc-spell-checker; # added 2025-10-01 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 836422e69316..c5a7326a4943 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-r-lsp" , "coc-rust-analyzer" , "coc-smartf" , "coc-snippets" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 43d47b8e11c4..4c6316b03fdd 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -32525,15 +32525,6 @@ let sha512 = "6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw=="; }; }; - "vscode-jsonrpc-8.2.0" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz"; - sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="; - }; - }; "vscode-jsonrpc-8.2.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -32597,15 +32588,6 @@ let sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; - "vscode-languageserver-protocol-3.17.5" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.17.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz"; - sha512 = "mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg=="; - }; - }; "vscode-languageserver-textdocument-1.0.11" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; @@ -37677,29 +37659,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-r-lsp = nodeEnv.buildNodePackage { - name = "coc-r-lsp"; - packageName = "coc-r-lsp"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.1.tgz"; - sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; - }; - dependencies = [ - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "R language server extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; From 89aa372f0c05df5475a3dba675ca2fa682dfff31 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:45:05 -0500 Subject: [PATCH 1330/2279] coc-rust-analyzer: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-rust-analyzer/package.nix | 29 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------ 6 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-rust-analyzer/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 96a0d3668fda..9da56238a7bc 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -23,6 +23,7 @@ coc-prettier, coc-pyright, coc-r-lsp, + coc-rust-analyzer, coc-sh, coc-spell-checker, coc-toml, @@ -144,6 +145,11 @@ final: prev: { src = "${coc-r-lsp}/lib/node_modules/coc-r-lsp"; }; + coc-rust-analyzer = buildVimPlugin { + inherit (coc-rust-analyzer) pname version meta; + src = "${coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; + }; + coc-sh = buildVimPlugin { pname = "coc-sh"; inherit (coc-sh) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 0f06c534971b..1d1d2ad11547 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-rust-analyzer" "coc-smartf" "coc-snippets" "coc-solargraph" diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix new file mode 100644 index 000000000000..278b29e6a592 --- /dev/null +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage { + pname = "coc-rust-analyzer"; + version = "0-unstable-2025-10-31"; + + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-rust-analyzer"; + rev = "6cc74fcaed6b011b98e9f8483fb608dff53147be"; + hash = "sha256-2XSx4eR9GgMbWY+IOEKuhCAVesxoZbh/KsLr0It0Cks="; + }; + + npmDepsHash = "sha256-94kuqDNsCcPuvTVeprEdjNOPw8pdpDp3IOvuoKdSEgU="; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Rust-analyzer extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-rust-analyzer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 443b606592bd..a403908e46d1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -97,6 +97,7 @@ mapAliases { coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15 inherit (pkgs) coc-r-lsp; # added 2025-11-05 coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 + inherit (pkgs) coc-rust-analyzer; # added 2025-11-05 inherit (pkgs) coc-sh; # added 2025-10-02 inherit (pkgs) coc-spell-checker; # added 2025-10-01 inherit (pkgs) coc-toml; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c5a7326a4943..045fd70e00ec 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-rust-analyzer" , "coc-smartf" , "coc-snippets" , "coc-solargraph" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4c6316b03fdd..99cb7ddb44bb 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37659,24 +37659,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-rust-analyzer = nodeEnv.buildNodePackage { - name = "coc-rust-analyzer"; - packageName = "coc-rust-analyzer"; - version = "0.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.81.0.tgz"; - sha512 = "skbRCe1Yjoa3r/a0dHviJxGMS8s+PFzl7lmimCUxxT3kKxairDeetNfRBw+wsDJmKBzXGhy1KH+6Cmt3WJYz5w=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim"; - homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-smartf = nodeEnv.buildNodePackage { name = "coc-smartf"; packageName = "coc-smartf"; From fe207f1a0949e268128d0b876ea6de89304b9f41 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:45:49 -0500 Subject: [PATCH 1331/2279] coc-smartf: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-smartf/package.nix | 71 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----- 6 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-smartf/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 9da56238a7bc..f86ceb25dcf7 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -25,6 +25,7 @@ coc-r-lsp, coc-rust-analyzer, coc-sh, + coc-smartf, coc-spell-checker, coc-toml, }: @@ -156,6 +157,11 @@ final: prev: { src = "${coc-sh}/lib/node_modules/coc-sh"; }; + coc-smartf = buildVimPlugin { + inherit (coc-smartf) pname version meta; + src = "${coc-smartf}/lib/node_modules/coc-smartf"; + }; + coc-spell-checker = buildVimPlugin { pname = "coc-spell-checker"; inherit (coc-spell-checker) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 1d1d2ad11547..0156472f578a 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-smartf" "coc-snippets" "coc-solargraph" "coc-sqlfluff" diff --git a/pkgs/by-name/co/coc-smartf/package.nix b/pkgs/by-name/co/coc-smartf/package.nix new file mode 100644 index 000000000000..debc471d419f --- /dev/null +++ b/pkgs/by-name/co/coc-smartf/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.12.22"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E="; + }; + vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-smartf"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-smartf"; + tag = finalAttrs.version; + hash = "sha256-CL0jWwMj6sFXEx+D1Orc4Fivbl33qE2P3yRJB0qqQFQ="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-s1TStKyDPydBxMLfszhKHGyQeFIC6bDPtssNm9hdZNs="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Make jump to character easier"; + homepage = "https://github.com/neoclide/coc-smartf"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a403908e46d1..9aad98a54adb 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -99,6 +99,7 @@ mapAliases { coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01 inherit (pkgs) coc-rust-analyzer; # added 2025-11-05 inherit (pkgs) coc-sh; # added 2025-10-02 + inherit (pkgs) coc-smartf; # Added 2025-11-05 inherit (pkgs) coc-spell-checker; # added 2025-10-01 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 045fd70e00ec..09b34386277e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-smartf" , "coc-snippets" , "coc-solargraph" , "coc-stylelint" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 99cb7ddb44bb..05bfffb84e8c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37659,24 +37659,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-smartf = nodeEnv.buildNodePackage { - name = "coc-smartf"; - packageName = "coc-smartf"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.2.1.tgz"; - sha512 = "Zlm+lt03V1qmJVvQw81svaWE+jC9e42VTnHBh8qjlUJUMG1GDjuC8cwM1ulamdovSsKdlmtHwVpScdKBgg3/Fg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Smart find extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-smartf#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; From 63bccd4eaba04ce8dbb51baf68c476f947f73c26 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:46:38 -0500 Subject: [PATCH 1332/2279] coc-snippets: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-snippets/package.nix | 31 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----------- 6 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-snippets/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index f86ceb25dcf7..5b4c054f068f 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -26,6 +26,7 @@ coc-rust-analyzer, coc-sh, coc-smartf, + coc-snippets, coc-spell-checker, coc-toml, }: @@ -162,6 +163,11 @@ final: prev: { src = "${coc-smartf}/lib/node_modules/coc-smartf"; }; + coc-snippets = buildVimPlugin { + inherit (coc-snippets) pname version meta; + src = "${coc-snippets}/lib/node_modules/coc-snippets"; + }; + coc-spell-checker = buildVimPlugin { pname = "coc-spell-checker"; inherit (coc-spell-checker) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 0156472f578a..71ce5e823b7e 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-snippets" "coc-solargraph" "coc-sqlfluff" "coc-stylelint" diff --git a/pkgs/by-name/co/coc-snippets/package.nix b/pkgs/by-name/co/coc-snippets/package.nix new file mode 100644 index 000000000000..68a13262d155 --- /dev/null +++ b/pkgs/by-name/co/coc-snippets/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-snippets"; + version = "3.4.7"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-snippets"; + tag = finalAttrs.version; + hash = "sha256-xaExEsNy6uuYUTeyXaon4DAoRIF6OpIZis59oetR36c="; + }; + + npmDepsHash = "sha256-tRyFtfL3Jc+uajELVdJoDteY3lnq0Bx8UQTaz2HtbW0="; + + npmBuildScript = "prepare"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Snippets solution for coc.nvim"; + homepage = "https://github.com/neoclide/coc-snippets"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 9aad98a54adb..5b12e45fcd40 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -100,6 +100,7 @@ mapAliases { inherit (pkgs) coc-rust-analyzer; # added 2025-11-05 inherit (pkgs) coc-sh; # added 2025-10-02 inherit (pkgs) coc-smartf; # Added 2025-11-05 + inherit (pkgs) coc-snippets; # Added 2025-11-05 inherit (pkgs) coc-spell-checker; # added 2025-10-01 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 09b34386277e..8c45daf5160e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-snippets" , "coc-solargraph" , "coc-stylelint" , "coc-sumneko-lua" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 05bfffb84e8c..73da382cfc1d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37659,24 +37659,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-snippets = nodeEnv.buildNodePackage { - name = "coc-snippets"; - packageName = "coc-snippets"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.4.0.tgz"; - sha512 = "p7nxP/ii+iRADnvFEuHz4iDhuspg3W08hj4J0IFz/OYrzJwEON3c+5i0DJEXyr8qrt0c2Vd+3rekRE8J2AhwGQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Snippets extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-snippets#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; From 65dc92e99a6a3f7d35993e7aea8b72a3a8b7b7c6 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:47:36 -0500 Subject: [PATCH 1333/2279] coc-solargraph: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-solargraph/package.nix | 73 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ----- 6 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/co/coc-solargraph/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 5b4c054f068f..ed66d9d73186 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -27,6 +27,7 @@ coc-sh, coc-smartf, coc-snippets, + coc-solargraph, coc-spell-checker, coc-toml, }: @@ -168,6 +169,11 @@ final: prev: { src = "${coc-snippets}/lib/node_modules/coc-snippets"; }; + coc-solargraph = buildVimPlugin { + inherit (coc-solargraph) pname version meta; + src = "${coc-solargraph}/lib/node_modules/coc-solargraph"; + }; + coc-spell-checker = buildVimPlugin { pname = "coc-spell-checker"; inherit (coc-spell-checker) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 71ce5e823b7e..1a6b0c4aeda7 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-solargraph" "coc-sqlfluff" "coc-stylelint" "coc-sumneko-lua" diff --git a/pkgs/by-name/co/coc-solargraph/package.nix b/pkgs/by-name/co/coc-solargraph/package.nix new file mode 100644 index 000000000000..a21fb429acc1 --- /dev/null +++ b/pkgs/by-name/co/coc-solargraph/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.8.29"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-WpnWdx0Oi1KBWiS/CEd88hYU/3ka1x1AA71ipYJgT5A="; + }; + vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-solargraph"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-solargraph"; + tag = finalAttrs.version; + hash = "sha256-AUulj0tcgkXrQS9k1zhB0LKWJxvIlVtxSQK+nYGm73s="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-FPxvwqx7TfJBM+O8TY64swJVYlWIbCvVbzVJYthHjO0="; + }; + + yarnBuildScript = "prepare"; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Solargraph extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-solargraph"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5b12e45fcd40..19efdeff046e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -101,6 +101,7 @@ mapAliases { inherit (pkgs) coc-sh; # added 2025-10-02 inherit (pkgs) coc-smartf; # Added 2025-11-05 inherit (pkgs) coc-snippets; # Added 2025-11-05 + inherit (pkgs) coc-solargraph; # Added 2025-11-05 inherit (pkgs) coc-spell-checker; # added 2025-10-01 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8c45daf5160e..d2b8bbd537c3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-solargraph" , "coc-stylelint" , "coc-sumneko-lua" , "coc-sqlfluff" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 73da382cfc1d..96997488c015 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37659,23 +37659,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-solargraph = nodeEnv.buildNodePackage { - name = "coc-solargraph"; - packageName = "coc-solargraph"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.4.tgz"; - sha512 = "Z00v8HmgQyJgv/FKo7FkqWWTPNHeiOgEDqsI4RT9457rEQ8ZF/wLeq38DRihTfIra93GZ3EprVKYCOels6JHgQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Ruby languageserver extension for coc.nvim, using solargraph"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-stylelint = nodeEnv.buildNodePackage { name = "coc-stylelint"; packageName = "coc-stylelint"; From 8d69b4a264e0e562c8fd28e13cd20d672e18934f Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 16:49:11 -0500 Subject: [PATCH 1334/2279] coc-sqlfluff: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-sqlfluff/package.nix | 71 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 21 ------ 6 files changed, 78 insertions(+), 23 deletions(-) create mode 100644 pkgs/by-name/co/coc-sqlfluff/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index ed66d9d73186..41db68a0832a 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -29,6 +29,7 @@ coc-snippets, coc-solargraph, coc-spell-checker, + coc-sqlfluff, coc-toml, }: final: prev: { @@ -180,6 +181,11 @@ final: prev: { src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker"; }; + coc-sqlfluff = buildVimPlugin { + inherit (coc-sqlfluff) pname version meta; + src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff"; + }; + coc-toml = buildVimPlugin { pname = "coc-toml"; inherit (coc-toml) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 1a6b0c4aeda7..6a44165b7e19 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-sqlfluff" "coc-stylelint" "coc-sumneko-lua" "coc-tabnine" diff --git a/pkgs/by-name/co/coc-sqlfluff/package.nix b/pkgs/by-name/co/coc-sqlfluff/package.nix new file mode 100644 index 000000000000..278987f8446a --- /dev/null +++ b/pkgs/by-name/co/coc-sqlfluff/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.16.17"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-sqlfluff"; + version = "0.11.4"; + + src = fetchFromGitHub { + owner = "yaegassy"; + repo = "coc-sqlfluff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hTe0rtjIKdlPSvwcHI2m0sRkVfmW8eQ/63WLmPsiovI="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-Pz7OCAiPIMVCAYe9OGWKMLfGSwK8ulA/JW55eB8xJqw="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "SQLFluff extension for coc.nvim"; + homepage = "https://github.com/yaegassy/coc-sqlfluff"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 19efdeff046e..68c260f53c48 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -103,6 +103,7 @@ mapAliases { inherit (pkgs) coc-snippets; # Added 2025-11-05 inherit (pkgs) coc-solargraph; # Added 2025-11-05 inherit (pkgs) coc-spell-checker; # added 2025-10-01 + inherit (pkgs) coc-sqlfluff; # Added 2025-11-05 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d2b8bbd537c3..3195fe821144 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "coc-ltex" , "coc-stylelint" , "coc-sumneko-lua" -, "coc-sqlfluff" , "coc-tabnine" , "coc-texlab" , "coc-tsserver" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 96997488c015..f3e39411ada5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -38047,27 +38047,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-sqlfluff = nodeEnv.buildNodePackage { - name = "coc-sqlfluff"; - packageName = "coc-sqlfluff"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.11.4.tgz"; - sha512 = "0yKAPkIKoLJWksPefWXVvRcRQ+Ja3kc2Bx/tKL4tQwEOlAwc5qeUU+1FZRw+71Jp8HeC5Wo9YqtlgSIJlyic3g=="; - }; - dependencies = [ - sources."semver-7.7.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "SQLFluff (A SQL linter and auto-formatter for Humans) extension for coc.nvim"; - homepage = "https://github.com/yaegassy/coc-sqlfluff#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; From 7e9c70a2e27c4385684cd266540145010192b2db Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:03:02 -0500 Subject: [PATCH 1335/2279] coc-stylelint: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 + .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-stylelint/package.nix | 51 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 988 ------------------ 6 files changed, 58 insertions(+), 990 deletions(-) create mode 100644 pkgs/by-name/co/coc-stylelint/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 41db68a0832a..26a8f659445e 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -29,6 +29,7 @@ coc-snippets, coc-solargraph, coc-spell-checker, + coc-stylelint, coc-sqlfluff, coc-toml, }: @@ -181,6 +182,11 @@ final: prev: { src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker"; }; + coc-stylelint = buildVimPlugin { + inherit (coc-stylelint) pname version meta; + src = "${coc-stylelint}/lib/node_modules/coc-stylelint"; + }; + coc-sqlfluff = buildVimPlugin { inherit (coc-sqlfluff) pname version meta; src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff"; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 6a44165b7e19..01e416d0c4d1 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-stylelint" "coc-sumneko-lua" "coc-tabnine" "coc-texlab" diff --git a/pkgs/by-name/co/coc-stylelint/package.nix b/pkgs/by-name/co/coc-stylelint/package.nix new file mode 100644 index 000000000000..abd256ec6090 --- /dev/null +++ b/pkgs/by-name/co/coc-stylelint/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-stylelint"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-stylelint"; + tag = finalAttrs.version; + hash = "sha256-EurfiE1xeJhyH4Idb/hf/eItwmv75lan1csz0KJMBXs="; + }; + + # Fix yarn.lock file + postPatch = '' + substituteInPlace yarn.lock \ + --replace-fail "http://registry.npmjs.org" "https://registry.yarnpkg.com" + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src postPatch; + hash = "sha256-rcHjbiMDrgCHweRMDlfcMvAJT4VULks44fbpctPpZps="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stylelint extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-stylelint"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 68c260f53c48..003bc439313f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -104,6 +104,7 @@ mapAliases { inherit (pkgs) coc-solargraph; # Added 2025-11-05 inherit (pkgs) coc-spell-checker; # added 2025-10-01 inherit (pkgs) coc-sqlfluff; # Added 2025-11-05 + inherit (pkgs) coc-stylelint; # Added 2025-11-05 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3195fe821144..51ae5514919b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-stylelint" , "coc-sumneko-lua" , "coc-tabnine" , "coc-texlab" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f3e39411ada5..26571f4af9e6 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3191,24 +3191,6 @@ let sha512 = "Pb6M8TDO9DtSVla9yXSTAxmo9GVEouq5P40DWXdOie69bXogZTkgvopCq+yEvTMA0F6PEvdJmbtTV3ccIp11VQ=="; }; }; - "@stylelint/postcss-css-in-js-0.37.3" = { - name = "_at_stylelint_slash_postcss-css-in-js"; - packageName = "@stylelint/postcss-css-in-js"; - version = "0.37.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz"; - sha512 = "scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg=="; - }; - }; - "@stylelint/postcss-markdown-0.36.2" = { - name = "_at_stylelint_slash_postcss-markdown"; - packageName = "@stylelint/postcss-markdown"; - version = "0.36.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz"; - sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; - }; - }; "@sveltejs/acorn-typescript-1.0.5" = { name = "_at_sveltejs_slash_acorn-typescript"; packageName = "@sveltejs/acorn-typescript"; @@ -6080,15 +6062,6 @@ let sha512 = "ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="; }; }; - "autoprefixer-9.8.8" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "9.8.8"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz"; - sha512 = "eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA=="; - }; - }; "available-typed-arrays-1.0.7" = { name = "available-typed-arrays"; packageName = "available-typed-arrays"; @@ -6215,15 +6188,6 @@ let sha512 = "wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA=="; }; }; - "bail-1.0.5" = { - name = "bail"; - packageName = "bail"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz"; - sha512 = "xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="; - }; - }; "bail-2.0.2" = { name = "bail"; packageName = "bail"; @@ -6242,15 +6206,6 @@ let sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; - "balanced-match-2.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz"; - sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; - }; - }; "base-0.11.2" = { name = "base"; packageName = "base"; @@ -7700,15 +7655,6 @@ let sha512 = "T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg=="; }; }; - "character-entities-1.2.4" = { - name = "character-entities"; - packageName = "character-entities"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz"; - sha512 = "iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="; - }; - }; "character-entities-2.0.2" = { name = "character-entities"; packageName = "character-entities"; @@ -7727,15 +7673,6 @@ let sha512 = "1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA=="; }; }; - "character-entities-legacy-1.1.4" = { - name = "character-entities-legacy"; - packageName = "character-entities-legacy"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; - sha512 = "3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="; - }; - }; "character-entities-legacy-3.0.0" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; @@ -7745,15 +7682,6 @@ let sha512 = "RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ=="; }; }; - "character-reference-invalid-1.1.4" = { - name = "character-reference-invalid"; - packageName = "character-reference-invalid"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; - sha512 = "mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="; - }; - }; "character-reference-invalid-2.0.1" = { name = "character-reference-invalid"; packageName = "character-reference-invalid"; @@ -8294,15 +8222,6 @@ let sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; }; }; - "clone-regexp-2.2.0" = { - name = "clone-regexp"; - packageName = "clone-regexp"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz"; - sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q=="; - }; - }; "clone-response-1.0.3" = { name = "clone-response"; packageName = "clone-response"; @@ -10896,15 +10815,6 @@ let sha512 = "q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ=="; }; }; - "domhandler-2.4.2" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; - }; - }; "domino-2.1.6" = { name = "domino"; packageName = "domino"; @@ -10923,15 +10833,6 @@ let sha512 = "gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw=="; }; }; - "domutils-1.7.0" = { - name = "domutils"; - packageName = "domutils"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - }; "domutils-3.2.2" = { name = "domutils"; packageName = "domutils"; @@ -12426,15 +12327,6 @@ let sha512 = "EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q=="; }; }; - "execall-2.0.0" = { - name = "execall"; - packageName = "execall"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz"; - sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow=="; - }; - }; "exif-parser-0.1.12" = { name = "exif-parser"; packageName = "exif-parser"; @@ -12705,15 +12597,6 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-diff-1.3.0" = { - name = "fast-diff"; - packageName = "fast-diff"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz"; - sha512 = "VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw=="; - }; - }; "fast-fifo-1.3.2" = { name = "fast-fifo"; packageName = "fast-fifo"; @@ -12975,15 +12858,6 @@ let sha512 = "uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w=="; }; }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; "file-entry-cache-8.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -13317,15 +13191,6 @@ let sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg=="; }; }; - "flat-cache-3.2.0" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz"; - sha512 = "CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw=="; - }; - }; "flat-cache-4.0.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -13956,15 +13821,6 @@ let sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; }; }; - "get-stdin-8.0.0" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz"; - sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="; - }; - }; "get-stdin-9.0.0" = { name = "get-stdin"; packageName = "get-stdin"; @@ -14424,15 +14280,6 @@ let sha512 = "0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA=="; }; }; - "globjoin-0.1.4" = { - name = "globjoin"; - packageName = "globjoin"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz"; - sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="; - }; - }; "globule-1.3.4" = { name = "globule"; packageName = "globule"; @@ -14460,15 +14307,6 @@ let sha512 = "eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A=="; }; }; - "gonzales-pe-4.3.0" = { - name = "gonzales-pe"; - packageName = "gonzales-pe"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz"; - sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; - }; - }; "goosig-0.10.0" = { name = "goosig"; packageName = "goosig"; @@ -15180,15 +15018,6 @@ let sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; }; }; - "html-tags-3.3.1" = { - name = "html-tags"; - packageName = "html-tags"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz"; - sha512 = "ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ=="; - }; - }; "html-void-elements-3.0.0" = { name = "html-void-elements"; packageName = "html-void-elements"; @@ -15207,15 +15036,6 @@ let sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="; }; }; - "htmlparser2-3.10.1" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; - }; - }; "htmlparser2-3.8.3" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -16260,15 +16080,6 @@ let sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA=="; }; }; - "is-alphabetical-1.0.4" = { - name = "is-alphabetical"; - packageName = "is-alphabetical"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; - sha512 = "DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="; - }; - }; "is-alphabetical-2.0.1" = { name = "is-alphabetical"; packageName = "is-alphabetical"; @@ -16278,15 +16089,6 @@ let sha512 = "FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ=="; }; }; - "is-alphanumerical-1.0.4" = { - name = "is-alphanumerical"; - packageName = "is-alphanumerical"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; - sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A=="; - }; - }; "is-alphanumerical-2.0.1" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; @@ -16440,15 +16242,6 @@ let sha512 = "PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg=="; }; }; - "is-decimal-1.0.4" = { - name = "is-decimal"; - packageName = "is-decimal"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz"; - sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="; - }; - }; "is-decimal-2.0.1" = { name = "is-decimal"; packageName = "is-decimal"; @@ -16683,15 +16476,6 @@ let sha512 = "WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA=="; }; }; - "is-hexadecimal-1.0.4" = { - name = "is-hexadecimal"; - packageName = "is-hexadecimal"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; - sha512 = "gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="; - }; - }; "is-hexadecimal-2.0.1" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; @@ -17052,15 +16836,6 @@ let sha512 = "MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g=="; }; }; - "is-regexp-2.1.0" = { - name = "is-regexp"; - packageName = "is-regexp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz"; - sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA=="; - }; - }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -18303,15 +18078,6 @@ let sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="; }; }; - "known-css-properties-0.21.0" = { - name = "known-css-properties"; - packageName = "known-css-properties"; - version = "0.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz"; - sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw=="; - }; - }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -19446,15 +19212,6 @@ let sha512 = "ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng=="; }; }; - "longest-streak-2.0.4" = { - name = "longest-streak"; - packageName = "longest-streak"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz"; - sha512 = "vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg=="; - }; - }; "longest-streak-3.1.0" = { name = "longest-streak"; packageName = "longest-streak"; @@ -19879,15 +19636,6 @@ let sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; - "mathml-tag-names-2.1.3" = { - name = "mathml-tag-names"; - packageName = "mathml-tag-names"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; - sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; - }; - }; "md5-2.3.0" = { name = "md5"; packageName = "md5"; @@ -19942,15 +19690,6 @@ let sha512 = "MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw=="; }; }; - "mdast-util-from-markdown-0.8.5" = { - name = "mdast-util-from-markdown"; - packageName = "mdast-util-from-markdown"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; - sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; - }; - }; "mdast-util-from-markdown-1.3.1" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; @@ -20140,15 +19879,6 @@ let sha512 = "QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA=="; }; }; - "mdast-util-to-markdown-0.6.5" = { - name = "mdast-util-to-markdown"; - packageName = "mdast-util-to-markdown"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; - sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; - }; - }; "mdast-util-to-markdown-1.5.0" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; @@ -20185,15 +19915,6 @@ let sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A=="; }; }; - "mdast-util-to-string-2.0.0" = { - name = "mdast-util-to-string"; - packageName = "mdast-util-to-string"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"; - sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="; - }; - }; "mdast-util-to-string-3.2.0" = { name = "mdast-util-to-string"; packageName = "mdast-util-to-string"; @@ -20419,15 +20140,6 @@ let sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg=="; }; }; - "micromark-2.11.4" = { - name = "micromark"; - packageName = "micromark"; - version = "2.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz"; - sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; - }; - }; "micromark-3.2.0" = { name = "micromark"; packageName = "micromark"; @@ -22319,24 +22031,6 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-range-0.1.2" = { - name = "normalize-range"; - packageName = "normalize-range"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; - sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; - }; - }; - "normalize-selector-0.2.0" = { - name = "normalize-selector"; - packageName = "normalize-selector"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz"; - sha512 = "dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw=="; - }; - }; "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -22598,15 +22292,6 @@ let sha512 = "N5dLIfqCzlJm7M14KqmX/sl+6Zg5WH0E04HKfuVHbPj9jIaY1T2zuCS+xe0qeT/YN3UpYQ6lIIXcE/3Xbwg3Xw=="; }; }; - "num2fraction-1.2.2" = { - name = "num2fraction"; - packageName = "num2fraction"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; - sha512 = "Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="; - }; - }; "number-allocator-1.0.14" = { name = "number-allocator"; packageName = "number-allocator"; @@ -23642,15 +23327,6 @@ let sha512 = "sMe/JmsY6g21aJCAm8KgCH90a9zCZ7aGSriSJ5B0CcGEsDN7YmiCk3+1iKPE1heDG6zYY4Xf++V8llWtCvNBSQ=="; }; }; - "parse-entities-2.0.0" = { - name = "parse-entities"; - packageName = "parse-entities"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz"; - sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ=="; - }; - }; "parse-entities-4.0.2" = { name = "parse-entities"; packageName = "parse-entities"; @@ -24254,15 +23930,6 @@ let sha512 = "GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ=="; }; }; - "picocolors-0.2.1" = { - name = "picocolors"; - packageName = "picocolors"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"; - sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="; - }; - }; "picocolors-1.0.0" = { name = "picocolors"; packageName = "picocolors"; @@ -24551,15 +24218,6 @@ let sha512 = "/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg=="; }; }; - "postcss-7.0.39" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"; - sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; - }; - }; "postcss-8.5.3" = { name = "postcss"; packageName = "postcss"; @@ -24569,24 +24227,6 @@ let sha512 = "dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A=="; }; }; - "postcss-html-0.36.0" = { - name = "postcss-html"; - packageName = "postcss-html"; - version = "0.36.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz"; - sha512 = "HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw=="; - }; - }; - "postcss-less-3.1.4" = { - name = "postcss-less"; - packageName = "postcss-less"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz"; - sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; - }; - }; "postcss-load-config-5.1.0" = { name = "postcss-load-config"; packageName = "postcss-load-config"; @@ -24596,15 +24236,6 @@ let sha512 = "G5AJ+IX0aD0dygOE0yFZQ/huFFMSNneyfp0e3/bT05a8OfPC5FUoZRPfGijUdGOJNMewJiwzcHJXFafFzeKFVA=="; }; }; - "postcss-media-query-parser-0.2.3" = { - name = "postcss-media-query-parser"; - packageName = "postcss-media-query-parser"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; - sha512 = "3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig=="; - }; - }; "postcss-reporter-7.1.0" = { name = "postcss-reporter"; packageName = "postcss-reporter"; @@ -24614,42 +24245,6 @@ let sha512 = "/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA=="; }; }; - "postcss-resolve-nested-selector-0.1.6" = { - name = "postcss-resolve-nested-selector"; - packageName = "postcss-resolve-nested-selector"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz"; - sha512 = "0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw=="; - }; - }; - "postcss-safe-parser-4.0.2" = { - name = "postcss-safe-parser"; - packageName = "postcss-safe-parser"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; - sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g=="; - }; - }; - "postcss-sass-0.4.4" = { - name = "postcss-sass"; - packageName = "postcss-sass"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz"; - sha512 = "BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg=="; - }; - }; - "postcss-scss-2.1.1" = { - name = "postcss-scss"; - packageName = "postcss-scss"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz"; - sha512 = "jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA=="; - }; - }; "postcss-selector-parser-6.0.10" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; @@ -24659,33 +24254,6 @@ let sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; }; }; - "postcss-selector-parser-6.1.2" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"; - sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="; - }; - }; - "postcss-syntax-0.36.2" = { - name = "postcss-syntax"; - packageName = "postcss-syntax"; - version = "0.36.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz"; - sha512 = "nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w=="; - }; - }; - "postcss-value-parser-4.2.0" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - }; "postject-1.0.0-alpha.6" = { name = "postject"; packageName = "postject"; @@ -26072,15 +25640,6 @@ let sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="; }; }; - "remark-13.0.0" = { - name = "remark"; - packageName = "remark"; - version = "13.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz"; - sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA=="; - }; - }; "remark-15.0.1" = { name = "remark"; packageName = "remark"; @@ -26585,15 +26144,6 @@ let sha512 = "FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA=="; }; }; - "remark-parse-9.0.0" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz"; - sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; - }; - }; "remark-retext-5.0.1" = { name = "remark-retext"; packageName = "remark-retext"; @@ -26612,15 +26162,6 @@ let sha512 = "1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw=="; }; }; - "remark-stringify-9.0.1" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz"; - sha512 = "mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg=="; - }; - }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -28646,15 +28187,6 @@ let sha512 = "4bSLdgzl0xcMto0zPmhLRfy7y8ZWSjcv+znurjcUnzW5ZQhhDo+HKIRdAB+n/mTde+KEfoQKYzehc6pUHrRQYw=="; }; }; - "specificity-0.4.1" = { - name = "specificity"; - packageName = "specificity"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz"; - sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; - }; - }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -29501,24 +29033,6 @@ let sha512 = "H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g=="; }; }; - "style-search-0.1.0" = { - name = "style-search"; - packageName = "style-search"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz"; - sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg=="; - }; - }; - "stylelint-13.13.1" = { - name = "stylelint"; - packageName = "stylelint"; - version = "13.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz"; - sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; - }; - }; "subarg-1.0.0" = { name = "subarg"; packageName = "subarg"; @@ -29537,15 +29051,6 @@ let sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="; }; }; - "sugarss-2.0.0" = { - name = "sugarss"; - packageName = "sugarss"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz"; - sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ=="; - }; - }; "sumchecker-3.0.1" = { name = "sumchecker"; packageName = "sumchecker"; @@ -29645,15 +29150,6 @@ let sha512 = "71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA=="; }; }; - "svg-tags-1.0.0" = { - name = "svg-tags"; - packageName = "svg-tags"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"; - sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; - }; - }; "svg2img-1.0.0-beta.2" = { name = "svg2img"; packageName = "svg2img"; @@ -30374,15 +29870,6 @@ let sha512 = "aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg=="; }; }; - "trough-1.0.5" = { - name = "trough"; - packageName = "trough"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz"; - sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; - }; - }; "trough-2.2.0" = { name = "trough"; packageName = "trough"; @@ -31022,15 +30509,6 @@ let sha512 = "xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA=="; }; }; - "unified-9.2.2" = { - name = "unified"; - packageName = "unified"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"; - sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; - }; - }; "unified-diff-4.0.1" = { name = "unified-diff"; packageName = "unified-diff"; @@ -31193,15 +30671,6 @@ let sha512 = "T7ZqS7immLjYyC4FCp2hDo3ksZ1v+qcbb+e5+iWxc2jONgHOLXPCpms1L8VV4hVxCXgWTxmBHDztuEZFVwC+Gg=="; }; }; - "unist-util-find-all-after-3.0.2" = { - name = "unist-util-find-all-after"; - packageName = "unist-util-find-all-after"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz"; - sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ=="; - }; - }; "unist-util-find-all-after-5.0.0" = { name = "unist-util-find-all-after"; packageName = "unist-util-find-all-after"; @@ -31355,15 +30824,6 @@ let sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ=="; }; }; - "unist-util-stringify-position-2.0.3" = { - name = "unist-util-stringify-position"; - packageName = "unist-util-stringify-position"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"; - sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; - }; - }; "unist-util-stringify-position-3.0.3" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; @@ -31913,15 +31373,6 @@ let sha512 = "+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA=="; }; }; - "v8-compile-cache-2.4.0" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz"; - sha512 = "ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw=="; - }; - }; "v8-compile-cache-lib-3.0.1" = { name = "v8-compile-cache-lib"; packageName = "v8-compile-cache-lib"; @@ -32336,15 +31787,6 @@ let sha512 = "bIOaZx4+Bf6a7sIORfmYnyKLDLk/lhVym6rjYlq+vkitYKnhFmUpmPpDTCltWFrUTlGKs6sCeoDWfMA0oOOneA=="; }; }; - "vfile-4.2.1" = { - name = "vfile"; - packageName = "vfile"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz"; - sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; - }; - }; "vfile-5.3.7" = { name = "vfile"; packageName = "vfile"; @@ -32390,15 +31832,6 @@ let sha512 = "5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg=="; }; }; - "vfile-message-2.0.4" = { - name = "vfile-message"; - packageName = "vfile-message"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz"; - sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; - }; - }; "vfile-message-3.1.4" = { name = "vfile-message"; packageName = "vfile-message"; @@ -32498,15 +31931,6 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-jsonrpc-5.1.0-next.1" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "5.1.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; - sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; - }; - }; "vscode-jsonrpc-6.0.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -32534,15 +31958,6 @@ let sha512 = "kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ=="; }; }; - "vscode-languageserver-6.2.0-next.2" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "6.2.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.2.0-next.2.tgz"; - sha512 = "UCXULa/RmT2zxcb6auNezl9ZIPwYHS15+a0XzybrpT2+xA0RbHEYQCsIQkTRYjGv8cm3yS9iPJMmxLilP+y1Xw=="; - }; - }; "vscode-languageserver-7.0.0" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -32570,15 +31985,6 @@ let sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.2" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; - sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; - }; - }; "vscode-languageserver-protocol-3.17.3" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -32615,15 +32021,6 @@ let sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="; }; }; - "vscode-languageserver-types-3.16.0-next.1" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; - sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; - }; - }; "vscode-languageserver-types-3.17.0-next.3" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -32642,15 +32039,6 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; - "vscode-languageserver-types-3.17.5" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.17.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz"; - sha512 = "Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="; - }; - }; "vscode-nls-4.1.2" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -33713,15 +33101,6 @@ let sha512 = "XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g=="; }; }; - "zwitch-1.0.5" = { - name = "zwitch"; - packageName = "zwitch"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz"; - sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="; - }; - }; "zwitch-2.0.4" = { name = "zwitch"; packageName = "zwitch"; @@ -37659,373 +37038,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-stylelint = nodeEnv.buildNodePackage { - name = "coc-stylelint"; - packageName = "coc-stylelint"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-stylelint/-/coc-stylelint-1.2.0.tgz"; - sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.26.2" - sources."@babel/compat-data-7.26.8" - ( - sources."@babel/core-7.26.10" - // { - dependencies = [ - sources."semver-6.3.1" - ]; - } - ) - sources."@babel/generator-7.26.10" - ( - sources."@babel/helper-compilation-targets-7.26.5" - // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."semver-6.3.1" - sources."yallist-3.1.1" - ]; - } - ) - sources."@babel/helper-module-imports-7.25.9" - sources."@babel/helper-module-transforms-7.26.0" - sources."@babel/helper-string-parser-7.25.9" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@babel/helper-validator-option-7.25.9" - sources."@babel/helpers-7.26.10" - sources."@babel/parser-7.26.10" - sources."@babel/template-7.26.9" - sources."@babel/traverse-7.26.10" - sources."@babel/types-7.26.10" - sources."@jridgewell/gen-mapping-0.3.8" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@stylelint/postcss-css-in-js-0.37.3" - sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.15" - sources."@types/minimist-1.2.5" - sources."@types/normalize-package-data-2.4.4" - sources."@types/parse-json-4.0.2" - sources."@types/unist-2.0.11" - sources."ajv-8.17.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."array-union-2.1.0" - sources."arrify-1.0.1" - sources."astral-regex-2.0.0" - ( - sources."autoprefixer-9.8.8" - // { - dependencies = [ - sources."picocolors-0.2.1" - ]; - } - ) - sources."bail-1.0.5" - sources."balanced-match-2.0.0" - ( - sources."brace-expansion-1.1.11" - // { - dependencies = [ - sources."balanced-match-1.0.2" - ]; - } - ) - sources."braces-3.0.3" - sources."browserslist-4.24.4" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001704" - sources."chalk-4.1.2" - sources."character-entities-1.2.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."clone-regexp-2.2.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."convert-source-map-2.0.0" - sources."cosmiconfig-7.1.0" - sources."cssesc-3.0.0" - sources."debug-4.4.0" - sources."decamelize-1.2.0" - ( - sources."decamelize-keys-1.1.1" - // { - dependencies = [ - sources."map-obj-1.0.1" - ]; - } - ) - sources."dir-glob-3.0.1" - ( - sources."dom-serializer-0.2.2" - // { - dependencies = [ - sources."domelementtype-2.3.0" - sources."entities-2.2.0" - ]; - } - ) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" - sources."electron-to-chromium-1.5.118" - sources."emoji-regex-8.0.0" - sources."entities-1.1.2" - sources."error-ex-1.3.2" - sources."escalade-3.2.0" - sources."execall-2.0.0" - sources."extend-3.0.2" - sources."fast-deep-equal-3.1.3" - sources."fast-diff-1.3.0" - sources."fast-glob-3.3.3" - sources."fast-uri-3.0.6" - sources."fastest-levenshtein-1.0.16" - sources."fastq-1.19.1" - sources."file-entry-cache-6.0.1" - sources."fill-range-7.1.1" - sources."find-up-4.1.0" - sources."flat-cache-3.2.0" - sources."flatted-3.3.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."gensync-1.0.0-beta.2" - sources."get-stdin-8.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."global-modules-2.0.0" - sources."global-prefix-3.0.0" - sources."globals-11.12.0" - sources."globby-11.1.0" - sources."globjoin-0.1.4" - sources."gonzales-pe-4.3.0" - sources."hard-rejection-2.1.0" - sources."has-flag-4.0.0" - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."html-tags-3.3.1" - sources."htmlparser2-3.10.1" - sources."ignore-5.3.2" - ( - sources."import-fresh-3.3.1" - // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - } - ) - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-alphabetical-1.0.4" - sources."is-alphanumerical-1.0.4" - sources."is-arrayish-0.2.1" - sources."is-buffer-2.0.5" - sources."is-core-module-2.16.1" - sources."is-decimal-1.0.4" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-hexadecimal-1.0.4" - sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" - sources."is-regexp-2.1.0" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."jsesc-3.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-1.0.0" - sources."json5-2.2.3" - sources."keyv-4.5.4" - sources."kind-of-6.0.3" - sources."known-css-properties-0.21.0" - sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.truncate-4.4.2" - sources."log-symbols-4.1.0" - sources."longest-streak-2.0.4" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.5" - sources."mdast-util-to-markdown-0.6.5" - sources."mdast-util-to-string-2.0.0" - sources."meow-9.0.0" - sources."merge2-1.4.1" - sources."micromark-2.11.4" - sources."micromatch-4.0.8" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minimist-options-4.1.0" - sources."ms-2.1.3" - sources."node-releases-2.0.19" - ( - sources."normalize-package-data-3.0.3" - // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."semver-7.7.1" - ]; - } - ) - sources."normalize-range-0.1.2" - sources."normalize-selector-0.2.0" - sources."num2fraction-1.2.2" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse-entities-2.0.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."picocolors-1.1.1" - sources."picomatch-2.3.1" - ( - sources."postcss-7.0.39" - // { - dependencies = [ - sources."picocolors-0.2.1" - ]; - } - ) - sources."postcss-html-0.36.0" - sources."postcss-less-3.1.4" - sources."postcss-media-query-parser-0.2.3" - sources."postcss-resolve-nested-selector-0.1.6" - sources."postcss-safe-parser-4.0.2" - sources."postcss-sass-0.4.4" - sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.1.2" - sources."postcss-syntax-0.36.2" - sources."postcss-value-parser-4.2.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-4.0.1" - ( - sources."read-pkg-5.2.0" - // { - dependencies = [ - sources."normalize-package-data-2.5.0" - sources."type-fest-0.6.0" - ]; - } - ) - ( - sources."read-pkg-up-7.0.1" - // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - } - ) - sources."readable-stream-3.6.2" - sources."redent-3.0.0" - sources."remark-13.0.0" - sources."remark-parse-9.0.0" - sources."remark-stringify-9.0.1" - sources."repeat-string-1.6.1" - sources."require-from-string-2.0.2" - sources."resolve-1.22.10" - sources."resolve-from-5.0.0" - sources."reusify-1.1.0" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" - sources."slice-ansi-4.0.0" - sources."source-map-0.6.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."specificity-0.4.1" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-indent-3.0.0" - sources."style-search-0.1.0" - sources."stylelint-13.13.1" - sources."sugarss-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svg-tags-1.0.0" - sources."table-6.9.0" - sources."to-regex-range-5.0.1" - sources."trim-newlines-3.0.1" - sources."trough-1.0.5" - sources."type-fest-0.18.1" - sources."typedarray-to-buffer-3.1.5" - ( - sources."unified-9.2.2" - // { - dependencies = [ - sources."is-plain-obj-2.1.0" - ]; - } - ) - sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.1.0" - sources."unist-util-stringify-position-2.0.3" - sources."update-browserslist-db-1.1.3" - sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.4.0" - sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.1" - sources."vfile-message-2.0.4" - sources."vscode-jsonrpc-5.1.0-next.1" - sources."vscode-languageserver-6.2.0-next.2" - ( - sources."vscode-languageserver-protocol-3.16.0-next.2" - // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0-next.1" - ]; - } - ) - sources."vscode-languageserver-textdocument-1.0.12" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-uri-2.1.2" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."yallist-4.0.0" - sources."yaml-1.10.2" - sources."yargs-parser-20.2.9" - sources."zwitch-1.0.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "stylelint extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-sumneko-lua = nodeEnv.buildNodePackage { name = "coc-sumneko-lua"; packageName = "coc-sumneko-lua"; From 4647cf35a0b3bdc54f25ae6ff3b28d8c8ce62a6e Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:04:24 -0500 Subject: [PATCH 1336/2279] coc-sumneko-lua: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 14 +- .../vim/plugins/nodePackagePlugins.nix | 1 - .../co/coc-sumneko-lua/package-lock-fix.patch | 1000 +++++++++++++++++ pkgs/by-name/co/coc-sumneko-lua/package.nix | 60 + pkgs/by-name/co/coc-sumneko-lua/update.sh | 31 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 21 - 8 files changed, 1102 insertions(+), 27 deletions(-) create mode 100644 pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch create mode 100644 pkgs/by-name/co/coc-sumneko-lua/package.nix create mode 100755 pkgs/by-name/co/coc-sumneko-lua/update.sh diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 26a8f659445e..8906d1c577ba 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -29,8 +29,9 @@ coc-snippets, coc-solargraph, coc-spell-checker, - coc-stylelint, coc-sqlfluff, + coc-stylelint, + coc-sumneko-lua, coc-toml, }: final: prev: { @@ -182,14 +183,19 @@ final: prev: { src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker"; }; + coc-sqlfluff = buildVimPlugin { + inherit (coc-sqlfluff) pname version meta; + src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff"; + }; + coc-stylelint = buildVimPlugin { inherit (coc-stylelint) pname version meta; src = "${coc-stylelint}/lib/node_modules/coc-stylelint"; }; - coc-sqlfluff = buildVimPlugin { - inherit (coc-sqlfluff) pname version meta; - src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff"; + coc-sumneko-lua = buildVimPlugin { + inherit (coc-sumneko-lua) pname version meta; + src = "${coc-sumneko-lua}/lib/node_modules/coc-sumneko-lua"; }; coc-toml = buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 01e416d0c4d1..3cb9fc19a04f 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-sumneko-lua" "coc-tabnine" "coc-texlab" "coc-tsserver" diff --git a/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch new file mode 100644 index 000000000000..b29492f48824 --- /dev/null +++ b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch @@ -0,0 +1,1000 @@ +diff --git i/package-lock.json w/package-lock.json +index 8ff8254..9ea50fc 100644 +--- i/package-lock.json ++++ w/package-lock.json +@@ -227,6 +227,8 @@ + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.20.2", ++ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", ++ "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", + "cpu": [ + "x64" + ], +@@ -343,6 +345,8 @@ + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", ++ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", ++ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -359,6 +363,8 @@ + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", ++ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { +@@ -370,11 +376,15 @@ + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", ++ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", ++ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -391,6 +401,8 @@ + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", ++ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -427,6 +439,8 @@ + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", ++ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -439,6 +453,8 @@ + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", ++ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { +@@ -447,6 +463,8 @@ + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", ++ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -459,6 +477,8 @@ + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", ++ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", ++ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, +@@ -594,6 +614,8 @@ + }, + "node_modules/@types/fs-extra": { + "version": "11.0.4", ++ "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", ++ "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -609,6 +631,8 @@ + }, + "node_modules/@types/jsonfile": { + "version": "6.1.4", ++ "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz", ++ "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -632,6 +656,8 @@ + }, + "node_modules/@types/node-fetch": { + "version": "2.6.11", ++ "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz", ++ "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -659,6 +685,8 @@ + }, + "node_modules/@types/yauzl": { + "version": "2.10.0", ++ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", ++ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", + "dev": true, + "license": "MIT", + "optional": true, +@@ -1952,6 +1980,8 @@ + }, + "node_modules/ansi-regex": { + "version": "5.0.1", ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", ++ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -1960,6 +1990,8 @@ + }, + "node_modules/ansi-styles": { + "version": "4.3.0", ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", ++ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2040,6 +2072,8 @@ + }, + "node_modules/array-union": { + "version": "2.1.0", ++ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", ++ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { +@@ -2157,6 +2191,8 @@ + }, + "node_modules/asynckit": { + "version": "0.4.0", ++ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", ++ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true, + "license": "MIT" + }, +@@ -2178,6 +2214,8 @@ + }, + "node_modules/balanced-match": { + "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", ++ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, +@@ -2211,6 +2249,8 @@ + }, + "node_modules/braces": { + "version": "3.0.2", ++ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", ++ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2254,6 +2294,8 @@ + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", ++ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", ++ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -2380,6 +2422,8 @@ + }, + "node_modules/chalk": { + "version": "4.1.2", ++ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", ++ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2550,6 +2594,8 @@ + }, + "node_modules/color-convert": { + "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", ++ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2561,11 +2607,15 @@ + }, + "node_modules/color-name": { + "version": "1.1.4", ++ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", ++ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", ++ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", ++ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2620,6 +2670,8 @@ + }, + "node_modules/cross-spawn": { + "version": "7.0.3", ++ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", ++ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2699,6 +2751,8 @@ + }, + "node_modules/debug": { + "version": "4.3.4", ++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", ++ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2763,6 +2817,8 @@ + }, + "node_modules/delayed-stream": { + "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", ++ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -2777,6 +2833,8 @@ + }, + "node_modules/dir-glob": { + "version": "3.0.1", ++ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", ++ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -2812,6 +2870,8 @@ + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", ++ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", ++ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, +@@ -2823,11 +2883,15 @@ + }, + "node_modules/emoji-regex": { + "version": "8.0.0", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", ++ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", ++ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", ++ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3037,6 +3101,8 @@ + }, + "node_modules/esbuild": { + "version": "0.20.2", ++ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", ++ "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", +@@ -3083,6 +3149,8 @@ + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", ++ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { +@@ -3473,6 +3541,8 @@ + }, + "node_modules/esrecurse": { + "version": "4.3.0", ++ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", ++ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { +@@ -3484,6 +3554,8 @@ + }, + "node_modules/estraverse": { + "version": "5.3.0", ++ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", ++ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { +@@ -3543,6 +3615,8 @@ + }, + "node_modules/executable": { + "version": "4.1.1", ++ "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", ++ "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3554,6 +3628,8 @@ + }, + "node_modules/extract-zip": { + "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", ++ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { +@@ -3607,6 +3683,8 @@ + }, + "node_modules/fastq": { + "version": "1.13.0", ++ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", ++ "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -3615,6 +3693,8 @@ + }, + "node_modules/fd-slicer": { + "version": "1.1.0", ++ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", ++ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3635,6 +3715,8 @@ + }, + "node_modules/fill-range": { + "version": "7.0.1", ++ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", ++ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3727,6 +3809,8 @@ + }, + "node_modules/foreground-child": { + "version": "3.1.1", ++ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", ++ "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -3742,6 +3826,8 @@ + }, + "node_modules/form-data": { + "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", ++ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3755,6 +3841,8 @@ + }, + "node_modules/fs-extra": { + "version": "11.2.0", ++ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", ++ "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3879,6 +3967,8 @@ + }, + "node_modules/get-stream": { + "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", ++ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3942,6 +4032,8 @@ + }, + "node_modules/glob": { + "version": "10.3.10", ++ "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", ++ "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -3963,6 +4055,8 @@ + }, + "node_modules/glob-parent": { + "version": "5.1.2", ++ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", ++ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -3974,6 +4068,8 @@ + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", ++ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -3982,6 +4078,8 @@ + }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.3", ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", ++ "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -4027,6 +4125,8 @@ + }, + "node_modules/globby": { + "version": "11.1.0", ++ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", ++ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -4059,6 +4159,8 @@ + }, + "node_modules/graceful-fs": { + "version": "4.2.10", ++ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", ++ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true, + "license": "ISC" + }, +@@ -4080,6 +4182,8 @@ + }, + "node_modules/has-flag": { + "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", ++ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -4195,6 +4299,8 @@ + }, + "node_modules/imurmurhash": { + "version": "0.1.4", ++ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", ++ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { +@@ -4430,6 +4536,8 @@ + }, + "node_modules/is-extglob": { + "version": "2.1.1", ++ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", ++ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -4451,6 +4559,8 @@ + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", ++ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { +@@ -4475,6 +4585,8 @@ + }, + "node_modules/is-glob": { + "version": "4.0.3", ++ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", ++ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -4522,6 +4634,8 @@ + }, + "node_modules/is-number": { + "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", ++ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { +@@ -4711,6 +4825,8 @@ + }, + "node_modules/isexe": { + "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", ++ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, +@@ -4730,6 +4846,8 @@ + }, + "node_modules/jackspeak": { + "version": "2.3.6", ++ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", ++ "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { +@@ -4813,6 +4931,8 @@ + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", ++ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, +@@ -4848,6 +4968,8 @@ + }, + "node_modules/jsonfile": { + "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", ++ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -4949,6 +5071,8 @@ + }, + "node_modules/lodash.merge": { + "version": "4.6.2", ++ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", ++ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, +@@ -4967,6 +5091,8 @@ + }, + "node_modules/lru-cache": { + "version": "6.0.0", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", ++ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -5021,6 +5147,8 @@ + }, + "node_modules/merge2": { + "version": "1.4.1", ++ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", ++ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { +@@ -5049,6 +5177,8 @@ + }, + "node_modules/micromatch": { + "version": "4.0.5", ++ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", ++ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -5061,6 +5191,8 @@ + }, + "node_modules/mime-db": { + "version": "1.52.0", ++ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", ++ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "engines": { +@@ -5069,6 +5201,8 @@ + }, + "node_modules/mime-types": { + "version": "2.1.35", ++ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", ++ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -5113,6 +5247,8 @@ + }, + "node_modules/minipass": { + "version": "7.0.4", ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", ++ "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "dev": true, + "license": "ISC", + "engines": { +@@ -5170,6 +5306,8 @@ + }, + "node_modules/ms": { + "version": "2.1.2", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", ++ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, +@@ -5194,6 +5332,8 @@ + }, + "node_modules/natural-compare": { + "version": "1.4.0", ++ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", ++ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, +@@ -5205,6 +5345,8 @@ + }, + "node_modules/node-fetch": { + "version": "2.7.0", ++ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", ++ "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -5236,6 +5378,8 @@ + }, + "node_modules/node-version-compare": { + "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/node-version-compare/-/node-version-compare-1.0.3.tgz", ++ "integrity": "sha512-unO5GpBAh5YqeGULMLpmDT94oanSDMwtZB8KHTKCH/qrGv8bHN0mlDj9xQDAicCYXv2OLnzdi67lidCrcVotVw==", + "dev": true, + "license": "MIT" + }, +@@ -5471,6 +5615,8 @@ + }, + "node_modules/once": { + "version": "1.4.0", ++ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", ++ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -5625,6 +5771,8 @@ + }, + "node_modules/path-key": { + "version": "3.1.1", ++ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", ++ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { +@@ -5639,6 +5787,8 @@ + }, + "node_modules/path-scurry": { + "version": "1.10.1", ++ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", ++ "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { +@@ -5654,6 +5804,8 @@ + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.2.0", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", ++ "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "dev": true, + "license": "ISC", + "engines": { +@@ -5662,6 +5814,8 @@ + }, + "node_modules/path-type": { + "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", ++ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { +@@ -5676,6 +5830,8 @@ + }, + "node_modules/pend": { + "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", ++ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", + "dev": true, + "license": "MIT" + }, +@@ -5693,6 +5849,8 @@ + }, + "node_modules/picomatch": { + "version": "2.3.1", ++ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", ++ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { +@@ -5704,6 +5862,8 @@ + }, + "node_modules/pify": { + "version": "2.3.0", ++ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", ++ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, + "license": "MIT", + "engines": { +@@ -5818,6 +5978,8 @@ + }, + "node_modules/pump": { + "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", ++ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -5836,6 +5998,8 @@ + }, + "node_modules/queue-microtask": { + "version": "1.2.3", ++ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", ++ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { +@@ -6102,6 +6266,8 @@ + }, + "node_modules/reusify": { + "version": "1.0.4", ++ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", ++ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "license": "MIT", + "engines": { +@@ -6111,6 +6277,8 @@ + }, + "node_modules/rimraf": { + "version": "5.0.5", ++ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", ++ "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -6128,6 +6296,8 @@ + }, + "node_modules/run-parallel": { + "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", ++ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { +@@ -6236,6 +6406,8 @@ + }, + "node_modules/shebang-command": { + "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", ++ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6247,6 +6419,8 @@ + }, + "node_modules/shebang-regex": { + "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", ++ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { +@@ -6274,6 +6448,8 @@ + }, + "node_modules/signal-exit": { + "version": "4.1.0", ++ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", ++ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { +@@ -6291,6 +6467,8 @@ + }, + "node_modules/slash": { + "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", ++ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { +@@ -6360,6 +6538,8 @@ + }, + "node_modules/string-width": { + "version": "4.2.3", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", ++ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6374,6 +6554,8 @@ + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", ++ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6466,6 +6648,8 @@ + }, + "node_modules/strip-ansi": { + "version": "6.0.1", ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", ++ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6478,6 +6662,8 @@ + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", ++ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6525,6 +6711,8 @@ + }, + "node_modules/supports-color": { + "version": "7.2.0", ++ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", ++ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6595,11 +6783,15 @@ + }, + "node_modules/text-table": { + "version": "0.2.0", ++ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", ++ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", ++ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", ++ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6638,6 +6830,8 @@ + }, + "node_modules/tr46": { + "version": "0.0.3", ++ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", ++ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true, + "license": "MIT" + }, +@@ -6770,6 +6964,8 @@ + }, + "node_modules/typescript": { + "version": "4.9.5", ++ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", ++ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "license": "Apache-2.0", + "bin": { +@@ -6829,6 +7025,8 @@ + }, + "node_modules/universalify": { + "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", ++ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -6902,11 +7100,15 @@ + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", ++ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", ++ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", ++ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -6916,6 +7118,8 @@ + }, + "node_modules/which": { + "version": "2.0.2", ++ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", ++ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { +@@ -7013,6 +7217,8 @@ + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", ++ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -7030,6 +7236,8 @@ + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", ++ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -7046,6 +7254,8 @@ + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.0.1", ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", ++ "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "license": "MIT", + "engines": { +@@ -7057,6 +7267,8 @@ + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", ++ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "license": "MIT", + "engines": { +@@ -7068,11 +7280,15 @@ + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "9.2.2", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", ++ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "5.1.2", ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", ++ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -7089,6 +7305,8 @@ + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.0", ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", ++ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -7103,6 +7321,8 @@ + }, + "node_modules/wrappy": { + "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", ++ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, +@@ -7126,6 +7346,8 @@ + }, + "node_modules/yallist": { + "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", ++ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "license": "ISC" + }, +@@ -7199,6 +7421,8 @@ + }, + "node_modules/yauzl": { + "version": "2.10.0", ++ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", ++ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "dev": true, + "license": "MIT", + "dependencies": { diff --git a/pkgs/by-name/co/coc-sumneko-lua/package.nix b/pkgs/by-name/co/coc-sumneko-lua/package.nix new file mode 100644 index 000000000000..1de2513c650e --- /dev/null +++ b/pkgs/by-name/co/coc-sumneko-lua/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.20.2"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in +buildNpmPackage (finalAttrs: { + pname = "coc-sumneko-lua"; + version = "0.0.42"; + + src = fetchFromGitHub { + owner = "xiyaowong"; + repo = "coc-sumneko-lua"; + tag = "v${finalAttrs.version}"; + hash = "sha256-B5XvhhBbVeBQI6nWVskaopx2pJYFBiFCfbPwwwloFig="; + }; + + patches = [ + ./package-lock-fix.patch + ]; + + npmDepsHash = "sha256-NEUDQm4hzhGJyEdiBBrSWa8fMw3DcnnPJJo0m+HgZ5U="; + + nativeBuildInputs = [ esbuild' ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Lua extension using sumneko lua-language-server for coc.nvim"; + homepage = "https://github.com/xiyaowong/coc-sumneko-lua"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/co/coc-sumneko-lua/update.sh b/pkgs/by-name/co/coc-sumneko-lua/update.sh new file mode 100755 index 000000000000..10b819ed9323 --- /dev/null +++ b/pkgs/by-name/co/coc-sumneko-lua/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nodejs nix-update git curl + +WORKDIR=$(mktemp -d) +PACKAGE_DIR="$(realpath "$(dirname "$0")")" + +# Get latest tag +NEW_VERSION=$(curl "https://api.github.com/repos/xiyaowong/coc-sumneko-lua/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1) +# Trim leading "v" for version comparisons +NEW_VERSION=${NEW_VERSION:1} + +# exit early if no change +if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION" + exit 0 +fi + +# Clone source +git clone "https://github.com/xiyaowong/coc-sumneko-lua" -b "v$NEW_VERSION" "$WORKDIR/src" +pushd "$WORKDIR/src" +npx --yes npm-package-lock-add-resolved + +# Update package-lock patch +git diff >"$PACKAGE_DIR/package-lock-fix.patch" +popd + +# Run nix-update +nix-update "$UPDATE_NIX_PNAME" + +# Cleanup +rm -rf "$WORKDIR" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 003bc439313f..823487f8703e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -105,6 +105,7 @@ mapAliases { inherit (pkgs) coc-spell-checker; # added 2025-10-01 inherit (pkgs) coc-sqlfluff; # Added 2025-11-05 inherit (pkgs) coc-stylelint; # Added 2025-11-05 + inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 51ae5514919b..1df68c9ea892 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-sumneko-lua" , "coc-tabnine" , "coc-texlab" , "coc-tsserver" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 26571f4af9e6..2abbeea47c4b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37038,27 +37038,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-sumneko-lua = nodeEnv.buildNodePackage { - name = "coc-sumneko-lua"; - packageName = "coc-sumneko-lua"; - version = "0.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.42.tgz"; - sha512 = "elUmSurb51E17VV/1W/qsAoD5qq6pFsnRK549WFMcG+AThli6nTj2Y6Ta0FA6+zh7QSjbraOlza8gk7C2w3Nfg=="; - }; - dependencies = [ - sources."tslib-2.8.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Lua extension using sumneko lua-language-server for coc.nvim"; - homepage = "https://github.com/xiyaowong/coc-sumneko-lua#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; From ef2f4bdc396ce7126b0b1f7048655e54271400be Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:04:59 -0500 Subject: [PATCH 1337/2279] coc-tabnine: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-tabnine/package.nix | 73 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ----- 6 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/co/coc-tabnine/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 8906d1c577ba..d630a1d62e87 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -32,6 +32,7 @@ coc-sqlfluff, coc-stylelint, coc-sumneko-lua, + coc-tabnine, coc-toml, }: final: prev: { @@ -198,6 +199,11 @@ final: prev: { src = "${coc-sumneko-lua}/lib/node_modules/coc-sumneko-lua"; }; + coc-tabnine = buildVimPlugin { + inherit (coc-tabnine) pname version meta; + src = "${coc-tabnine}/lib/node_modules/coc-tabnine"; + }; + coc-toml = buildVimPlugin { pname = "coc-toml"; inherit (coc-toml) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 3cb9fc19a04f..a9a5d509b32e 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-tabnine" "coc-texlab" "coc-tsserver" "coc-ultisnips" diff --git a/pkgs/by-name/co/coc-tabnine/package.nix b/pkgs/by-name/co/coc-tabnine/package.nix new file mode 100644 index 000000000000..ea7d850dd90b --- /dev/null +++ b/pkgs/by-name/co/coc-tabnine/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.8.33"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-u/3YHQZskgbkaXV7RF8G9kMMx1A25hHhHv+VQdZZ4EU="; + }; + vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-tabnine"; + version = "1.3.7"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-tabnine"; + tag = finalAttrs.version; + hash = "sha256-7l4gCpArP1pp/SfYiyzjLc8VH7HVhwx2slorQcuA6k4="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-Pg/AQv9/VTUXTu6q71vQ+0AMNswHEoCOAWnWIeuy/lQ="; + }; + + yarnBuildScript = "prepare"; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tabnine extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-tabnine"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 823487f8703e..c532259e4be3 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -106,6 +106,7 @@ mapAliases { inherit (pkgs) coc-sqlfluff; # Added 2025-11-05 inherit (pkgs) coc-stylelint; # Added 2025-11-05 inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05 + inherit (pkgs) coc-tabnine; # Added 2025-11-05 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 1df68c9ea892..038642848fbc 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-tabnine" , "coc-texlab" , "coc-tsserver" , "coc-ultisnips" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2abbeea47c4b..4427f16a7a5c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37038,23 +37038,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-tabnine = nodeEnv.buildNodePackage { - name = "coc-tabnine"; - packageName = "coc-tabnine"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz"; - sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "tabnine extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-texlab = nodeEnv.buildNodePackage { name = "coc-texlab"; packageName = "coc-texlab"; From 012cccc12929b5119061236f9551c64cfe6d4764 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:05:40 -0500 Subject: [PATCH 1338/2279] coc-texlab: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-texlab/package.nix | 71 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----- 6 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-texlab/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index d630a1d62e87..9d5eaeda0c5a 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -33,6 +33,7 @@ coc-stylelint, coc-sumneko-lua, coc-tabnine, + coc-texlab, coc-toml, }: final: prev: { @@ -204,6 +205,11 @@ final: prev: { src = "${coc-tabnine}/lib/node_modules/coc-tabnine"; }; + coc-texlab = buildVimPlugin { + inherit (coc-texlab) pname version meta; + src = "${coc-texlab}/lib/node_modules/coc-texlab"; + }; + coc-toml = buildVimPlugin { pname = "coc-toml"; inherit (coc-toml) version meta; diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index a9a5d509b32e..ca4c0ca0e078 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -8,7 +8,6 @@ let nodePackageNames = [ "coc-go" "coc-ltex" - "coc-texlab" "coc-tsserver" "coc-ultisnips" "coc-vimlsp" diff --git a/pkgs/by-name/co/coc-texlab/package.nix b/pkgs/by-name/co/coc-texlab/package.nix new file mode 100644 index 000000000000..c260c3059447 --- /dev/null +++ b/pkgs/by-name/co/coc-texlab/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.25.0"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-texlab"; + version = "0-unstable-2025-07-22"; + + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-texlab"; + rev = "a4ad3f259d94086f4971b22b97833e8a72226782"; + hash = "sha256-6W+L/LdF6g0Xwhv+9VtjjfzRjlbN7OaqHbSXtO3cfZ0="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-g2IwfO1IMktTtflR2m7c99wOYLJYmD2I7hBbCNy+XFA="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "TexLab extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-texlab"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c532259e4be3..a8836c6e736b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -107,6 +107,7 @@ mapAliases { inherit (pkgs) coc-stylelint; # Added 2025-11-05 inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05 inherit (pkgs) coc-tabnine; # Added 2025-11-05 + inherit (pkgs) coc-texlab; # Added 2025-11-05 inherit (pkgs) coc-toml; coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 038642848fbc..849d9940a8b0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -23,7 +23,6 @@ , "clipboard-cli" , "coc-go" , "coc-ltex" -, "coc-texlab" , "coc-tsserver" , "coc-ultisnips" , "coc-vimlsp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4427f16a7a5c..c4263ac3e230 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37038,24 +37038,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-texlab = nodeEnv.buildNodePackage { - name = "coc-texlab"; - packageName = "coc-texlab"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.3.0.tgz"; - sha512 = "MV/zLxI6jvu/IWS3/dyc8Dsgz9ypO86hSAHwjRbDGTc/V9t8jTPUnI4E1hzmsF8bfIjxnUU/oyITX9tLTOnCOQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "TexLab extension for coc.nvim"; - homepage = "https://github.com/fannheyward/coc-texlab#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; From 0e1e74d71dce62bd3f7a31d6e1f30351d45cecf6 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:06:24 -0500 Subject: [PATCH 1339/2279] coc-vimlsp: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-vimlsp/package.nix | 45 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 -------- 6 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-vimlsp/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 9d5eaeda0c5a..c37cc5bd435b 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -35,6 +35,7 @@ coc-tabnine, coc-texlab, coc-toml, + coc-vimlsp, }: final: prev: { coc-basedpyright = buildVimPlugin { @@ -215,4 +216,9 @@ final: prev: { inherit (coc-toml) version meta; src = "${coc-toml}/lib/node_modules/coc-toml"; }; + + coc-vimlsp = buildVimPlugin { + inherit (coc-vimlsp) pname version meta; + src = "${coc-vimlsp}/lib/node_modules/coc-vimlsp"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index ca4c0ca0e078..ed744c3574ef 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,7 +10,6 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-vimlsp" "coc-vimtex" "coc-wxml" "coc-yaml" diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix new file mode 100644 index 000000000000..06ac152b85e4 --- /dev/null +++ b/pkgs/by-name/co/coc-vimlsp/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-vimlsp"; + version = "0-unstable-2023-06-26"; + + src = fetchFromGitHub { + owner = "iamcco"; + repo = "coc-vimlsp"; + rev = "9e88f053201b8b224a6849ce8f891f526e75a28b"; + hash = "sha256-U5nJRn0UZsGfyDR4gZN2E+TSWk0A7RXJqMRQMK3QV00="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-K5hC3YrzSxULt0SiX7r+b8uNWdnvqGe+/GBvZiFzW0c="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "vim-language-server extension for coc.nvim"; + homepage = "https://github.com/iamcco/coc-vimlsp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a8836c6e736b..79ce60f8b1ed 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -112,6 +112,7 @@ mapAliases { coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01 + inherit (pkgs) coc-vimlsp; # Added 2025-11-05 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 849d9940a8b0..bdd3d5d564f7 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "coc-vimlsp" , "coc-vimtex" , "coc-wxml" , "coc-yaml" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c4263ac3e230..4c8736b30dd8 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37077,24 +37077,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-vimlsp = nodeEnv.buildNodePackage { - name = "coc-vimlsp"; - packageName = "coc-vimlsp"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.13.1.tgz"; - sha512 = "rUXjY022KJHLNrlru1zMvqhF+ikYIjlhULoq2fx8PbsA4uyuWLDXvLfeQxj8e5wVNyfPVtaAz54zChLV4OOHAA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "vim language server extension for coc.nvim"; - homepage = "https://github.com/iamcco/coc-vim#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; From 8a33e287e5309a5c4806bb80b847e0344742ed63 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:07:00 -0500 Subject: [PATCH 1340/2279] coc-vimtex: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-vimtex/package.nix | 41 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 -------- 6 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-vimtex/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index c37cc5bd435b..9eb604983b05 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -36,6 +36,7 @@ coc-texlab, coc-toml, coc-vimlsp, + coc-vimtex, }: final: prev: { coc-basedpyright = buildVimPlugin { @@ -221,4 +222,9 @@ final: prev: { inherit (coc-vimlsp) pname version meta; src = "${coc-vimlsp}/lib/node_modules/coc-vimlsp"; }; + + coc-vimtex = buildVimPlugin { + inherit (coc-vimtex) pname version meta; + src = "${coc-vimtex}/lib/node_modules/coc-vimtex"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index ed744c3574ef..83626979088c 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,7 +10,6 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-vimtex" "coc-wxml" "coc-yaml" "coc-yank" diff --git a/pkgs/by-name/co/coc-vimtex/package.nix b/pkgs/by-name/co/coc-vimtex/package.nix new file mode 100644 index 000000000000..e886d7c86f1d --- /dev/null +++ b/pkgs/by-name/co/coc-vimtex/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-vimtex"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-vimtex"; + tag = finalAttrs.version; + hash = "sha256-Z0vhgpdzh3GY9o6qnYWkeaUtjtoJ6PdqtDpRQHQXCjI="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-XEDPfnEkUTVCpxBp/DAdrRDvxYrTo/e+PTQGmtSy58c="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "VimTeX extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-vimtex"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 79ce60f8b1ed..2228b84fc4eb 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -113,6 +113,7 @@ mapAliases { coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18 coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01 inherit (pkgs) coc-vimlsp; # Added 2025-11-05 + inherit (pkgs) coc-vimtex; # Added 2025-11-05 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index bdd3d5d564f7..28d9555265ef 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "coc-vimtex" , "coc-wxml" , "coc-yaml" , "coc-yank" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4c8736b30dd8..98d41a763087 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37077,24 +37077,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-vimtex = nodeEnv.buildNodePackage { - name = "coc-vimtex"; - packageName = "coc-vimtex"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.5.tgz"; - sha512 = "3SY6vFcmBO8u6/6zrBzqgwCbus8k7877UCNVEua8lgC+T4tKgB4w9VthikMEcoUDPK17/QbLITSB+yPDNebbHw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "vimtex integration for coc.nvim"; - homepage = "https://github.com/neoclide/coc-vimtex#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-wxml = nodeEnv.buildNodePackage { name = "coc-wxml"; packageName = "coc-wxml"; From ee22f9dea6d8def0942d53f01a7ec52b823ba6f4 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:07:40 -0500 Subject: [PATCH 1341/2279] coc-wxml: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 +++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-wxml/package.nix | 51 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 17 ------- 6 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/co/coc-wxml/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 9eb604983b05..b0251e64be7a 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -37,6 +37,7 @@ coc-toml, coc-vimlsp, coc-vimtex, + coc-wxml, }: final: prev: { coc-basedpyright = buildVimPlugin { @@ -227,4 +228,9 @@ final: prev: { inherit (coc-vimtex) pname version meta; src = "${coc-vimtex}/lib/node_modules/coc-vimtex"; }; + + coc-wxml = buildVimPlugin { + inherit (coc-wxml) pname version meta; + src = "${coc-wxml}/lib/node_modules/coc-wxml"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 83626979088c..70913d977a9f 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,7 +10,6 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-wxml" "coc-yaml" "coc-yank" "coc-nginx" diff --git a/pkgs/by-name/co/coc-wxml/package.nix b/pkgs/by-name/co/coc-wxml/package.nix new file mode 100644 index 000000000000..1bcea339cc24 --- /dev/null +++ b/pkgs/by-name/co/coc-wxml/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-wxml"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-wxml"; + tag = finalAttrs.version; + hash = "sha256-6tI+rIgoKGafBSxbPumCquAahJVR3rUzJB4VWQR+qw0="; + }; + + # Fix yarn.lock file + postPatch = '' + substituteInPlace yarn.lock \ + --replace-fail "http://registry.npmjs.org" "https://registry.yarnpkg.com" + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src postPatch; + hash = "sha256-s2doN+DeVJPIWe/vOuAH7cYl/S/v8S4yeTG6KIWKphA="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Wxml extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-wxml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 2228b84fc4eb..f69e51c467b1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -114,6 +114,7 @@ mapAliases { coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01 inherit (pkgs) coc-vimlsp; # Added 2025-11-05 inherit (pkgs) coc-vimtex; # Added 2025-11-05 + inherit (pkgs) coc-wxml; # Added 2025-11-05 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 28d9555265ef..92369bd45f56 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "coc-wxml" , "coc-yaml" , "coc-yank" , "code-theme-converter" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 98d41a763087..904e59a24b41 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37077,23 +37077,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-wxml = nodeEnv.buildNodePackage { - name = "coc-wxml"; - packageName = "coc-wxml"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-wxml/-/coc-wxml-1.0.9.tgz"; - sha512 = "ExbBjO4/7sbwHVawtK/sDzFwmUTwW9rHgm51sJxqQim+Zjn3vw1x0pNObonVb+r/kX9peLCyE6/nmT2ybfeBPg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "wxml language server extension for coc.nvim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; From a5d418f44312e4da4b3427fd3b1969e063429cd2 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:08:37 -0500 Subject: [PATCH 1342/2279] coc-yaml: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - .../co/coc-yaml/package-lock-fix.patch | 89 +++++++++++++++++++ pkgs/by-name/co/coc-yaml/package.nix | 34 +++++++ pkgs/by-name/co/coc-yaml/update.sh | 28 ++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 30 ------- 8 files changed, 158 insertions(+), 32 deletions(-) create mode 100644 pkgs/by-name/co/coc-yaml/package-lock-fix.patch create mode 100644 pkgs/by-name/co/coc-yaml/package.nix create mode 100755 pkgs/by-name/co/coc-yaml/update.sh diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index b0251e64be7a..bd12588c9f87 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -38,6 +38,7 @@ coc-vimlsp, coc-vimtex, coc-wxml, + coc-yaml, }: final: prev: { coc-basedpyright = buildVimPlugin { @@ -233,4 +234,9 @@ final: prev: { inherit (coc-wxml) pname version meta; src = "${coc-wxml}/lib/node_modules/coc-wxml"; }; + + coc-yaml = buildVimPlugin { + inherit (coc-yaml) pname version meta; + src = "${coc-yaml}/lib/node_modules/coc-yaml"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 70913d977a9f..bfcd0c253693 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,7 +10,6 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-yaml" "coc-yank" "coc-nginx" ]; diff --git a/pkgs/by-name/co/coc-yaml/package-lock-fix.patch b/pkgs/by-name/co/coc-yaml/package-lock-fix.patch new file mode 100644 index 000000000000..9475bac1997f --- /dev/null +++ b/pkgs/by-name/co/coc-yaml/package-lock-fix.patch @@ -0,0 +1,89 @@ +diff --git i/package-lock.json w/package-lock.json +index 294a466..424d557 100644 +--- i/package-lock.json ++++ w/package-lock.json +@@ -1,12 +1,12 @@ + { + "name": "coc-yaml", +- "version": "1.9.0", ++ "version": "1.9.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "coc-yaml", +- "version": "1.9.0", ++ "version": "1.9.1", + "license": "MIT", + "dependencies": { + "prettier": "2.0.5" +@@ -27,6 +27,8 @@ + }, + "node_modules/@chemzqm/tsconfig": { + "version": "0.0.3", ++ "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz", ++ "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==", + "dev": true, + "license": "MIT" + }, +@@ -464,6 +466,8 @@ + }, + "node_modules/ansi-styles": { + "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", ++ "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "dev": true, + "license": "MIT", + "engines": { +@@ -533,6 +537,8 @@ + }, + "node_modules/fs-extra": { + "version": "10.0.0", ++ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", ++ "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -546,11 +552,15 @@ + }, + "node_modules/graceful-fs": { + "version": "4.2.9", ++ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", ++ "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/jsonfile": { + "version": "6.1.0", ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", ++ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "license": "MIT", + "dependencies": { +@@ -562,6 +572,8 @@ + }, + "node_modules/prettier": { + "version": "2.0.5", ++ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", ++ "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" +@@ -572,6 +584,8 @@ + }, + "node_modules/request-light": { + "version": "0.5.7", ++ "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.7.tgz", ++ "integrity": "sha512-i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw==", + "dev": true, + "license": "MIT" + }, +@@ -591,6 +605,8 @@ + }, + "node_modules/universalify": { + "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", ++ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "license": "MIT", + "engines": { diff --git a/pkgs/by-name/co/coc-yaml/package.nix b/pkgs/by-name/co/coc-yaml/package.nix new file mode 100644 index 000000000000..623fa936ddc8 --- /dev/null +++ b/pkgs/by-name/co/coc-yaml/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage (finalAttrs: { + pname = "coc-yaml"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-yaml"; + tag = finalAttrs.version; + hash = "sha256-JzIajdgVOVJupxmHrw9GuGDZS863YaUa5FomT2tqBpc="; + }; + + patches = [ + ./package-lock-fix.patch + ]; + + npmDepsHash = "sha256-2XFXeF2ork6cPrYU2avpXSoAvLa7If6AtYtBGoxL/2g="; + + npmBuildScript = "prepare"; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Yaml language server extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-yaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/co/coc-yaml/update.sh b/pkgs/by-name/co/coc-yaml/update.sh new file mode 100755 index 000000000000..d3e958140a2d --- /dev/null +++ b/pkgs/by-name/co/coc-yaml/update.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nodejs nix-update git curl jq + +WORKDIR=$(mktemp -d) +PACKAGE_DIR="$(realpath "$(dirname "$0")")" + +# Get latest tag +NEW_VERSION=$(curl "https://api.github.com/repos/neoclide/coc-yaml/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1) + +# exit early if no change +if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION" + exit 0 +fi +# Clone source +git clone "https://github.com/neoclide/coc-yaml" -b "$NEW_VERSION" "$WORKDIR/src" +pushd "$WORKDIR/src" +npx --yes npm-package-lock-add-resolved + +# Update package-lock patch +git diff >"$PACKAGE_DIR/package-lock-fix.patch" +popd + +# Run nix-update +nix-update --version="$NEW_VERSION" "$UPDATE_NIX_PNAME" + +# Cleanup +rm -rf "$WORKDIR" diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f69e51c467b1..6550e5d3865e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -115,6 +115,7 @@ mapAliases { inherit (pkgs) coc-vimlsp; # Added 2025-11-05 inherit (pkgs) coc-vimtex; # Added 2025-11-05 inherit (pkgs) coc-wxml; # Added 2025-11-05 + inherit (pkgs) coc-yaml; # Added 2025-11-05 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 92369bd45f56..82e37e9f7bf2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "coc-yaml" , "coc-yank" , "code-theme-converter" , "conventional-changelog-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 904e59a24b41..ed2b84d8683a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -24326,15 +24326,6 @@ let sha512 = "s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ=="; }; }; - "prettier-2.0.5" = { - name = "prettier"; - packageName = "prettier"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; - sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; - }; - }; "prettier-2.8.8" = { name = "prettier"; packageName = "prettier"; @@ -37077,27 +37068,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-yaml = nodeEnv.buildNodePackage { - name = "coc-yaml"; - packageName = "coc-yaml"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.9.1.tgz"; - sha512 = "PKDIWjnTF1193m0a5srO8oOLrOv9nKwaqka+a+sdzDjlyPoFipEADFUQVdoHwe1GYlfYe7tmfWOUCbR6ddRLrw=="; - }; - dependencies = [ - sources."prettier-2.0.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "yaml extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-yaml#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; From c3a23aaf853a4a3d8507ed8cfd0d1e73aa9bf3d8 Mon Sep 17 00:00:00 2001 From: dish Date: Wed, 5 Nov 2025 17:11:18 -0500 Subject: [PATCH 1343/2279] coc-yank: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 6 ++ .../vim/plugins/nodePackagePlugins.nix | 1 - pkgs/by-name/co/coc-yank/package.nix | 58 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------ 6 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/co/coc-yank/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index bd12588c9f87..51bfed6af45b 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -39,6 +39,7 @@ coc-vimtex, coc-wxml, coc-yaml, + coc-yank, }: final: prev: { coc-basedpyright = buildVimPlugin { @@ -239,4 +240,9 @@ final: prev: { inherit (coc-yaml) pname version meta; src = "${coc-yaml}/lib/node_modules/coc-yaml"; }; + + coc-yank = buildVimPlugin { + inherit (coc-yank) pname version meta; + src = "${coc-yank}/lib/node_modules/coc-yank"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index bfcd0c253693..03fe172d2380 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,7 +10,6 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-yank" "coc-nginx" ]; diff --git a/pkgs/by-name/co/coc-yank/package.nix b/pkgs/by-name/co/coc-yank/package.nix new file mode 100644 index 000000000000..e6e433f48e85 --- /dev/null +++ b/pkgs/by-name/co/coc-yank/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.25.0"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in + +buildNpmPackage (finalAttrs: { + pname = "coc-yank"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc-yank"; + tag = finalAttrs.version; + hash = "sha256-AREGlb8YDRwma9QtLeoted5S0ordS8Hcd2umYQfKq9g="; + }; + + npmDepsHash = "sha256-ISHILT/FBy2Y0UWaQkjMm5ZsYacNt3M54IJ8ckYjq3A="; + + nativeBuildInputs = [ esbuild' ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Yank highlight and persist yank history support for vim"; + homepage = "https://github.com/neoclide/coc-yank"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6550e5d3865e..3c5dd23fe4db 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -116,6 +116,7 @@ mapAliases { inherit (pkgs) coc-vimtex; # Added 2025-11-05 inherit (pkgs) coc-wxml; # Added 2025-11-05 inherit (pkgs) coc-yaml; # Added 2025-11-05 + inherit (pkgs) coc-yank; # Added 2025-11-05 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 82e37e9f7bf2..cf169620b98d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -25,7 +25,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "coc-yank" , "code-theme-converter" , "conventional-changelog-cli" , "cpy-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index ed2b84d8683a..85e0694b1337 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37068,24 +37068,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-yank = nodeEnv.buildNodePackage { - name = "coc-yank"; - packageName = "coc-yank"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.2.4.tgz"; - sha512 = "tNCysSDUKNHAE/cBbfB9kbaSkDbeTleRwfho0vXuaxA6TLAbHqKPA81ecF4pHG4JJm9V156d7uhotYsm4InuyA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Yank extension for coc.nvim"; - homepage = "https://github.com/neoclide/coc-yank#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; code-theme-converter = nodeEnv.buildNodePackage { name = "code-theme-converter"; packageName = "code-theme-converter"; From f95ad6a830824029d47f599bd200cd28031fe4f4 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 12:42:14 -0500 Subject: [PATCH 1344/2279] vimPlugins.coc-*: make much smarter based on the nodePackagePlugins set function, this is a lot simpler than the previous function per derivation --- .../editors/vim/plugins/cocPlugins.nix | 304 ++++-------------- 1 file changed, 59 insertions(+), 245 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 51bfed6af45b..c073c194ca1e 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -1,248 +1,62 @@ { + lib, buildVimPlugin, - coc-basedpyright, - coc-clangd, - coc-cmake, - coc-css, - coc-diagnostic, - coc-docker, - coc-emmet, - coc-eslint, - coc-explorer, - coc-flutter, - coc-git, - coc-haxe, - coc-highlight, - coc-html, - coc-java, - coc-jest, - coc-json, - coc-lists, - coc-markdownlint, - coc-pairs, - coc-prettier, - coc-pyright, - coc-r-lsp, - coc-rust-analyzer, - coc-sh, - coc-smartf, - coc-snippets, - coc-solargraph, - coc-spell-checker, - coc-sqlfluff, - coc-stylelint, - coc-sumneko-lua, - coc-tabnine, - coc-texlab, - coc-toml, - coc-vimlsp, - coc-vimtex, - coc-wxml, - coc-yaml, - coc-yank, + pkgs, }: -final: prev: { - coc-basedpyright = buildVimPlugin { - inherit (coc-basedpyright) pname version meta; - src = "${coc-basedpyright}/lib/node_modules/coc-basedpyright"; - }; - - coc-clangd = buildVimPlugin { - inherit (coc-clangd) pname version meta; - src = "${coc-clangd}/lib/node_modules/coc-clangd"; - }; - - coc-cmake = buildVimPlugin { - inherit (coc-cmake) pname version meta; - src = "${coc-cmake}/lib/node_modules/coc-cmake"; - }; - - coc-css = buildVimPlugin { - inherit (coc-css) pname version meta; - src = "${coc-css}/lib/node_modules/coc-css"; - }; - - coc-diagnostic = buildVimPlugin { - inherit (coc-diagnostic) pname version meta; - src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; - }; - - coc-docker = buildVimPlugin { - inherit (coc-docker) pname version meta; - src = "${coc-docker}/lib/node_modules/coc-docker"; - }; - - coc-emmet = buildVimPlugin { - inherit (coc-emmet) pname version meta; - src = "${coc-emmet}/lib/node_modules/coc-emmet"; - }; - - coc-eslint = buildVimPlugin { - inherit (coc-eslint) pname version meta; - src = "${coc-eslint}/lib/node_modules/coc-eslint"; - }; - - coc-explorer = buildVimPlugin { - inherit (coc-explorer) pname version meta; - src = "${coc-explorer}/lib/node_modules/coc-explorer"; - }; - - coc-flutter = buildVimPlugin { - inherit (coc-flutter) pname version meta; - src = "${coc-flutter}/lib/node_modules/coc-flutter"; - }; - - coc-git = buildVimPlugin { - inherit (coc-git) pname version meta; - src = "${coc-git}/lib/node_modules/coc-git"; - }; - - coc-haxe = buildVimPlugin { - inherit (coc-haxe) pname version meta; - src = "${coc-haxe}/lib/node_modules/coc-haxe"; - }; - - coc-highlight = buildVimPlugin { - inherit (coc-highlight) pname version meta; - src = "${coc-highlight}/lib/node_modules/coc-highlight"; - }; - - coc-html = buildVimPlugin { - inherit (coc-html) pname version meta; - src = "${coc-html}/lib/node_modules/coc-html"; - }; - - coc-java = buildVimPlugin { - inherit (coc-java) pname version meta; - src = "${coc-java}/lib/node_modules/coc-java"; - }; - - coc-jest = buildVimPlugin { - inherit (coc-jest) pname version meta; - src = "${coc-jest}/lib/node_modules/coc-jest"; - }; - - coc-json = buildVimPlugin { - inherit (coc-json) pname version meta; - src = "${coc-json}/lib/node_modules/coc-json"; - }; - - coc-lists = buildVimPlugin { - inherit (coc-lists) pname version meta; - src = "${coc-lists}/lib/node_modules/coc-lists"; - }; - - coc-markdownlint = buildVimPlugin { - inherit (coc-markdownlint) pname version meta; - src = "${coc-markdownlint}/lib/node_modules/coc-markdownlint"; - }; - - coc-pairs = buildVimPlugin { - inherit (coc-pairs) pname version meta; - src = "${coc-pairs}/lib/node_modules/coc-pairs"; - }; - - coc-prettier = buildVimPlugin { - inherit (coc-prettier) pname version meta; - src = "${coc-prettier}/lib/node_modules/coc-prettier"; - }; - - coc-pyright = buildVimPlugin { - pname = "coc-pyright"; - inherit (coc-pyright) version meta; - src = "${coc-pyright}/lib/node_modules/coc-pyright"; - }; - - coc-r-lsp = buildVimPlugin { - inherit (coc-r-lsp) pname version meta; - src = "${coc-r-lsp}/lib/node_modules/coc-r-lsp"; - }; - - coc-rust-analyzer = buildVimPlugin { - inherit (coc-rust-analyzer) pname version meta; - src = "${coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; - }; - - coc-sh = buildVimPlugin { - pname = "coc-sh"; - inherit (coc-sh) version meta; - src = "${coc-sh}/lib/node_modules/coc-sh"; - }; - - coc-smartf = buildVimPlugin { - inherit (coc-smartf) pname version meta; - src = "${coc-smartf}/lib/node_modules/coc-smartf"; - }; - - coc-snippets = buildVimPlugin { - inherit (coc-snippets) pname version meta; - src = "${coc-snippets}/lib/node_modules/coc-snippets"; - }; - - coc-solargraph = buildVimPlugin { - inherit (coc-solargraph) pname version meta; - src = "${coc-solargraph}/lib/node_modules/coc-solargraph"; - }; - - coc-spell-checker = buildVimPlugin { - pname = "coc-spell-checker"; - inherit (coc-spell-checker) version meta; - src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker"; - }; - - coc-sqlfluff = buildVimPlugin { - inherit (coc-sqlfluff) pname version meta; - src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff"; - }; - - coc-stylelint = buildVimPlugin { - inherit (coc-stylelint) pname version meta; - src = "${coc-stylelint}/lib/node_modules/coc-stylelint"; - }; - - coc-sumneko-lua = buildVimPlugin { - inherit (coc-sumneko-lua) pname version meta; - src = "${coc-sumneko-lua}/lib/node_modules/coc-sumneko-lua"; - }; - - coc-tabnine = buildVimPlugin { - inherit (coc-tabnine) pname version meta; - src = "${coc-tabnine}/lib/node_modules/coc-tabnine"; - }; - - coc-texlab = buildVimPlugin { - inherit (coc-texlab) pname version meta; - src = "${coc-texlab}/lib/node_modules/coc-texlab"; - }; - - coc-toml = buildVimPlugin { - pname = "coc-toml"; - inherit (coc-toml) version meta; - src = "${coc-toml}/lib/node_modules/coc-toml"; - }; - - coc-vimlsp = buildVimPlugin { - inherit (coc-vimlsp) pname version meta; - src = "${coc-vimlsp}/lib/node_modules/coc-vimlsp"; - }; - - coc-vimtex = buildVimPlugin { - inherit (coc-vimtex) pname version meta; - src = "${coc-vimtex}/lib/node_modules/coc-vimtex"; - }; - - coc-wxml = buildVimPlugin { - inherit (coc-wxml) pname version meta; - src = "${coc-wxml}/lib/node_modules/coc-wxml"; - }; - - coc-yaml = buildVimPlugin { - inherit (coc-yaml) pname version meta; - src = "${coc-yaml}/lib/node_modules/coc-yaml"; - }; - - coc-yank = buildVimPlugin { - inherit (coc-yank) pname version meta; - src = "${coc-yank}/lib/node_modules/coc-yank"; - }; -} +final: prev: +let + cocPackages = [ + "coc-clangd" + "coc-cmake" + "coc-css" + "coc-diagnostic" + "coc-docker" + "coc-emmet" + "coc-eslint" + "coc-explorer" + "coc-flutter" + "coc-git" + "coc-haxe" + "coc-highlight" + "coc-html" + "coc-java" + "coc-jest" + "coc-json" + "coc-lists" + "coc-markdownlint" + "coc-pairs" + "coc-prettier" + "coc-pyright" + "coc-r-lsp" + "coc-rust-analyzer" + "coc-sh" + "coc-sh" + "coc-smartf" + "coc-snippets" + "coc-solargraph" + "coc-spell-checker" + "coc-sqlfluff" + "coc-stylelint" + "coc-sumneko-lua" + "coc-tabnine" + "coc-texlab" + "coc-toml" + "coc-toml" + "coc-vimlsp" + "coc-vimtex" + "coc-wxml" + "coc-basedpyright" + "coc-yaml" + "coc-yank" + ]; +in +lib.genAttrs cocPackages ( + pkg: + let + cocPkg = pkgs.${pkg}; + in + buildVimPlugin { + inherit (cocPkg) pname version meta; + src = "${cocPkg}/lib/node_modules/${cocPkg.pname}"; + } +) From fb32183cdf52be2f618128fd942f0bbc8b375f9c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 20:43:56 +0000 Subject: [PATCH 1345/2279] python3Packages.orbax-checkpoint: 0.11.27 -> 0.11.28 Diff: https://github.com/google/orbax/compare/v0.11.27...v0.11.28 Changelog: https://github.com/google/orbax/blob/v0.11.28/checkpoint/CHANGELOG.md --- pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 3e4926d4570a..33baac38cd79 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.27"; + version = "0.11.28"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-KXEwUHJAFxeJTs3qKUXMCYO3t5hoPTjGay9GIOQIuCY="; + hash = "sha256-a7E60fZRmEXTA220mwr7EDMUc+zYbW7wG40vY7NeAOM="; }; sourceRoot = "${src.name}/checkpoint"; From 87ca02802d7529af9b20c0ffdcde742cf11cde12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:45:30 +0000 Subject: [PATCH 1346/2279] coroot-node-agent: 1.26.4 -> 1.27.0 --- pkgs/by-name/co/coroot-node-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index fb6e024caf26..b3939329e100 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.26.4"; + version = "1.27.0"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-bm3zMk44FNZ3vb9fP1Szbmi+0I1kOas0es8Cqu3yWeA="; + hash = "sha256-y8Uuz0lH49PTW9NjPzKjfxjquDar6uOc+GlI+KiqkOU="; }; - vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk="; + vendorHash = "sha256-KK9VkcXwcSTzhdf/22Ft4DUUlvUERGAWE5zwdbOtrQo="; buildInputs = [ systemdLibs ]; From 1c15b96512066321da40584981c47cd749068489 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 6 Nov 2025 21:48:40 +0100 Subject: [PATCH 1347/2279] teleport: Use pnpmDeps fetcherVersion 2 --- pkgs/build-support/teleport/default.nix | 2 +- pkgs/by-name/te/teleport_16/package.nix | 2 +- pkgs/by-name/te/teleport_17/package.nix | 2 +- pkgs/by-name/te/teleport_18/package.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix index 90800cf62429..3fc871d31203 100644 --- a/pkgs/build-support/teleport/default.nix +++ b/pkgs/build-support/teleport/default.nix @@ -75,7 +75,7 @@ let pnpmDeps = pnpm_10.fetchDeps { inherit src pname version; - fetcherVersion = 1; + fetcherVersion = 2; hash = pnpmHash; }; diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix index cfead2c1f55f..2599a4488b81 100644 --- a/pkgs/by-name/te/teleport_16/package.nix +++ b/pkgs/by-name/te/teleport_16/package.nix @@ -9,7 +9,7 @@ buildTeleport { version = "16.5.18"; hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo="; vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8="; - pnpmHash = "sha256-V0R/i+oENGxlmq2Q6iwnikgBFVMWXph9WMStp3HTW34="; + pnpmHash = "sha256-Sn3rM6l6pADG7GHenlL3NC0oLc4GFZLTzqDHgzInLbk="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 7e24679a93a9..7296c80c50a9 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -11,7 +11,7 @@ buildTeleport { hash = "sha256-z520UT17nFLBwyVLjdfx9aTbkMv1fljsN88G6WRPvZE="; vendorHash = "sha256-mtOCLAcVIxaEhGzdsVWxnKQ4FRTXZ5vVAF+NVMdFItk="; cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs="; - pnpmHash = "sha256-4xLbPQwmI0nAUNAgDHwkx1uSbjHPe8LNmEFQfoaj6bY="; + pnpmHash = "sha256-zTl7hSVPEdnFXx76QpApdY/qDKVNA3yrhaprSYp7YQo="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; inherit buildGoModule withRdpClient extPatches; diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index 075b5ec0c782..9312a428633c 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -10,7 +10,7 @@ buildTeleport { version = "18.3.1"; hash = "sha256-HM0pu+3O7zoClH15YC0naxxmKJC9ngamnvraTosRqG0="; vendorHash = "sha256-HyS0KKW7lyn3NzedxM4+UxFV9OnxgtFDMW5jkj3ir/8="; - pnpmHash = "sha256-/G6WYC3YGk8ma4hAI6sZhQ6KAh+u4CxQ7891fYj5bJg="; + pnpmHash = "sha256-6sThtwACNEdV0fleaQf3iMmFxPsd0AshYeYZUatFMcg="; cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; From 836683ae5fbb7104a6925890490bfa0959e89424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 20:50:44 +0000 Subject: [PATCH 1348/2279] candy-icons: 0-unstable-2025-09-09 -> 0-unstable-2025-11-01 --- pkgs/by-name/ca/candy-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 25ac7d8603a8..9ea760afb4e4 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-09-09"; + version = "0-unstable-2025-11-01"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "40cbbc8821db020e2668c309cd5a7bbfabd0be06"; - hash = "sha256-wJ86TUjiVYT64QunDk85Jji5vo0Os+D9t/fsyKRM+P0="; + rev = "1be42f22a36813b8b992f37c1ce56d886a4f97cf"; + hash = "sha256-suQ2yvKsMbm0a4Qg9D3THMa1gCpZSlOF0plD0H8vYy8="; }; nativeBuildInputs = [ gtk3 ]; From 1553ab13f46ddcab156ef59c9a31ed382d7086f3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 4 Nov 2025 16:04:38 +0100 Subject: [PATCH 1349/2279] music-assistant: 2.6.0 -> 2.6.2 https://github.com/music-assistant/server/releases/tag/2.6.2 https://github.com/music-assistant/server/releases/tag/2.6.1 diff: https://github.com/music-assistant/server/compare/2.6.0...2.6.2 --- pkgs/by-name/mu/music-assistant/package.nix | 4 ++-- pkgs/by-name/mu/music-assistant/providers.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 9f6589ba03cf..d85831328d30 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.6.0"; + version = "2.6.2"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-e596gvj+ZZDQzyBVfI50nO0a0eZifrkQVhUNNP2Jj8A="; + hash = "sha256-mNSTXMQDG5LiP3Bv9GGy2AO1bQfpFLH8tSCOB/wAzOU="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 611e3a2afeae..97344f585851 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.6.0"; + version = "2.6.2"; providers = { airplay = ps: [ ]; From 47a8e5ff8b23725d80854320357a853232e59f4c Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 6 Nov 2025 22:05:44 +0100 Subject: [PATCH 1350/2279] librespot-ma: 0.6.0-unstable-2025-08-10 -> 0.7.1-unstable-2025-11-06 diff: https://github.com/music-assistant/librespot/compare/accecb60a16334013c0c99a5ded553794ee871b7...2af61256649d6c1ed149791a53a20a595b617704 --- pkgs/by-name/li/librespot-ma/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/librespot-ma/package.nix b/pkgs/by-name/li/librespot-ma/package.nix index f5e86091c206..dd1f8160d429 100644 --- a/pkgs/by-name/li/librespot-ma/package.nix +++ b/pkgs/by-name/li/librespot-ma/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "librespot-ma"; - version = "0.6.0-unstable-2025-08-10"; + version = "0.7.1-unstable-2025-11-06"; src = fetchFromGitHub { owner = "music-assistant"; repo = "librespot"; - rev = "accecb60a16334013c0c99a5ded553794ee871b7"; - hash = "sha256-vPiI8llXB6+ahX+iad/Ut81D3iZcTSVmYGDXXwApk/w="; + rev = "2af61256649d6c1ed149791a53a20a595b617704"; + hash = "sha256-sarxS6YArK5luX4TRXJUKhreMqhZbsS/3fCVWHxPNpY="; }; - cargoHash = "sha256-Lujz2revTAok9B0hzdl8NVQ5XMRY9ACJzoQHIkIgKMg="; + cargoHash = "sha256-CI2BFmQNK1+J2qaKg6u6WM83jwBuWjeh9dROnrF3Kv0="; nativeBuildInputs = [ pkg-config From ecf72265ab93582917e5f160f2d8c5c1e8a0f1b2 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 15:18:38 -0500 Subject: [PATCH 1351/2279] jshint: migrate from nodePackages --- pkgs/by-name/js/jshint/package.nix | 36 +++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 143 ------------------ 4 files changed, 37 insertions(+), 144 deletions(-) create mode 100644 pkgs/by-name/js/jshint/package.nix diff --git a/pkgs/by-name/js/jshint/package.nix b/pkgs/by-name/js/jshint/package.nix new file mode 100644 index 000000000000..3d9dbeb5ed8f --- /dev/null +++ b/pkgs/by-name/js/jshint/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "jshint"; + version = "2.13.6"; + + src = fetchFromGitHub { + owner = "jshint"; + repo = "jshint"; + tag = finalAttrs.version; + hash = "sha256-RANA+kL7gL5bGa5KywEH/G+mAsPEoNkfxlp/pHeW8iE="; + }; + + npmDepsHash = "sha256-4P1rQmNIENbJPFqpbgnrq4V2tZe4MWySIphwUtnNcuc="; + + env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1"; + + postBuild = '' + npm run test-node + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool that helps to detect errors and potential problems in your JavaScript code"; + homepage = "https://jshint.com"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "jshint"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ad998d2dac12..f1ca449fb7b6 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -177,6 +177,7 @@ mapAliases { inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 inherit (pkgs) js-beautify; # Added 2025-11-06 + inherit (pkgs) jshint; # Added 2025-11-06 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 69cd6711e666..6fbe741cb611 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -51,7 +51,6 @@ , "imapnotify" , "js-yaml" , "jsdoc" -, "jshint" , "json" , "json-diff" , "json-refs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 07c8eff605e3..4be801c40fab 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -7934,15 +7934,6 @@ let sha512 = "TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ=="; }; }; - "cli-1.0.1" = { - name = "cli"; - packageName = "cli"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz"; - sha512 = "41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg=="; - }; - }; "cli-boxes-2.2.1" = { name = "cli-boxes"; packageName = "cli-boxes"; @@ -8861,15 +8852,6 @@ let sha512 = "EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA=="; }; }; - "console-browserify-1.1.0" = { - name = "console-browserify"; - packageName = "console-browserify"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; - sha512 = "duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg=="; - }; - }; "console-browserify-1.2.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -9915,15 +9897,6 @@ let sha512 = "39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="; }; }; - "date-now-0.1.4" = { - name = "date-now"; - packageName = "date-now"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; - sha512 = "AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw=="; - }; - }; "dateformat-2.2.0" = { name = "dateformat"; packageName = "dateformat"; @@ -10788,15 +10761,6 @@ let sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; - "domhandler-2.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - sha512 = "q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ=="; - }; - }; "domino-2.1.6" = { name = "domino"; packageName = "domino"; @@ -10806,15 +10770,6 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "domutils-1.5.1" = { - name = "domutils"; - packageName = "domutils"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha512 = "gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw=="; - }; - }; "domutils-3.2.2" = { name = "domutils"; packageName = "domutils"; @@ -11328,15 +11283,6 @@ let sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q=="; }; }; - "entities-1.0.0" = { - name = "entities"; - packageName = "entities"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - sha512 = "LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ=="; - }; - }; "entities-1.1.2" = { name = "entities"; packageName = "entities"; @@ -12309,15 +12255,6 @@ let sha512 = "c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="; }; }; - "exit-0.1.2" = { - name = "exit"; - packageName = "exit"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; - sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="; - }; - }; "exit-hook-1.1.1" = { name = "exit-hook"; packageName = "exit-hook"; @@ -15009,15 +14946,6 @@ let sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="; }; }; - "htmlparser2-3.8.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q=="; - }; - }; "http-auth-3.1.3" = { name = "http-auth"; packageName = "http-auth"; @@ -28907,15 +28835,6 @@ let sha512 = "mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA=="; }; }; - "strip-json-comments-1.0.4" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha512 = "AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg=="; - }; - }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -40604,68 +40523,6 @@ in bypassCache = true; reconstructLock = true; }; - jshint = nodeEnv.buildNodePackage { - name = "jshint"; - packageName = "jshint"; - version = "2.13.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz"; - sha512 = "IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ=="; - }; - dependencies = [ - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."cli-1.0.1" - sources."concat-map-0.0.1" - sources."console-browserify-1.1.0" - sources."core-util-is-1.0.3" - sources."date-now-0.1.4" - ( - sources."dom-serializer-0.2.2" - // { - dependencies = [ - sources."domelementtype-2.3.0" - sources."entities-2.2.0" - ]; - } - ) - sources."domelementtype-1.3.1" - sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."entities-1.0.0" - sources."exit-0.1.2" - sources."fs.realpath-1.0.0" - ( - sources."glob-7.2.3" - // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - } - ) - sources."htmlparser2-3.8.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."isarray-0.0.1" - sources."lodash-4.17.21" - sources."minimatch-3.0.8" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - sources."strip-json-comments-1.0.4" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; From 250233a10d0d0e63d7b1a1246d6b5c04a253ce03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 13:12:35 -0800 Subject: [PATCH 1352/2279] home-assistant: re-enable previously failing tests --- pkgs/servers/home-assistant/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 51f5b443e56a..af962a1d269f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -488,12 +488,6 @@ python.pkgs.buildPythonApplication rec { "tests/test_bootstrap.py::test_setup_hass_takes_longer_than_log_slow_startup" "tests/test_test_fixtures.py::test_evict_faked_translations" "tests/helpers/test_backup.py::test_async_get_manager" - # (2025.9.0) Extra argument (demo platform) in list that is expected to be empty - "tests/scripts/test_check_config.py::test_config_platform_valid" - # (2025.9.0) Schema mismatch, diff shows a required field that needs to be removed - "tests/test_data_entry_flow.py::test_section_in_serializer" - # (2025.9.0) unique id collision in async_update_entry - "tests/test_config_entries.py::test_async_update_entry_unique_id_collision" ]; preCheck = '' From 1ec42ea2cd8d640993484b313284f968108cb5a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 21:13:20 +0000 Subject: [PATCH 1353/2279] cargo-dist: 0.30.1 -> 0.30.2 --- pkgs/by-name/ca/cargo-dist/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index e4a0a9dc5d01..61bd4e6f3511 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.30.1"; + version = "0.30.2"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-kYmrV8GdtACtWPB3DckCriMqKeCn0Kz7HBDvXd9kr40="; + hash = "sha256-1stUmm7rtNB2z2srOzDvQ9QaGsS0CySBOHt118vmJoM="; }; - cargoHash = "sha256-SShnaCaaB/mgQn8PtttXtvUjdPfrYRopvjl0uGJbvzE="; + cargoHash = "sha256-Il5PVJHoNdifqUcXxKR+j+Lgga0kIsl7IJp9oGanZ+c="; nativeBuildInputs = [ pkg-config From 0058ea9e747e1224379aee5c903c29e60b4c9137 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 21:14:52 +0000 Subject: [PATCH 1354/2279] python3Packages.click-odoo-contrib: 1.22 -> 1.23 --- .../development/python-modules/click-odoo-contrib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index 109fe65523b2..bcdbd26ace7d 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "click-odoo-contrib"; - version = "1.22"; + version = "1.23"; format = "pyproject"; src = fetchPypi { pname = "click_odoo_contrib"; inherit version; - hash = "sha256-L0Slv0ExVsnlMH23FX06aAEYMqzQEAc4mrKb96TtjRY="; + hash = "sha256-ep4aBJpc94qLIBaGdD0F1fkQmPA4qtG0ql3W+wbPmkE="; }; nativeBuildInputs = [ setuptools-scm ]; From 5120256615b09b2ef1dab1b08e33cd2a41a62bbe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 21:13:07 +0000 Subject: [PATCH 1355/2279] python3Packages.dask: 2025.10.0 -> 2025.11.0 Diff: https://github.com/dask/dask/compare/2025.10.0...2025.11.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- .../python-modules/dask/default.nix | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 9dee7a37aa21..af46945b5197 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -5,6 +5,7 @@ # build-system setuptools, + setuptools-scm, # dependencies click, @@ -38,30 +39,20 @@ buildPythonPackage rec { pname = "dask"; - version = "2025.10.0"; + version = "2025.11.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; tag = version; - hash = "sha256-xPgMhydsFmwg0kyl3Lst1N+CsbbnsWdPOtkZ8BMPDR8="; + hash = "sha256-cU4w4dqJQ3ew+fRyD7Lc4URNfW738kKqls6k6j65pIo="; }; - postPatch = '' - # versioneer hack to set version of GitHub package - echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py - - substituteInPlace setup.py \ - --replace-fail "import versioneer" "" \ - --replace-fail "version=versioneer.get_version()," "version='${version}'," \ - --replace-fail "cmdclass=versioneer.get_cmdclass()," "" - - substituteInPlace pyproject.toml \ - --replace-fail ', "versioneer[toml]==0.29"' "" - ''; - - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ click From 6a02c451da76ad38fd1e0fc40336884a4a8b5767 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 21:15:05 +0000 Subject: [PATCH 1356/2279] python3Packages.distributed: 2025.10.0 -> 2025.11.0 Diff: https://github.com/dask/distributed/compare/2025.10.0...2025.11.0 Changelog: https://github.com/dask/distributed/releases/tag/2025.11.0 --- .../python-modules/distributed/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 8beeb848a05c..cb0bc96793e1 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -6,7 +6,6 @@ # build-system setuptools, setuptools-scm, - versioneer, # dependencies click, @@ -28,28 +27,20 @@ buildPythonPackage rec { pname = "distributed"; - version = "2025.10.0"; + version = "2025.11.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; tag = version; - hash = "sha256-qO03jwZeOjDP/BQxK8OFma5BxGF9nBoXVFWFGa+EQ00="; + hash = "sha256-b6kVrRPGbPyss0Wl56qQFjZOznLH9Y3HQlEHo9d6X9I="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "versioneer[toml]==" "versioneer[toml]>=" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; - build-system = [ setuptools setuptools-scm - versioneer - ] - ++ versioneer.optional-dependencies.toml; + ]; pythonRelaxDeps = [ "dask" ]; From 3e8b559da11dd92c37fe1eaedc02526f6ac10269 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 21:23:14 +0000 Subject: [PATCH 1357/2279] python3Packages.oelint-data: 1.2.1 -> 1.2.3 --- pkgs/development/python-modules/oelint-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 6c5294c91cda..bc380ff58a21 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "oelint-data"; - version = "1.2.1"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-data"; tag = version; - hash = "sha256-RjjuzjmUbTfmX1W7p+7+pO8O8dh+WInxPgMSJsLMLyU="; + hash = "sha256-R8K0rJoIZz/+cAurb0623MdC3qkV9YBwT5RKiWHDrn0="; }; build-system = [ From eb011f3f0fbab8335d00b68588a2b01f56741989 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 6 Nov 2025 18:32:14 -0300 Subject: [PATCH 1358/2279] curv: fix build with cmake4 --- pkgs/by-name/cu/curv/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 2859522af3d2..2fd270b06787 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -70,6 +70,11 @@ stdenv.mkDerivation { runHook postInstallCheck ''; + postPatch = '' + substituteInPlace extern/googletest/googletest/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)" + ''; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { From 4c813555a097e58e5a2eb0ab324bc0e40c547b6e Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 16:38:55 -0500 Subject: [PATCH 1359/2279] nodePackages.@babel/cli: drop Upstream(per https://babeljs.io/docs/babel-cli) suggests installing this per-project and not globally, so to help users avoid this anti-pattern, let's remove it --- pkgs/development/node-packages/aliases.nix | 2 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 260 ------------------ 4 files changed, 2 insertions(+), 262 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cce4f3533d86..8bbb5737d6cb 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -35,6 +35,8 @@ in mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 + "@babel/cli" = + throw "@babel/cli was removed because upstream highly suggests installing it in your project instead of globally."; # Added 2025-11-06 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d0eae0605793..0e9b9b20b976 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -8,7 +8,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@babel/cli" = "babel"; "@commitlint/cli" = "commitlint"; "@webassemblyjs/repl-1.11.1" = "wasm"; "@webassemblyjs/wasm-strip" = "wasm-strip"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2e73cbc3b36a..a0a286fb5aca 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,7 +1,6 @@ [ "@angular/cli" , "@antfu/ni" -, "@babel/cli" , "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6cb3a179f25d..3fd8d6e32bea 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -255,24 +255,6 @@ let sha512 = "RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ=="; }; }; - "@babel/compat-data-7.26.8" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.26.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz"; - sha512 = "oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ=="; - }; - }; - "@babel/core-7.26.10" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.26.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz"; - sha512 = "vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ=="; - }; - }; "@babel/generator-7.26.10" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -291,33 +273,6 @@ let sha512 = "6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ=="; }; }; - "@babel/helper-compilation-targets-7.26.5" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.26.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz"; - sha512 = "IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA=="; - }; - }; - "@babel/helper-module-imports-7.25.9" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.25.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz"; - sha512 = "tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw=="; - }; - }; - "@babel/helper-module-transforms-7.26.0" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz"; - sha512 = "xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw=="; - }; - }; "@babel/helper-string-parser-7.25.9" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; @@ -336,24 +291,6 @@ let sha512 = "Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ=="; }; }; - "@babel/helper-validator-option-7.25.9" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.25.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz"; - sha512 = "e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw=="; - }; - }; - "@babel/helpers-7.26.10" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.26.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz"; - sha512 = "UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g=="; - }; - }; "@babel/parser-7.26.10" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -6656,15 +6593,6 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.24.4" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.24.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz"; - sha512 = "KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A=="; - }; - }; "brq-0.1.10" = { name = "brq"; packageName = "brq"; @@ -7277,15 +7205,6 @@ let sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA=="; }; }; - "caniuse-lite-1.0.30001704" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001704"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz"; - sha512 = "+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew=="; - }; - }; "canvas-2.11.2" = { name = "canvas"; packageName = "canvas"; @@ -8366,15 +8285,6 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-6.2.1" = { - name = "commander"; - packageName = "commander"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"; - sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -8952,15 +8862,6 @@ let sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="; }; }; - "convert-source-map-2.0.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz"; - sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="; - }; - }; "convert-to-spaces-1.0.2" = { name = "convert-to-spaces"; packageName = "convert-to-spaces"; @@ -10878,15 +10779,6 @@ let sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="; }; }; - "electron-to-chromium-1.5.118" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.5.118"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.118.tgz"; - sha512 = "yNDUus0iultYyVoEFLnQeei7LOQkL8wg8GQpkPCRrOlJXlcCwa6eGKZkxQ9ciHsqZyYbj8Jd94X1CTPzGm+uIA=="; - }; - }; "elegant-spinner-1.0.1" = { name = "elegant-spinner"; packageName = "elegant-spinner"; @@ -13245,15 +13137,6 @@ let sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="; }; }; - "fs-readdir-recursive-1.1.0" = { - name = "fs-readdir-recursive"; - packageName = "fs-readdir-recursive"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz"; - sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; - }; - }; "fs.extra-1.3.2" = { name = "fs.extra"; packageName = "fs.extra"; @@ -13407,15 +13290,6 @@ let sha512 = "H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag=="; }; }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -18978,15 +18852,6 @@ let sha512 = "WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ=="; }; }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -19078,15 +18943,6 @@ let sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; - "make-dir-2.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; - sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; - }; - }; "make-dir-3.1.0" = { name = "make-dir"; packageName = "make-dir"; @@ -21491,15 +21347,6 @@ let sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA=="; }; }; - "node-releases-2.0.19" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz"; - sha512 = "xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="; - }; - }; "node-static-0.7.11" = { name = "node-static"; packageName = "node-static"; @@ -30590,15 +30437,6 @@ let sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; - "update-browserslist-db-1.1.3" = { - name = "update-browserslist-db"; - packageName = "update-browserslist-db"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz"; - sha512 = "UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw=="; - }; - }; "update-check-1.5.4" = { name = "update-check"; packageName = "update-check"; @@ -32363,15 +32201,6 @@ let sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -33125,95 +32954,6 @@ in bypassCache = true; reconstructLock = true; }; - "@babel/cli" = nodeEnv.buildNodePackage { - name = "_at_babel_slash_cli"; - packageName = "@babel/cli"; - version = "7.26.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.26.4.tgz"; - sha512 = "+mORf3ezU3p3qr+82WvJSnQNE1GAYeoCfEv4fik6B5/2cvKZ75AX8oawWQdXtM9MmndooQj15Jr9kelRFWsuRw=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.26.2" - sources."@babel/compat-data-7.26.8" - ( - sources."@babel/core-7.26.10" - // { - dependencies = [ - sources."semver-6.3.1" - ]; - } - ) - sources."@babel/generator-7.26.10" - ( - sources."@babel/helper-compilation-targets-7.26.5" - // { - dependencies = [ - sources."semver-6.3.1" - ]; - } - ) - sources."@babel/helper-module-imports-7.25.9" - sources."@babel/helper-module-transforms-7.26.0" - sources."@babel/helper-string-parser-7.25.9" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@babel/helper-validator-option-7.25.9" - sources."@babel/helpers-7.26.10" - sources."@babel/parser-7.26.10" - sources."@babel/template-7.26.9" - sources."@babel/traverse-7.26.10" - sources."@babel/types-7.26.10" - sources."@jridgewell/gen-mapping-0.3.8" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."browserslist-4.24.4" - sources."caniuse-lite-1.0.30001704" - sources."commander-6.2.1" - sources."concat-map-0.0.1" - sources."convert-source-map-2.0.0" - sources."debug-4.4.0" - sources."electron-to-chromium-1.5.118" - sources."escalade-3.2.0" - sources."fs-readdir-recursive-1.1.0" - sources."fs.realpath-1.0.0" - sources."gensync-1.0.0-beta.2" - sources."glob-7.2.3" - sources."globals-11.12.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."js-tokens-4.0.0" - sources."jsesc-3.1.0" - sources."json5-2.2.3" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."minimatch-3.1.2" - sources."ms-2.1.3" - sources."node-releases-2.0.19" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."picocolors-1.1.1" - sources."pify-4.0.1" - sources."semver-5.7.2" - sources."slash-2.0.0" - sources."update-browserslist-db-1.1.3" - sources."wrappy-1.0.2" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Babel command line"; - homepage = "https://babel.dev/docs/en/next/babel-cli"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; From ca2fa5a4ab91d03afac210360715fadb96521eb0 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 6 Nov 2025 22:41:11 +0100 Subject: [PATCH 1360/2279] ungoogled-chromium: 142.0.7444.59-2 -> 142.0.7444.134-1 https://chromereleases.googleblog.com/2025/11/stable-channel-update-for-desktop.html This update includes 5 security fixes. CVEs: CVE-2025-12725 CVE-2025-12726 CVE-2025-12727 CVE-2025-12728 CVE-2025-12729 --- .../networking/browsers/chromium/info.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 1c0ee2a7a319..be1a0ffd43f0 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -813,7 +813,7 @@ } }, "ungoogled-chromium": { - "version": "142.0.7444.59", + "version": "142.0.7444.134", "deps": { "depot_tools": { "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5", @@ -825,16 +825,16 @@ "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=" }, "ungoogled-patches": { - "rev": "142.0.7444.59-2", - "hash": "sha256-Cjcy6ohVNt2eAD+m4ZTbeoHH9i4znkdgN0ZaysU8Whk=" + "rev": "142.0.7444.134-1", + "hash": "sha256-kwKzDTte0wPnx+tUmIaQ2EVf6HHacunmBbwLlUqYnOI=" }, "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa", - "hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=", + "rev": "b6965f826881a60c51151cfc0a0175966a0a4e81", + "hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=", "recompress": true }, "src/third_party/clang-format/script": { @@ -944,8 +944,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920", - "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo=" + "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831", + "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1069,8 +1069,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7", - "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg=" + "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17", + "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1619,8 +1619,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "bb294624702efbb17691b642333f06bf5108e600", - "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs=" + "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d", + "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs=" } } } From ebfb662490928b407ade92af1a8801fe12465c9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 21:56:04 +0000 Subject: [PATCH 1361/2279] python3Packages.django-crispy-forms: 2.4 -> 2.5 --- .../python-modules/django-crispy-forms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix index 95a359023de2..b002566bfa33 100644 --- a/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2.4"; + version = "2.5"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; tag = version; - hash = "sha256-YV7XUv5N2Xcf79/8EdI7XnVtpiX+yQBhQumSUbZmOfc="; + hash = "sha256-UZw860dOmQOAHcOPn5JO5OPe0kei4Mivy5FTh25Zo1s="; }; propagatedBuildInputs = [ From c714caf0c8704ed6d4771eff4a5a33ef34e28982 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 21:56:29 +0000 Subject: [PATCH 1362/2279] mapnik: 4.1.3 -> 4.1.4 --- pkgs/by-name/ma/mapnik/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index 1c96078be752..b6604b9a6c77 100644 --- a/pkgs/by-name/ma/mapnik/package.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapnik"; - version = "4.1.3"; + version = "4.1.4"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; tag = "v${finalAttrs.version}"; - hash = "sha256-jbtVJHTAeKGpb6PtcK9Tt4qA6dsECwLSQG9JGsHJjvY="; + hash = "sha256-WwxQNMTDaImlDqBYo4p1aNvIzAc3egza6LkXH7gEqOA="; fetchSubmodules = true; }; From 0c35d4b4a9e4bc77d631a4aac01e927ea5b13007 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 22:01:10 +0000 Subject: [PATCH 1363/2279] safety-cli: 3.6.2 -> 3.7.0 --- pkgs/development/python-modules/safety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 6a4d9e61249c..e28902e92a67 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "safety"; - version = "3.6.2"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pyupio"; repo = "safety"; tag = version; - hash = "sha256-oGz2ZHGYaHi4RusNbZ5iqxuz2JBbchP5ip+uHHV10U0="; + hash = "sha256-BPLK/V7YQBCGopfRFAWdra8ve8Ww5KN1+oZKyoEPiFc="; }; patches = [ From 28faab5f8ebe54f02bf7c8104aac6e1555732e61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 22:01:27 +0000 Subject: [PATCH 1364/2279] sesh: 2.18.2 -> 2.19.0 --- pkgs/by-name/se/sesh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix index 678189c7922f..5012c4a10705 100644 --- a/pkgs/by-name/se/sesh/package.nix +++ b/pkgs/by-name/se/sesh/package.nix @@ -7,7 +7,7 @@ }: buildGoModule rec { pname = "sesh"; - version = "2.18.2"; + version = "2.19.0"; nativeBuildInputs = [ go-mockery @@ -16,7 +16,7 @@ buildGoModule rec { owner = "joshmedeski"; repo = "sesh"; rev = "v${version}"; - hash = "sha256-ZxO6hUE1/KzcZu0G9NaCgpqy1JfPdUxlAOkqm4bpfxE="; + hash = "sha256-mteypgCgFxgoPSh0H1kwNUm3p9F3wbRjhONdSm9Qeqs="; }; preBuild = '' From b66b421a9ab053a817937dad89909adf6d982117 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 17:09:25 -0500 Subject: [PATCH 1365/2279] nodePackages.@electron-forge/cli: drop Upstream(per https://www.electronforge.io/cli#installation) suggests installing the CLI locally, instead of globally. Also per https://github.com/electron/forge/issues/2190, nixpkgs' version of the CLI has issues anyways. --- pkgs/development/node-packages/aliases.nix | 2 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 1314 ----------------- pkgs/development/node-packages/overrides.nix | 4 - 5 files changed, 2 insertions(+), 1320 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cce4f3533d86..bbc3d4e892e5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,6 +39,8 @@ mapAliases { "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 + "@electron-forge/cli" = + throw "@electron-forge/cli was removed because upstream suggests that you install it locally in your project instead."; # Added 2025-11-06 "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 "@gitbeaker/cli" = pkgs.gitbeaker-cli; # Added 2025-10-29 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d0eae0605793..afa01ba7fd63 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -2,7 +2,6 @@ { # Packages that provide multiple executables where one is clearly the `mainProgram`. "@antfu/ni" = "ni"; - "@electron-forge/cli" = "electron-forge"; "@microsoft/rush" = "rush"; "@webassemblyjs/cli-1.11.1" = "wasm2wast"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2e73cbc3b36a..368d5a30725a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -33,7 +33,6 @@ , "diff2html-cli" , "dotenv-vault" , "elasticdump" -, "@electron-forge/cli" , "elm-oracle" , "emoj" , "emojione" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6cb3a179f25d..27a095303874 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -723,197 +723,6 @@ let sha512 = "0dEVyRLM/lG4gp1R/Ik5bfPl/1wX00xFwd5KcNH602tzBa09oF7pbTKETEhR1GjZ75K6OJnYFu8II2dyMhONMw=="; }; }; - "@electron-forge/core-7.7.0" = { - name = "_at_electron-forge_slash_core"; - packageName = "@electron-forge/core"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-7.7.0.tgz"; - sha512 = "BWhg1Zw1bhpDuZowGH3lXDiL9zZBsYFNjtqyMqmkjcEm5xf9Dzs8mpRpNjtkpf3jit3LB4PNGMLj3c8ix0h4vQ=="; - }; - }; - "@electron-forge/core-utils-7.7.0" = { - name = "_at_electron-forge_slash_core-utils"; - packageName = "@electron-forge/core-utils"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.7.0.tgz"; - sha512 = "kgOkiLzqnySkcpt26rBg8AoZsI1ID3f6s/dQlzfRJisWZTKTu4ryiMcaC0F07DVjaYFnEl9SQ86IvkTcyS97mQ=="; - }; - }; - "@electron-forge/maker-base-7.7.0" = { - name = "_at_electron-forge_slash_maker-base"; - packageName = "@electron-forge/maker-base"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.7.0.tgz"; - sha512 = "9u+mmBLBAUHuH0+IGw94EGVTDD4CPKX05h5pp5/PIaijy16ss5dymK4vEp3s2XJMFlza2PsCgLLYBgDcAE2Dqg=="; - }; - }; - "@electron-forge/plugin-base-7.7.0" = { - name = "_at_electron-forge_slash_plugin-base"; - packageName = "@electron-forge/plugin-base"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.7.0.tgz"; - sha512 = "6wisQ4ZKOWey48wFF+JHzih7AuQuVma5KauwNEju2Dh2ibwDMJmPy0FWVolMSg7XUIMbGKLADGilxX6XRv8qNQ=="; - }; - }; - "@electron-forge/publisher-base-7.7.0" = { - name = "_at_electron-forge_slash_publisher-base"; - packageName = "@electron-forge/publisher-base"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.7.0.tgz"; - sha512 = "jHKvUc1peBBSl2t5d1x6M3CNyCMyNB+NnTO9LmA1dWFQ3oRDFwromIH5KjRqPJj6l4AyH0/XJogdO7Nn4Eyn6Q=="; - }; - }; - "@electron-forge/shared-types-7.7.0" = { - name = "_at_electron-forge_slash_shared-types"; - packageName = "@electron-forge/shared-types"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.7.0.tgz"; - sha512 = "1zQsmudkAuHv0HnJtSJY3pvTeuN3fnSa9BR6cbeUlcpOfrnG4OTG03FqerHfyIWaBRVy7jGgif0NhKKE9azKyg=="; - }; - }; - "@electron-forge/template-base-7.7.0" = { - name = "_at_electron-forge_slash_template-base"; - packageName = "@electron-forge/template-base"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.7.0.tgz"; - sha512 = "jwnhEHNIyQfbwJ6R8SuZIJApHKBykDr/rSgUF3km9nr2qAUSoUUV7RaJa/uiQJMtvamXenuo5K84C2NzumzS3A=="; - }; - }; - "@electron-forge/template-vite-7.7.0" = { - name = "_at_electron-forge_slash_template-vite"; - packageName = "@electron-forge/template-vite"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.7.0.tgz"; - sha512 = "6p+U6FDWrmF7XgSLkrO07OOgJcrrrArbnExSckGJdBnupxmIDf1Y+exwfHHKdxX6/FfkA6JST5nRGjgA5CFqcw=="; - }; - }; - "@electron-forge/template-vite-typescript-7.7.0" = { - name = "_at_electron-forge_slash_template-vite-typescript"; - packageName = "@electron-forge/template-vite-typescript"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.7.0.tgz"; - sha512 = "32C/+PF+hIloTdbRx7OutvqnTkkC7BHeQxNw4/zG2TfQ3cjl7JUD6A2UvTUHtv5KHkK2hDw6ZdahPwpJO41YSA=="; - }; - }; - "@electron-forge/template-webpack-7.7.0" = { - name = "_at_electron-forge_slash_template-webpack"; - packageName = "@electron-forge/template-webpack"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.7.0.tgz"; - sha512 = "7Hb1wejKqtvPXqhelubUNAh39FtClB/4JDtWzyAsL2iC3XeB5qh6pITz8+nW/rF2qW/JAepc/lnreqKn34P2ig=="; - }; - }; - "@electron-forge/template-webpack-typescript-7.7.0" = { - name = "_at_electron-forge_slash_template-webpack-typescript"; - packageName = "@electron-forge/template-webpack-typescript"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.7.0.tgz"; - sha512 = "w1vRAjGy0MjjdEDYPpZcpkMo2e3z5uEwfJdwVOpBeha7p2WM/Y6go21K+7pSqGp8Xmq4zlE20hq5MEx8Bs8eZg=="; - }; - }; - "@electron-forge/tracer-7.7.0" = { - name = "_at_electron-forge_slash_tracer"; - packageName = "@electron-forge/tracer"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.7.0.tgz"; - sha512 = "R/JiGFzWhwfVyc6ioT4l5FFChRLS4Z2tWPeQfPcyoemdpzKpI1rvMHti42gzWXFW8GdzkhG0G3ZWfKiF3y3x/Q=="; - }; - }; - "@electron/asar-3.3.1" = { - name = "_at_electron_slash_asar"; - packageName = "@electron/asar"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.3.1.tgz"; - sha512 = "WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg=="; - }; - }; - "@electron/get-3.1.0" = { - name = "_at_electron_slash_get"; - packageName = "@electron/get"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz"; - sha512 = "F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ=="; - }; - }; - "@electron/node-gyp-git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" = - { - name = "_at_electron_slash_node-gyp"; - packageName = "@electron/node-gyp"; - version = "10.2.0-electron.1"; - src = fetchgit { - url = "https://github.com/electron/node-gyp.git"; - rev = "06b29aafb7708acef8b3669835c8a7857ebc92d2"; - sha256 = "033b279dda9d8576174438fafb804f2b27173433a5fe0359232330ffe5a3b155"; - }; - }; - "@electron/notarize-2.5.0" = { - name = "_at_electron_slash_notarize"; - packageName = "@electron/notarize"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz"; - sha512 = "jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A=="; - }; - }; - "@electron/osx-sign-1.3.3" = { - name = "_at_electron_slash_osx-sign"; - packageName = "@electron/osx-sign"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.3.tgz"; - sha512 = "KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg=="; - }; - }; - "@electron/packager-18.3.6" = { - name = "_at_electron_slash_packager"; - packageName = "@electron/packager"; - version = "18.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.6.tgz"; - sha512 = "1eXHB5t+SQKvUiDpWGpvr90ZSSbXj+isrh3YbjCTjKT4bE4SQrKSBfukEAaBvp67+GXHFtCHjQgN9qSTFIge+Q=="; - }; - }; - "@electron/rebuild-3.7.1" = { - name = "_at_electron_slash_rebuild"; - packageName = "@electron/rebuild"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.1.tgz"; - sha512 = "sKGD+xav4Gh25+LcLY0rjIwcCFTw+f/HU1pB48UVbwxXXRGaXEqIH0AaYKN46dgd/7+6kuiDXzoyAEvx1zCsdw=="; - }; - }; - "@electron/universal-2.0.2" = { - name = "_at_electron_slash_universal"; - packageName = "@electron/universal"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz"; - sha512 = "mqY1szx5/d5YLvfCDWWoJdkSIjIz+NdWN4pN0r78lYiE7De+slLpuF3lVxIT+hlJnwk5sH2wFRMl6/oUgUVO3A=="; - }; - }; - "@electron/windows-sign-1.2.1" = { - name = "_at_electron_slash_windows-sign"; - packageName = "@electron/windows-sign"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.1.tgz"; - sha512 = "YfASnrhJ+ve6Q43ZiDwmpBgYgi2u0bYjeAVi2tDfN7YWAKO8X9EEOuPGtqbJpPLM6TfAHimghICjWe2eaJ8BAg=="; - }; - }; "@eslint-community/eslint-utils-4.5.1" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -1058,15 +867,6 @@ let sha512 = "vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA=="; }; }; - "@gar/promisify-1.1.3" = { - name = "_at_gar_slash_promisify"; - packageName = "@gar/promisify"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; - sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; - }; - }; "@gerrit0/mini-shiki-1.27.2" = { name = "_at_gerrit0_slash_mini-shiki"; packageName = "@gerrit0/mini-shiki"; @@ -1877,15 +1677,6 @@ let sha512 = "0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q=="; }; }; - "@malept/cross-spawn-promise-2.0.0" = { - name = "_at_malept_slash_cross-spawn-promise"; - packageName = "@malept/cross-spawn-promise"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; - sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; - }; - }; "@mapbox/node-pre-gyp-1.0.11" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -1976,15 +1767,6 @@ let sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g=="; }; }; - "@npmcli/fs-2.1.2" = { - name = "_at_npmcli_slash_fs"; - packageName = "@npmcli/fs"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz"; - sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; - }; - }; "@npmcli/fs-4.0.0" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -2021,15 +1803,6 @@ let sha512 = "tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA=="; }; }; - "@npmcli/move-file-2.0.1" = { - name = "_at_npmcli_slash_move-file"; - packageName = "@npmcli/move-file"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz"; - sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; - }; - }; "@npmcli/name-from-folder-2.0.0" = { name = "_at_npmcli_slash_name-from-folder"; packageName = "@npmcli/name-from-folder"; @@ -2966,15 +2739,6 @@ let sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; }; - "@sindresorhus/is-4.6.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"; - sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; - }; - }; "@sindresorhus/is-5.6.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -3236,15 +3000,6 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@szmarczak/http-timer-4.0.6" = { - name = "_at_szmarczak_slash_http-timer"; - packageName = "@szmarczak/http-timer"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; - sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; - }; - }; "@szmarczak/http-timer-5.0.1" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -3398,15 +3153,6 @@ let sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; }; }; - "@types/cacheable-request-6.0.3" = { - name = "_at_types_slash_cacheable-request"; - packageName = "@types/cacheable-request"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; - sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; - }; - }; "@types/cli-progress-3.11.6" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; @@ -3587,15 +3333,6 @@ let sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="; }; }; - "@types/keyv-3.1.4" = { - name = "_at_types_slash_keyv"; - packageName = "@types/keyv"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz"; - sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; - }; - }; "@types/linkify-it-5.0.0" = { name = "_at_types_slash_linkify-it"; packageName = "@types/linkify-it"; @@ -3812,15 +3549,6 @@ let sha512 = "JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g=="; }; }; - "@types/responselike-1.0.3" = { - name = "_at_types_slash_responselike"; - packageName = "@types/responselike"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz"; - sha512 = "H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw=="; - }; - }; "@types/semver-7.5.8" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -4748,15 +4476,6 @@ let sha512 = "jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw=="; }; }; - "agentkeepalive-4.6.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz"; - sha512 = "kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="; - }; - }; "aggregate-error-3.1.0" = { name = "aggregate-error"; packageName = "aggregate-error"; @@ -5846,15 +5565,6 @@ let sha512 = "kU6FmrwZ3Lx7/7y3hPS5QnbJfaohcIul5fGqf7ok+4KklIEk9tJ0C2IQPdacSbVUWv6zVHXEBWoWd6NrVMT7Cw=="; }; }; - "author-regex-1.0.0" = { - name = "author-regex"; - packageName = "author-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz"; - sha512 = "KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g=="; - }; - }; "auto-bind-4.0.0" = { name = "auto-bind"; packageName = "auto-bind"; @@ -7016,15 +6726,6 @@ let sha512 = "b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="; }; }; - "cacache-16.1.3" = { - name = "cacache"; - packageName = "cacache"; - version = "16.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz"; - sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; - }; - }; "cacache-19.0.1" = { name = "cacache"; packageName = "cacache"; @@ -7043,15 +6744,6 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; - "cacheable-lookup-5.0.4" = { - name = "cacheable-lookup"; - packageName = "cacheable-lookup"; - version = "5.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; - sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; - }; - }; "cacheable-lookup-7.0.0" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -7079,15 +6771,6 @@ let sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; - "cacheable-request-7.0.4" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz"; - sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; - }; - }; "cached-path-relative-1.1.0" = { name = "cached-path-relative"; packageName = "cached-path-relative"; @@ -7628,15 +7311,6 @@ let sha512 = "Jzy2EnzmE+ligqIZUsmWnck9RBXLuUy6CaKyuNMtowFG3ZvLt8d+WBJCTPEludV0DHpIKjAOlwjFmTaEdfdWCw=="; }; }; - "chrome-trace-event-1.0.4" = { - name = "chrome-trace-event"; - packageName = "chrome-trace-event"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz"; - sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; - }; - }; "chromium-bidi-0.6.3" = { name = "chromium-bidi"; packageName = "chromium-bidi"; @@ -7862,15 +7536,6 @@ let sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; }; - "cli-truncate-3.1.0" = { - name = "cli-truncate"; - packageName = "cli-truncate"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz"; - sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; - }; - }; "cli-truncate-4.0.0" = { name = "cli-truncate"; packageName = "cli-truncate"; @@ -8393,15 +8058,6 @@ let sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; - "commander-9.5.0" = { - name = "commander"; - packageName = "commander"; - version = "9.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; - sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; - }; - }; "comment-json-4.2.5" = { name = "comment-json"; packageName = "comment-json"; @@ -8447,15 +8103,6 @@ let sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; }; }; - "compare-version-0.1.2" = { - name = "compare-version"; - packageName = "compare-version"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz"; - sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; - }; - }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -9213,15 +8860,6 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "cross-dirname-0.1.0" = { - name = "cross-dirname"; - packageName = "cross-dirname"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz"; - sha512 = "+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q=="; - }; - }; "cross-fetch-3.1.8" = { name = "cross-fetch"; packageName = "cross-fetch"; @@ -10419,15 +10057,6 @@ let sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; - "dir-compare-4.2.0" = { - name = "dir-compare"; - packageName = "dir-compare"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz"; - sha512 = "2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ=="; - }; - }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -12660,15 +12289,6 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; - "filenamify-4.3.0" = { - name = "filenamify"; - packageName = "filenamify"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz"; - sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -12741,15 +12361,6 @@ let sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="; }; }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; - }; - }; "find-up-3.0.0" = { name = "find-up"; packageName = "find-up"; @@ -12930,15 +12541,6 @@ let sha512 = "pzNZh42/A2HmcRIpddSP0T+zBofd119o5rNB2u1YHv36CM2C/ietI2ZsjWZ2LSL7J0BNVkFn1a9Ad+cmO2lDQg=="; }; }; - "flora-colossus-2.0.0" = { - name = "flora-colossus"; - packageName = "flora-colossus"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flora-colossus/-/flora-colossus-2.0.0.tgz"; - sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; - }; - }; "fluent-ffmpeg-2.1.3" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -13317,15 +12919,6 @@ let sha512 = "Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q=="; }; }; - "galactus-1.0.0" = { - name = "galactus"; - packageName = "galactus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/galactus/-/galactus-1.0.0.tgz"; - sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ=="; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -13461,15 +13054,6 @@ let sha512 = "9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="; }; }; - "get-package-info-1.0.0" = { - name = "get-package-info"; - packageName = "get-package-info"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz"; - sha512 = "SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw=="; - }; - }; "get-package-type-0.1.0" = { name = "get-package-type"; packageName = "get-package-type"; @@ -14028,15 +13612,6 @@ let sha512 = "ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="; }; }; - "got-11.8.6" = { - name = "got"; - packageName = "got"; - version = "11.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.8.6.tgz"; - sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; - }; - }; "got-12.6.1" = { name = "got"; packageName = "got"; @@ -14838,15 +14413,6 @@ let sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; }; }; - "http-proxy-agent-5.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - }; "http-proxy-agent-7.0.2" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; @@ -14901,15 +14467,6 @@ let sha512 = "EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA=="; }; }; - "http2-wrapper-1.0.3" = { - name = "http2-wrapper"; - packageName = "http2-wrapper"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; - sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; - }; - }; "http2-wrapper-2.2.1" = { name = "http2-wrapper"; packageName = "http2-wrapper"; @@ -15000,15 +14557,6 @@ let sha512 = "/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA=="; }; }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; - }; - }; "hyperlinker-1.0.0" = { name = "hyperlinker"; packageName = "hyperlinker"; @@ -15306,15 +14854,6 @@ let sha512 = "i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="; }; }; - "infer-owner-1.0.4" = { - name = "infer-owner"; - packageName = "infer-owner"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -16206,15 +15745,6 @@ let sha512 = "qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ=="; }; }; - "is-lambda-1.0.1" = { - name = "is-lambda"; - packageName = "is-lambda"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; - sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; - }; - }; "is-map-2.0.3" = { name = "is-map"; packageName = "is-map"; @@ -16827,15 +16357,6 @@ let sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; }; }; - "isbinaryfile-4.0.10" = { - name = "isbinaryfile"; - packageName = "isbinaryfile"; - version = "4.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; - sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -17520,15 +17041,6 @@ let sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw=="; }; }; - "junk-3.1.0" = { - name = "junk"; - packageName = "junk"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz"; - sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; - }; - }; "junk-4.0.1" = { name = "junk"; packageName = "junk"; @@ -17997,15 +17509,6 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "listr2-7.0.2" = { - name = "listr2"; - packageName = "listr2"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-7.0.2.tgz"; - sha512 = "rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g=="; - }; - }; "listr2-8.2.5" = { name = "listr2"; packageName = "listr2"; @@ -18033,15 +17536,6 @@ let sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A=="; }; }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha512 = "3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ=="; - }; - }; "load-json-file-6.2.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -18096,15 +17590,6 @@ let sha512 = "SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA=="; }; }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; - }; - }; "locate-path-3.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -18366,15 +17851,6 @@ let sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; }; }; - "lodash.get-4.4.2" = { - name = "lodash.get"; - packageName = "lodash.get"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; - }; - }; "lodash.groupby-4.6.0" = { name = "lodash.groupby"; packageName = "lodash.groupby"; @@ -19105,15 +18581,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-fetch-happen-10.2.1" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "10.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; - sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; - }; - }; "make-fetch-happen-14.0.3" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -19636,15 +19103,6 @@ let sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g=="; }; }; - "mem-4.3.0" = { - name = "mem"; - packageName = "mem"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; - sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; - }; - }; "mem-8.1.1" = { name = "mem"; packageName = "mem"; @@ -20635,15 +20093,6 @@ let sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="; }; }; - "minipass-collect-1.0.2" = { - name = "minipass-collect"; - packageName = "minipass-collect"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; - }; - }; "minipass-collect-2.0.1" = { name = "minipass-collect"; packageName = "minipass-collect"; @@ -20653,15 +20102,6 @@ let sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw=="; }; }; - "minipass-fetch-2.1.2" = { - name = "minipass-fetch"; - packageName = "minipass-fetch"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; - sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; - }; - }; "minipass-fetch-4.0.1" = { name = "minipass-fetch"; packageName = "minipass-fetch"; @@ -21374,15 +20814,6 @@ let sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; }; - "node-api-version-0.2.0" = { - name = "node-api-version"; - packageName = "node-api-version"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz"; - sha512 = "fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg=="; - }; - }; "node-color-readline-1.0.1" = { name = "node-color-readline"; packageName = "node-color-readline"; @@ -21563,15 +20994,6 @@ let sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; - "nopt-6.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"; - sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; - }; - }; "nopt-7.2.1" = { name = "nopt"; packageName = "nopt"; @@ -21662,15 +21084,6 @@ let sha512 = "K1c7+vaAP+Yh5bOGmA10PGPpp+6h7WZrl7GwqKhUflBc9flU9pzG27DDeB9+iuhZkE3BJZOcgN1P/2sS5pqrWw=="; }; }; - "normalize-url-6.1.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - }; "normalize-url-8.0.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -22535,15 +21948,6 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; - "p-cancelable-2.1.1" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"; - sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; - }; - }; "p-cancelable-3.0.0" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -22589,24 +21993,6 @@ let sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; }; - "p-is-promise-2.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; - }; - }; - "p-limit-1.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -22634,15 +22020,6 @@ let sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="; }; }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; - }; - }; "p-locate-3.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -22688,15 +22065,6 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; - "p-map-4.0.0" = { - name = "p-map"; - packageName = "p-map"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; - sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; - }; - }; "p-map-5.5.0" = { name = "p-map"; packageName = "p-map"; @@ -22769,15 +22137,6 @@ let sha512 = "MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg=="; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; - }; - }; "p-try-2.2.0" = { name = "p-try"; packageName = "p-try"; @@ -22895,15 +22254,6 @@ let sha512 = "CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg=="; }; }; - "parse-author-2.0.0" = { - name = "parse-author"; - packageName = "parse-author"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz"; - sha512 = "yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw=="; - }; - }; "parse-bmfont-ascii-1.0.6" = { name = "parse-bmfont-ascii"; packageName = "parse-bmfont-ascii"; @@ -23426,15 +22776,6 @@ let sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg=="; }; }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha512 = "dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ=="; - }; - }; "path-type-4.0.0" = { name = "path-type"; packageName = "path-type"; @@ -23471,15 +22812,6 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "pe-library-1.0.1" = { - name = "pe-library"; - packageName = "pe-library"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pe-library/-/pe-library-1.0.1.tgz"; - sha512 = "nh39Mo1eGWmZS7y+mK/dQIqg7S1lp38DpRxkyoHf0ZcUs/HDc+yyTjuOtTvSMZHmfSLuSQaX945u05Y2Q6UWZg=="; - }; - }; "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -23867,15 +23199,6 @@ let sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; }; }; - "postject-1.0.0-alpha.6" = { - name = "postject"; - packageName = "postject"; - version = "1.0.0-alpha.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz"; - sha512 = "b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A=="; - }; - }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -24002,15 +23325,6 @@ let sha512 = "XHV6WP6xUvy42gUxdNyPQKCC9j36VzpVQ8Ztoffq0D6+PugiNsZ0FqBladXXPFQWthDDCA9OvGIsjEigMtznOQ=="; }; }; - "proc-log-2.0.1" = { - name = "proc-log"; - packageName = "proc-log"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz"; - sha512 = "Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw=="; - }; - }; "proc-log-3.0.0" = { name = "proc-log"; packageName = "proc-log"; @@ -24101,15 +23415,6 @@ let sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg=="; }; }; - "promise-inflight-1.0.1" = { - name = "promise-inflight"; - packageName = "promise-inflight"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; - }; - }; "promise-retry-2.0.1" = { name = "promise-retry"; packageName = "promise-retry"; @@ -24695,15 +24000,6 @@ let sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ=="; }; }; - "read-binary-file-arch-1.0.6" = { - name = "read-binary-file-arch"; - packageName = "read-binary-file-arch"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz"; - sha512 = "BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg=="; - }; - }; "read-cache-1.0.0" = { name = "read-cache"; packageName = "read-cache"; @@ -24767,15 +24063,6 @@ let sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ=="; }; }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha512 = "eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA=="; - }; - }; "read-pkg-5.2.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -24821,15 +24108,6 @@ let sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A=="; }; }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha512 = "1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w=="; - }; - }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -25937,15 +25215,6 @@ let sha512 = "JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw=="; }; }; - "resedit-2.0.3" = { - name = "resedit"; - packageName = "resedit"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/resedit/-/resedit-2.0.3.tgz"; - sha512 = "oTeemxwoMuxxTYxXUwjkrOPfngTQehlv0/HoYFNkB4uzsP1Un1A9nI8JQKGOFkxpqkC7qkMs0lUsGrvUlbLNUA=="; - }; - }; "reserved-words-0.1.2" = { name = "reserved-words"; packageName = "reserved-words"; @@ -26063,15 +25332,6 @@ let sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; }; - "responselike-2.0.1" = { - name = "responselike"; - packageName = "responselike"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz"; - sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; - }; - }; "responselike-3.0.0" = { name = "responselike"; packageName = "responselike"; @@ -27530,15 +26790,6 @@ let sha512 = "D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ=="; }; }; - "socks-proxy-agent-7.0.0" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; - sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; - }; - }; "socks-proxy-agent-8.0.5" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -27647,15 +26898,6 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.21" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.21"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - }; "source-map-url-0.4.1" = { name = "source-map-url"; packageName = "source-map-url"; @@ -27944,15 +27186,6 @@ let sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; }; }; - "ssri-9.0.1" = { - name = "ssri"; - packageName = "ssri"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz"; - sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q=="; - }; - }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -28601,24 +27834,6 @@ let sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg=="; }; }; - "sudo-prompt-9.2.1" = { - name = "sudo-prompt"; - packageName = "sudo-prompt"; - version = "9.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz"; - sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="; - }; - }; - "sumchecker-3.0.1" = { - name = "sumchecker"; - packageName = "sumchecker"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz"; - sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; - }; - }; "superagent-7.1.6" = { name = "superagent"; packageName = "superagent"; @@ -30140,15 +29355,6 @@ let sha512 = "Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA=="; }; }; - "unique-filename-2.0.1" = { - name = "unique-filename"; - packageName = "unique-filename"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz"; - sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; - }; - }; "unique-filename-4.0.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -30158,15 +29364,6 @@ let sha512 = "XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ=="; }; }; - "unique-slug-3.0.0" = { - name = "unique-slug"; - packageName = "unique-slug"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz"; - sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; - }; - }; "unique-slug-5.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -30743,15 +29940,6 @@ let sha512 = "KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ=="; }; }; - "username-5.1.0" = { - name = "username"; - packageName = "username"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/username/-/username-5.1.0.tgz"; - sha512 = "PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg=="; - }; - }; "utf-8-validate-5.0.10" = { name = "utf-8-validate"; packageName = "utf-8-validate"; @@ -37590,508 +36778,6 @@ in bypassCache = true; reconstructLock = true; }; - "@electron-forge/cli" = nodeEnv.buildNodePackage { - name = "_at_electron-forge_slash_cli"; - packageName = "@electron-forge/cli"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.7.0.tgz"; - sha512 = "QfnjghmlHMb7dyArR5cbPA+MP9ff/ulWZi6R/a5MkHlKyhrysRfjzDtZDsmkEv9mGQgRwylssgXrZrKHGlxFkw=="; - }; - dependencies = [ - sources."@electron-forge/core-7.7.0" - sources."@electron-forge/core-utils-7.7.0" - sources."@electron-forge/maker-base-7.7.0" - sources."@electron-forge/plugin-base-7.7.0" - sources."@electron-forge/publisher-base-7.7.0" - sources."@electron-forge/shared-types-7.7.0" - sources."@electron-forge/template-base-7.7.0" - sources."@electron-forge/template-vite-7.7.0" - sources."@electron-forge/template-vite-typescript-7.7.0" - sources."@electron-forge/template-webpack-7.7.0" - sources."@electron-forge/template-webpack-typescript-7.7.0" - sources."@electron-forge/tracer-7.7.0" - ( - sources."@electron/asar-3.3.1" - // { - dependencies = [ - sources."commander-5.1.0" - ]; - } - ) - ( - sources."@electron/get-3.1.0" - // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."semver-6.3.1" - sources."universalify-0.1.2" - ]; - } - ) - ( - sources."@electron/node-gyp-git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" - // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - ]; - } - ) - ( - sources."@electron/notarize-2.5.0" - // { - dependencies = [ - sources."fs-extra-9.1.0" - ]; - } - ) - sources."@electron/osx-sign-1.3.3" - ( - sources."@electron/packager-18.3.6" - // { - dependencies = [ - sources."fs-extra-11.3.0" - ]; - } - ) - sources."@electron/rebuild-3.7.1" - ( - sources."@electron/universal-2.0.2" - // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."fs-extra-11.3.0" - sources."minimatch-9.0.5" - ]; - } - ) - ( - sources."@electron/windows-sign-1.2.1" - // { - dependencies = [ - sources."fs-extra-11.3.0" - ]; - } - ) - sources."@gar/promisify-1.1.3" - sources."@malept/cross-spawn-promise-2.0.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-2.1.2" - sources."@npmcli/move-file-2.0.1" - sources."@sindresorhus/is-4.6.0" - sources."@szmarczak/http-timer-4.0.6" - sources."@tootallnate/once-2.0.0" - sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.4" - sources."@types/keyv-3.1.4" - sources."@types/node-22.13.10" - sources."@types/responselike-1.0.3" - sources."@types/yauzl-2.10.3" - sources."@xmldom/xmldom-0.8.10" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.6.0" - sources."aggregate-error-3.1.0" - sources."ansi-escapes-5.0.0" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."at-least-node-1.0.0" - sources."author-regex-1.0.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-4.1.0" - sources."bluebird-3.7.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."buffer-5.7.1" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.2" - ( - sources."cacache-16.1.3" - // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - ]; - } - ) - sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.4" - sources."chalk-4.1.2" - sources."chownr-2.0.0" - sources."chrome-trace-event-1.0.4" - sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.2" - ( - sources."cli-truncate-3.1.0" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - } - ) - sources."cliui-8.0.1" - sources."clone-1.0.4" - sources."clone-response-1.0.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colorette-2.0.20" - sources."commander-11.1.0" - sources."compare-version-0.1.2" - sources."concat-map-0.0.1" - sources."cross-dirname-0.1.0" - sources."cross-spawn-7.0.6" - ( - sources."debug-4.4.0" - // { - dependencies = [ - sources."ms-2.1.3" - ]; - } - ) - ( - sources."decompress-response-6.0.0" - // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - } - ) - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."detect-libc-2.0.3" - sources."dir-compare-4.2.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-ex-1.3.2" - sources."escalade-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."eventemitter3-5.0.1" - ( - sources."execa-1.0.0" - // { - dependencies = [ - sources."cross-spawn-6.0.6" - sources."get-stream-4.1.0" - sources."path-key-2.0.1" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - } - ) - sources."exponential-backoff-3.1.2" - sources."extract-zip-2.0.1" - sources."fast-glob-3.3.3" - sources."fastq-1.19.1" - sources."fd-slicer-1.1.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-4.3.0" - sources."fill-range-7.1.1" - ( - sources."find-up-5.0.0" - // { - dependencies = [ - sources."locate-path-6.0.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - ]; - } - ) - sources."flora-colossus-2.0.0" - sources."fs-extra-10.1.0" - sources."fs-minipass-2.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."galactus-1.0.0" - sources."get-caller-file-2.0.5" - ( - sources."get-package-info-1.0.0" - // { - dependencies = [ - sources."debug-2.6.9" - ]; - } - ) - sources."get-stream-5.2.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."global-dirs-3.0.1" - sources."got-11.8.6" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."http2-wrapper-1.0.3" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."interpret-3.1.1" - sources."ip-address-9.0.5" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.16.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-stream-1.1.0" - sources."is-unicode-supported-0.1.0" - sources."isbinaryfile-4.0.10" - sources."isexe-2.0.0" - sources."jsbn-1.1.0" - sources."json-buffer-3.0.1" - sources."jsonfile-6.1.0" - sources."junk-3.1.0" - sources."keyv-4.5.4" - ( - sources."listr2-7.0.2" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - } - ) - sources."load-json-file-2.0.0" - sources."locate-path-2.0.0" - sources."lodash-4.17.21" - sources."lodash.get-4.4.2" - sources."log-symbols-4.1.0" - ( - sources."log-update-5.0.1" - // { - dependencies = [ - sources."ansi-regex-6.1.0" - sources."ansi-styles-6.2.1" - sources."cli-cursor-4.0.0" - sources."emoji-regex-9.2.2" - sources."restore-cursor-4.0.0" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - } - ) - sources."lowercase-keys-2.0.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-10.2.1" - sources."map-age-cleaner-0.1.3" - sources."mem-4.3.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."minipass-3.3.6" - sources."minipass-collect-1.0.2" - sources."minipass-fetch-2.1.2" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minipass-sized-1.0.3" - sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" - sources."ms-2.0.0" - sources."negotiator-0.6.4" - sources."nice-try-1.0.5" - sources."node-abi-3.74.0" - sources."node-api-version-0.2.0" - sources."node-fetch-2.7.0" - sources."nopt-6.0.0" - ( - sources."normalize-package-data-2.5.0" - // { - dependencies = [ - sources."semver-5.7.2" - ]; - } - ) - sources."normalize-url-6.1.0" - ( - sources."npm-run-path-2.0.2" - // { - dependencies = [ - sources."path-key-2.0.1" - ]; - } - ) - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."p-cancelable-2.1.1" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-3.1.0" - ( - sources."p-locate-2.0.0" - // { - dependencies = [ - sources."p-limit-1.3.0" - ]; - } - ) - sources."p-map-4.0.0" - sources."p-try-1.0.0" - sources."parse-author-2.0.0" - sources."parse-json-2.2.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-2.0.0" - sources."pe-library-1.0.1" - sources."pend-1.2.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."plist-3.1.0" - ( - sources."postject-1.0.0-alpha.6" - // { - dependencies = [ - sources."commander-9.5.0" - ]; - } - ) - sources."proc-log-2.0.1" - sources."progress-2.0.3" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."pump-3.0.2" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - sources."read-binary-file-arch-1.0.6" - sources."read-pkg-2.0.0" - ( - sources."read-pkg-up-2.0.0" - // { - dependencies = [ - sources."find-up-2.1.0" - ]; - } - ) - sources."readable-stream-3.6.2" - sources."rechoir-0.8.0" - sources."require-directory-2.1.1" - sources."resedit-2.0.3" - sources."resolve-1.22.10" - sources."resolve-alpn-1.2.1" - sources."responselike-2.0.1" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.1.0" - sources."rfdc-1.4.1" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.7.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - ( - sources."slice-ansi-5.0.0" - // { - dependencies = [ - sources."ansi-styles-6.2.1" - sources."is-fullwidth-code-point-4.0.0" - ]; - } - ) - sources."smart-buffer-4.2.0" - sources."socks-2.8.4" - sources."socks-proxy-agent-7.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."sprintf-js-1.1.3" - sources."ssri-9.0.1" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" - sources."strip-outer-1.0.1" - sources."sudo-prompt-9.2.1" - sources."sumchecker-3.0.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - ( - sources."tar-6.2.1" - // { - dependencies = [ - sources."minipass-5.0.0" - ]; - } - ) - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."trim-repeated-1.0.0" - sources."type-fest-1.4.0" - sources."undici-types-6.20.0" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - sources."universalify-2.0.1" - sources."username-5.1.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xmlbuilder-15.1.1" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A complete tool for building modern Electron applications"; - homepage = "https://github.com/electron/forge#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; elm-oracle = nodeEnv.buildNodePackage { name = "elm-oracle"; packageName = "elm-oracle"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 0d6ae3a46b2d..501cf9c62b88 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -33,10 +33,6 @@ final: prev: { ''; }; - "@electron-forge/cli" = prev."@electron-forge/cli".override { - buildInputs = [ final.node-gyp-build ]; - }; - fast-cli = prev.fast-cli.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; prePatch = '' From 204d88bd0426ced49d567c9e7f0b04d1170343bb Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Thu, 6 Nov 2025 22:11:50 +0000 Subject: [PATCH 1366/2279] surfer: 0.3.0 -> 0.4.0 --- pkgs/by-name/su/surfer/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index 67e0a382bd4c..dc598907aa79 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -15,15 +15,15 @@ makeWrapper, zenity, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "surfer"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitLab { owner = "surfer-project"; repo = "surfer"; - rev = "v${version}"; - hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-rNJIe6FlAQI2B3lsRYHKMIGgJ1Q5EFX7kWgml+sXxtc="; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { libXi ]; - cargoHash = "sha256-89pkHS0YQ77PmQfT8epdu2tPRNAenYGgtoiJVuuVYiI="; + cargoHash = "sha256-Q4SyuBNR7FnBe3h1rUo48Sxk2COdQbECiXXrGpwXhPk="; # Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318 doCheck = false; @@ -61,10 +61,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "Extensible and Snappy Waveform Viewer"; homepage = "https://surfer-project.org/"; - changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}"; + changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${finalAttrs.version}"; license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ hakan-demirli ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "surfer"; }; -} +}) From 01b3a7438bcb91345ded02afbada764abe1e4bcf Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 17:12:35 -0500 Subject: [PATCH 1367/2279] emojione: drop Archived now at https://github.com/13rac1/emojione-color-font, so drop it. --- pkgs/by-name/em/emojione/package.nix | 66 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 pkgs/by-name/em/emojione/package.nix diff --git a/pkgs/by-name/em/emojione/package.nix b/pkgs/by-name/em/emojione/package.nix deleted file mode 100644 index 124561583440..000000000000 --- a/pkgs/by-name/em/emojione/package.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - inkscape, - imagemagick, - potrace, - svgo, - scfbuild, -}: - -stdenv.mkDerivation rec { - pname = "emojione"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "eosrei"; - repo = "emojione-color-font"; - rev = "v${version}"; - sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3"; - }; - - patches = [ - # Fix build with Inkscape 1.0 - # https://github.com/eosrei/twemoji-color-font/pull/82 - (fetchpatch { - url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch"; - sha256 = "7tDWIkpcdir1V6skgXSM3r0FwHy0F6PyJ07OPRsSStA="; - postFetch = '' - substituteInPlace $out \ - --replace "inkscape --without-gui" "inkscape --export-png" \ - --replace TWEMOJI EMOJIONE \ - --replace "the assets" "the emojione assets" \ - --replace twemoji emojione - ''; - }) - ]; - - preBuild = '' - sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile - # Shut up inkscape's warnings - export HOME="$NIX_BUILD_ROOT" - ''; - - nativeBuildInputs = [ - inkscape - imagemagick - potrace - svgo - scfbuild - ]; - - enableParallelBuilding = true; - - installPhase = '' - install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf - ''; - - meta = with lib; { - description = "Open source emoji set"; - homepage = "http://emojione.com/"; - license = licenses.cc-by-40; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9feda21cbcd8..29c0472e26a9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -527,6 +527,7 @@ mapAliases { emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27 emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27 embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 + emojione = throw "emojione has beem removed, as it has been archived upstream."; # Added 2025-11-06 EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27 emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 From bb0a05aa740c0a75b6a0cb836fc00eeb026c190e Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 17:10:56 -0500 Subject: [PATCH 1368/2279] nodePackages.emojione: drop Archived per https://github.com/joypixels/emojione --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../development/node-packages/node-packages.nix | 17 ----------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cce4f3533d86..9ca1d2dc356f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -134,6 +134,7 @@ mapAliases { eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; inherit (pkgs.elmPackages) elm-review; + emojione = throw "emojione was archived and abandoned upstream, so it has been removed"; # Added 2025-11-06 escape-string-regexp = throw "escape-string-regexp was removed because it provides no executable"; # added 2025-03-12 inherit (pkgs) eslint; # Added 2024-08-28 inherit (pkgs) eslint_d; # Added 2023-05-26 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2e73cbc3b36a..0354d7004ed7 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -36,7 +36,6 @@ , "@electron-forge/cli" , "elm-oracle" , "emoj" -, "emojione" , "esy" , "fast-cli" , "fauna-shell" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6cb3a179f25d..48f1c22554d7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -38272,23 +38272,6 @@ in bypassCache = true; reconstructLock = true; }; - emojione = nodeEnv.buildNodePackage { - name = "emojione"; - packageName = "emojione"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-4.5.0.tgz"; - sha512 = "Tq55Y3UgPOnayFDN+Qd6QMP0rpoH10a1nhSFN27s8gXW3qymgFIHiXys2ECYYAI134BafmI3qP9ni2rZOe9BjA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images"; - homepage = "https://www.emojione.com"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; From e2e6826bed8705c78fe96370a0b4bb978451a10a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 22:16:49 +0000 Subject: [PATCH 1369/2279] gswatcher: 1.7.2 -> 1.7.3 --- pkgs/by-name/gs/gswatcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix index 02a5c17a29d0..0ca2d810bed9 100644 --- a/pkgs/by-name/gs/gswatcher/package.nix +++ b/pkgs/by-name/gs/gswatcher/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gswatcher"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "lxndr"; repo = "gswatcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-qohd18bXr7gDSW51tCyslFX54Caux+YrsuJtoLs9Ofk="; + hash = "sha256-0iJTJkG+EhiOYZQiWBsT0TY/NC7fLny2dXbmYYWnuic="; }; nativeBuildInputs = [ From 38b0a1b2e6d7e08b75d0a892f9aa1cebca6a62e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 22:22:02 +0000 Subject: [PATCH 1370/2279] google-chrome: 142.0.7444.59 -> 142.0.7444.134 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index c298509da46c..7a2c9857463e 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "142.0.7444.59"; + version = "142.0.7444.134"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-j7WXeRIyuqwvwWGtds4g20kKM+wWkj0R7O/nw6kdsPo="; + hash = "sha256-exTjuvwv/W2nemvBHyliD74At7i6ZcKypT9xaVPzcAE="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -272,11 +272,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "142.0.7444.60"; + version = "142.0.7444.135"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/pgkesp3xybyklm4wlxch42zlny_142.0.7444.60/GoogleChrome-142.0.7444.60.dmg"; - hash = "sha256-OhtURSA1rH6j7Bxp0Mg3kGREd44lwVbqH2gEnG8wrFg="; + url = "http://dl.google.com/release2/chrome/e7ds3jjlib5cryamafm2t5wjce_142.0.7444.135/GoogleChrome-142.0.7444.135.dmg"; + hash = "sha256-kU6DBUW/O/RzbQUNQiKfuu3+h4ys22mg5nF0oKBPNy8="; }; dontPatch = true; From 65f1282e80df2d96932538bdcc5489ce950c40cb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Nov 2025 13:59:53 +0000 Subject: [PATCH 1371/2279] docker-language-server: cleanup --- .../do/docker-language-server/package.nix | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix index 6c88af2649f5..c0d8db509963 100644 --- a/pkgs/by-name/do/docker-language-server/package.nix +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -4,16 +4,17 @@ buildGoModule, docker, gotestsum, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "docker-language-server"; version = "0.20.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker-language-server"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-OSAySCTK2temrVxmkRnrl5YWVbmkp8DRlXFVxTzEW3Q="; }; @@ -30,23 +31,35 @@ buildGoModule rec { # disable some tests because of sandbox excludedPackages="e2e-tests|/buildkit$|/scout$" packages=$(go list ./... | grep -vE "$excludedPackages") - gotestsum -- $packages -timeout 30s -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint" - go test ./e2e-tests/... -timeout 120s -skip "TestPublishDiagnostics|TestHover" + + gotestsum -- $packages \ + -timeout 30s \ + -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint" + + go test ./e2e-tests/... \ + -timeout 120s \ + -skip "TestPublishDiagnostics|TestHover" runHook postCheck ''; ldflags = [ "-s" - "-w" - "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${version}'" + "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${finalAttrs.version}'" ]; - meta = with lib; { - homepage = "https://github.com/docker/docker-language-server"; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + meta = { description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)"; + homepage = "https://github.com/docker/docker-language-server"; + changelog = "https://github.com/docker/docker-language-server/blob/${finalAttrs.src.tag}/CHANGELOG.md"; mainProgram = "docker-language-server"; - license = licenses.asl20; - maintainers = with maintainers; [ baongoc124 ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ baongoc124 ]; }; -} +}) From 2e3dc7f0afe33255c2b730403074a8550d8afad8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 22:25:22 +0000 Subject: [PATCH 1372/2279] oxide-rs: 0.13.0+20250730.0.0 -> 0.14.0+20251008.0.0 --- pkgs/by-name/ox/oxide-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix index 2c98ce80d8b7..4be1231203af 100644 --- a/pkgs/by-name/ox/oxide-rs/package.nix +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "oxide-rs"; - version = "0.13.0+20250730.0.0"; + version = "0.14.0+20251008.0.0"; src = fetchFromGitHub { owner = "oxidecomputer"; repo = "oxide.rs"; rev = "v${version}"; - hash = "sha256-baEXsDzM4y4HmUwjIqVBJm+8L+q+llq9g2o1kEZU3vI="; + hash = "sha256-/xFtANxapsPU99Lj8TN+ZFcLy0AOyq+lcqhqIt3ZWgs="; }; patches = [ @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_cmd_auth_debug_logging" ]; - cargoHash = "sha256-radMOVLnHaV+5bUYanw5mswGM9A+xqNN/a4boe1jWDM="; + cargoHash = "sha256-D08NacxKZKVsqR7qQEce2lz8E4GahtSo7jwwmSPRvUc="; cargoBuildFlags = [ "--package=oxide-cli" From a12d2ad248e849bde151c68d2def430b916ef33a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 6 Nov 2025 22:27:29 +0000 Subject: [PATCH 1373/2279] swayidle: 1.8.0 -> 1.9.0 Changes: https://github.com/swaywm/swayidle/releases/tag/v1.9.0 --- pkgs/by-name/sw/swayidle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix index 47745212f78f..30fd4cbd0407 100644 --- a/pkgs/by-name/sw/swayidle/package.nix +++ b/pkgs/by-name/sw/swayidle/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swayidle"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "swayidle"; - rev = version; - hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg="; + rev = "v${version}"; + hash = "sha256-fxDwRfAXb9D6epLlyWnXpy9g8V3ovJRpQ/f3M4jxY/s="; }; strictDeps = true; From 55fbf3418a2e2ba5b832b89c94699cff6c30c49e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 22:28:02 +0000 Subject: [PATCH 1374/2279] mpvScripts.occivink.blacklistExtensions: 0-unstable-2025-03-09 -> 0-unstable-2025-11-01 --- pkgs/applications/video/mpv/scripts/occivink.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index fabfefd3e03e..7501c9e5ee1b 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -19,12 +19,12 @@ let let self = rec { pname = camelToKebab name; - version = "0-unstable-2025-03-09"; + version = "0-unstable-2025-11-01"; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-scripts"; - rev = "65aa1da29570e9c21b49292725ec5dd719ab6bb4"; - hash = "sha256-pca24cZY2ZNxkY1XP2T2WKo1UbD8gsGn+EskGH+CggE="; + rev = "01f3e99558915bb715b614d7f4b052230360eb21"; + hash = "sha256-v3TGsCzSg+a1vrOgI5NbTVf8Bh/iMRRgwMy194sNq1Y="; }; passthru.updateScript = unstableGitUpdater { }; From d1740d0616459526a7ef4bb32d6436e3b77750b5 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 6 Nov 2025 19:30:10 -0300 Subject: [PATCH 1375/2279] flamerobin: 0.9.3.12 -> 0.9.14 --- pkgs/by-name/fl/flamerobin/package.nix | 27 +++++++++----------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix index a49ed58d3859..22eab7204620 100644 --- a/pkgs/by-name/fl/flamerobin/package.nix +++ b/pkgs/by-name/fl/flamerobin/package.nix @@ -2,32 +2,23 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, wxGTK32, boost, firebird, }: -stdenv.mkDerivation rec { - version = "0.9.3.12"; +stdenv.mkDerivation (finalAttrs: { + version = "0.9.14"; pname = "flamerobin"; src = fetchFromGitHub { owner = "mariuz"; repo = "flamerobin"; - rev = version; - sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA="; + tag = "${finalAttrs.version}"; + hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s="; }; - patches = [ - # rely on compiler command line for __int128 and std::decimal::decimal128 - (fetchpatch { - url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch"; - sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM="; - }) - ]; - enableParallelBuilding = true; nativeBuildInputs = [ cmake ]; @@ -38,12 +29,12 @@ stdenv.mkDerivation rec { firebird ]; - meta = with lib; { + meta = { description = "Database administration tool for Firebird RDBMS"; homepage = "https://github.com/mariuz/flamerobin"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ uralbash ]; - platforms = platforms.unix; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ uralbash ]; + platforms = lib.platforms.unix; mainProgram = "flamerobin"; }; -} +}) From a88bc281e56172be917c01224ccb7327e7687a87 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Oct 2025 23:46:04 +0000 Subject: [PATCH 1376/2279] hydra: 0-unstable-2025-09-13 -> 0-unstable-2025-11-06 Diff: https://github.com/NixOS/hydra/compare/274027eb504c7fe090e00c16fd94f4b832981095...241ab718002ca5740b7e3f659d0fbd483ab40523 --- pkgs/by-name/hy/hydra/package.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index fef2712f7dde..a8e40efcdf39 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -131,14 +131,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2025-09-13"; + version = "0-unstable-2025-11-06"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "274027eb504c7fe090e00c16fd94f4b832981095"; - hash = "sha256-d2e+WCO5vNIgSd7bzm4JD5zU3gZ8mepXKCvt5NGv0Zw="; + rev = "241ab718002ca5740b7e3f659d0fbd483ab40523"; + hash = "sha256-ifmzQS+u/dODQXmMVQLIb4AF4dkWI9s7VGYpV6x/Iq4="; }; outputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dea6298048fc..9d2efe4d043a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7586,7 +7586,7 @@ with pkgs; hunspell.withDicts (_: dicts); - hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_29; }; + hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_32; }; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) From 19505f5cd1c2d38e322fb7b59540982a1a192d27 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Thu, 6 Nov 2025 19:46:04 -0300 Subject: [PATCH 1377/2279] gphotos-sync: drop --- pkgs/by-name/gp/gphotos-sync/package.nix | 63 ------------------- .../gp/gphotos-sync/skip-network-tests.patch | 21 ------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 pkgs/by-name/gp/gphotos-sync/package.nix delete mode 100644 pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch diff --git a/pkgs/by-name/gp/gphotos-sync/package.nix b/pkgs/by-name/gp/gphotos-sync/package.nix deleted file mode 100644 index 9b89e9c53b5e..000000000000 --- a/pkgs/by-name/gp/gphotos-sync/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, - ffmpeg, -}: -python3.pkgs.buildPythonApplication rec { - pname = "gphotos-sync"; - version = "3.2.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "gilesknap"; - repo = "gphotos-sync"; - rev = version; - hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw="; - }; - - patches = [ - ./skip-network-tests.patch - ]; - - nativeBuildInputs = with python3.pkgs; [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - attrs - exif - google-auth-oauthlib - psutil - pyyaml - psutil - requests-oauthlib - types-pyyaml - types-requests - ]; - - buildInputs = [ - ffmpeg - ]; - - nativeCheckInputs = with python3.pkgs; [ - mock - pytestCheckHook - ]; - - preCheck = '' - export PY_IGNORE_IMPORTMISMATCH=1 - export HOME=$(mktemp -d) - ''; - - meta = with lib; { - description = "Google Photos and Albums backup with Google Photos Library API"; - mainProgram = "gphotos-sync"; - homepage = "https://github.com/gilesknap/gphotos-sync"; - license = licenses.asl20; - maintainers = with maintainers; [ dnr ]; - }; -} diff --git a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch b/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch deleted file mode 100644 index 6f78ed7db3f2..000000000000 --- a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tests/test_setup.py b/tests/test_setup.py -index 085b110..ea4a7d2 100644 ---- a/tests/test_setup.py -+++ b/tests/test_setup.py -@@ -45,7 +45,8 @@ class SetupDbAndCredentials: - return self - - def __exit__(self, exc_type=None, exc_value=None, traceback=None): -- self.gp.google_photos_down.close() -+ if hasattr(self.gp, 'google_photos_down'): -+ self.gp.google_photos_down.close() - - def test_setup(self, test_name, args=None, trash_db=False, trash_files=False): - self.root = Path("/tmp/gpTests/{}".format(test_name)) -@@ -76,3 +77,6 @@ class SetupDbAndCredentials: - - def test_done(self): - self.gp.data_store.store() -+ -+import pytest, requests -+requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access") diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7f758a78104..3bbd458106dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -669,6 +669,7 @@ mapAliases { godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27 godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27 goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16 + gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06 gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27 gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09 gpxsee-qt6 = gpxsee; # added 2025-09-09 From c1ffa408eb32ea5947e03233a7de398af8d4fdf6 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 31 Oct 2025 08:46:23 +0100 Subject: [PATCH 1378/2279] framework-tool-tui: 0.5.1 -> 0.5.6 --- pkgs/by-name/fr/framework-tool-tui/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index df7402cb8877..0c791d715a11 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,20 +7,23 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.5.1"; + version = "0.5.7"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI="; + hash = "sha256-D9twqVizYqrglVOrwc8KuB5mk4vc/BTMv+HR3rv5yEk="; }; - cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M="; + cargoHash = "sha256-0/6b0C+uUNz03r5IEBvAGzagSyjzXFVbE74rgfGJoyM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; + # test suite needs a framework laptop + doCheck = false; + meta = { description = "TUI for controlling and monitoring Framework Computers hardware"; longDescription = '' From 847ba5672e3930a79aa1b8c0081b2956e90d79f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 23:00:00 +0000 Subject: [PATCH 1379/2279] teams-for-linux: 2.6.7 -> 2.6.11 --- 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 bcb26588ce3e..f45f1ab39265 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.6.7"; + version = "2.6.11"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-8jIQbeUhGBqVSz6tO48wTbwcJig+xnL8sIsROtEBsv4="; + hash = "sha256-jx58Bg/jMGqf9M/Ss4cYIHtuUmtkej67ScrcttSxNhg="; }; - npmDepsHash = "sha256-DKHQwJb9y75jX+h2XNudyn6mYnT9GywwBhZZtkknKKE="; + npmDepsHash = "sha256-tgLO4EsD3j5mg3c9M+I8jkeytw2ZrgQsKs10aryaFhw="; nativeBuildInputs = [ makeWrapper From 13db03d019ad5f8e2b2d5c02e41d0fffb13befd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 23:00:50 +0000 Subject: [PATCH 1380/2279] sydbox: 3.41.4 -> 3.42.0 --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 2ae0939f2706..a56a365b84e3 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.41.4"; + version = "3.42.0"; outputs = [ "out" @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-RILehKm5DzhCLfhGRUuoXYmrpO/b5TSTnzrVNvhSNrg="; + hash = "sha256-mp1FGJpwCYU53nK9sHjy17vIeR0ewst5eF0OA4Pfcl4="; }; - cargoHash = "sha256-t9p4RDQnz/C5TLgbDug3vnod+osY7oEPtW+dNzz9pEE="; + cargoHash = "sha256-15w2b9kRhDYXjUfKSULXFWzeD60Qmz4ATKEtaDwiDOo="; nativeBuildInputs = [ mandoc From 1db9950cf1bfe70c3cdaefc9ee5910e9a2662499 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 10:53:09 -0800 Subject: [PATCH 1381/2279] rename python3Packages.minikerberos-bad -> python3Packages.kerbad --- pkgs/development/python-modules/asyauth-bad/default.nix | 4 ++-- pkgs/development/python-modules/bloodyad/default.nix | 6 +++--- .../{minikerberos-bad => kerbad}/default.nix | 8 ++++---- pkgs/development/python-modules/msldap-bad/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) rename pkgs/development/python-modules/{minikerberos-bad => kerbad}/default.nix (78%) diff --git a/pkgs/development/python-modules/asyauth-bad/default.nix b/pkgs/development/python-modules/asyauth-bad/default.nix index dae4904fcf81..88492effe879 100644 --- a/pkgs/development/python-modules/asyauth-bad/default.nix +++ b/pkgs/development/python-modules/asyauth-bad/default.nix @@ -4,7 +4,7 @@ asysocks, buildPythonPackage, fetchFromGitHub, - minikerberos-bad, + kerbad, setuptools, unicrypto, }: @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ asn1crypto asysocks - minikerberos-bad + kerbad unicrypto ]; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 7cba2ac12efb..a993caa8e472 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -7,7 +7,7 @@ dnspython, fetchFromGitHub, hatchling, - minikerberos-bad, + kerbad, msldap-bad, pyasn1, pytestCheckHook, @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cryptography" ]; pythonRemoveDeps = [ - "minikerberos-bad" + "kerbad" "msldap-bad" ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { asn1crypto cryptography dnspython - minikerberos-bad + kerbad msldap-bad winacl ]; diff --git a/pkgs/development/python-modules/minikerberos-bad/default.nix b/pkgs/development/python-modules/kerbad/default.nix similarity index 78% rename from pkgs/development/python-modules/minikerberos-bad/default.nix rename to pkgs/development/python-modules/kerbad/default.nix index c018ff09a170..34e238f4d97e 100644 --- a/pkgs/development/python-modules/minikerberos-bad/default.nix +++ b/pkgs/development/python-modules/kerbad/default.nix @@ -15,13 +15,13 @@ }: buildPythonPackage rec { - pname = "minikerberos-bad"; + pname = "kerbad"; version = "0.4.4"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; - repo = "minikerberos-bAD"; + repo = "kerbad"; tag = version; hash = "sha256-pnIn7UOpnCke6voFvOwcONXDd9i/di1lE/57vkg0/0w="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Kerberos manipulation library in pure Python"; - homepage = "https://github.com/CravateRouge/minikerberos-bAD"; - changelog = "https://github.com/CravateRouge/minikerberos-bAD/releases/tag/${src.tag}"; + homepage = "https://github.com/CravateRouge/kerbad"; + changelog = "https://github.com/CravateRouge/kerbad/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/msldap-bad/default.nix index cda5f09b3190..a976d27fe487 100644 --- a/pkgs/development/python-modules/msldap-bad/default.nix +++ b/pkgs/development/python-modules/msldap-bad/default.nix @@ -5,7 +5,7 @@ asysocks, buildPythonPackage, fetchFromGitHub, - minikerberos-bad, + kerbad, prompt-toolkit, setuptools, tabulate, @@ -33,7 +33,7 @@ buildPythonPackage rec { asyauth-bad asn1crypto asysocks - minikerberos-bad + kerbad prompt-toolkit tabulate tqdm diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 02685beb6740..0f5cea7eb838 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -251,6 +251,7 @@ mapAliases { memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29 memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29 mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 + minikerberos-bad = throw "'minikerberos-bad' has been renamed to/replaced by 'kerbad'"; # added 2025-11-06 mir_eval = throw "'mir_eval' has been renamed to/replaced by 'mir-eval'"; # Converted to throw 2025-10-29 mistune_2_0 = throw "'mistune_2_0' has been renamed to/replaced by 'mistune'"; # Converted to throw 2025-10-29 mkdocs-awesome-pages-plugin = throw "'mkdocs-awesome-pages-plugin' has been renamed to/replaced by 'mkdocs-awesome-nav'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aba032811680..9b9474a67328 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7870,6 +7870,8 @@ self: super: with self; { keras = callPackage ../development/python-modules/keras { }; + kerbad = callPackage ../development/python-modules/kerbad { }; + kerberos = callPackage ../development/python-modules/kerberos { }; kernels = callPackage ../development/python-modules/kernels { }; @@ -9451,8 +9453,6 @@ self: super: with self; { minikerberos = callPackage ../development/python-modules/minikerberos { }; - minikerberos-bad = callPackage ../development/python-modules/minikerberos-bad { }; - minimal-snowplow-tracker = callPackage ../development/python-modules/minimal-snowplow-tracker { }; minimock = callPackage ../development/python-modules/minimock { }; From 686bd7dcd4d67830ef260b011762735a13af2db2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 23:01:46 +0000 Subject: [PATCH 1382/2279] python3Packages.sqlmap: 1.9.10 -> 1.9.11 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 91da430181fb..5ddbc22fd78d 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.9.10"; + version = "1.9.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S5A/zjf5PpauzIU3BGiijgGEq7OrFoj13xkYAJgdnOA="; + hash = "sha256-On76bRCiC7GEh5sdtTQnmohzkn7lvr4f1o9C25y/VJM="; }; postPatch = '' From 851458951511f1d19736939460ce2d7d2b791ce6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 23:01:50 +0000 Subject: [PATCH 1383/2279] hermitcli: 0.46.1 -> 0.46.2 --- pkgs/by-name/he/hermitcli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index 1fe420cb2abe..fbe73c99450a 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "hermit"; - version = "0.46.1"; + version = "0.46.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-snwqR9gtdUYmSNWcs+dur/6enuBG0HZ94cL6YoQFG1w="; + hash = "sha256-4SOwOO9ee7fKrby9sokWW/GPujT9/O+9emcaLIe+0C0="; }; vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM="; From 1dbbd6d5d149712459a0aff47b5ea18b7cd11ebd Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 11:10:02 -0800 Subject: [PATCH 1384/2279] python3Packages.kerbad: cleanup --- .../python-modules/kerbad/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/kerbad/default.nix b/pkgs/development/python-modules/kerbad/default.nix index 34e238f4d97e..9d2f58b55d84 100644 --- a/pkgs/development/python-modules/kerbad/default.nix +++ b/pkgs/development/python-modules/kerbad/default.nix @@ -1,14 +1,18 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies asn1crypto, asysocks, - buildPythonPackage, cryptography, - fetchFromGitHub, - fetchPypi, + dnspython, + minikerberos, oscrypto, - pythonOlder, - setuptools, six, tqdm, unicrypto, @@ -30,8 +34,10 @@ buildPythonPackage rec { dependencies = [ asn1crypto - cryptography asysocks + cryptography + dnspython + minikerberos oscrypto six tqdm From 6b8180b61235bd72209e6f289012bdb9588e3818 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 15:04:02 -0800 Subject: [PATCH 1385/2279] python3Packages.kerbad: 0.4.4 -> 0.5.6-unstable-2025-10-07 --- pkgs/development/python-modules/kerbad/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/kerbad/default.nix b/pkgs/development/python-modules/kerbad/default.nix index 9d2f58b55d84..68e87dcd6dff 100644 --- a/pkgs/development/python-modules/kerbad/default.nix +++ b/pkgs/development/python-modules/kerbad/default.nix @@ -18,16 +18,16 @@ unicrypto, }: -buildPythonPackage rec { +buildPythonPackage { pname = "kerbad"; - version = "0.4.4"; + version = "0.5.6-unstable-2025-10-07"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; repo = "kerbad"; - tag = version; - hash = "sha256-pnIn7UOpnCke6voFvOwcONXDd9i/di1lE/57vkg0/0w="; + rev = "3c2284de4d2390e22026b550705622ed39e5c05a"; # no tag available + hash = "sha256-V4KaF6lsECoLVpGZTZ4p7q9drHSsrsLPI/9zEQpqm3I="; }; build-system = [ setuptools ]; @@ -52,7 +52,6 @@ buildPythonPackage rec { meta = { description = "Kerberos manipulation library in pure Python"; homepage = "https://github.com/CravateRouge/kerbad"; - changelog = "https://github.com/CravateRouge/kerbad/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; From f83f8cad394e2bdd485f3b44c9947a45d8162056 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 11:40:39 -0800 Subject: [PATCH 1386/2279] python3Packages.asyauth-bad -> python3Packages.badauth --- .../{asyauth-bad => badauth}/default.nix | 10 +++++----- pkgs/development/python-modules/msldap-bad/default.nix | 6 +++--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{asyauth-bad => badauth}/default.nix (73%) diff --git a/pkgs/development/python-modules/asyauth-bad/default.nix b/pkgs/development/python-modules/badauth/default.nix similarity index 73% rename from pkgs/development/python-modules/asyauth-bad/default.nix rename to pkgs/development/python-modules/badauth/default.nix index 88492effe879..953aa624fbec 100644 --- a/pkgs/development/python-modules/asyauth-bad/default.nix +++ b/pkgs/development/python-modules/badauth/default.nix @@ -10,13 +10,13 @@ }: buildPythonPackage rec { - pname = "asyauth-bad"; + pname = "badauth"; version = "0.0.20"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; - repo = "asyauth-bAD"; + repo = "badauth"; tag = version; hash = "sha256-NX6bvOxA4Y5KRPCIsI+o0cB4dFOXlV89iH7YqNDdaXE="; }; @@ -33,12 +33,12 @@ buildPythonPackage rec { # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "asyauth" ]; + pythonImportsCheck = [ "badauth" ]; meta = { description = "Unified authentication library"; - homepage = "https://github.com/CravateRouge/asyauth-bAD"; - changelog = "https://github.com/CravateRouge/asyauth-bAD/releases/tag/${src.tag}"; + homepage = "https://github.com/CravateRouge/badauth"; + changelog = "https://github.com/CravateRouge/badauth/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/msldap-bad/default.nix index a976d27fe487..8f790f4c46db 100644 --- a/pkgs/development/python-modules/msldap-bad/default.nix +++ b/pkgs/development/python-modules/msldap-bad/default.nix @@ -1,7 +1,7 @@ { lib, asn1crypto, - asyauth-bad, + badauth, asysocks, buildPythonPackage, fetchFromGitHub, @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - asyauth-bad + badauth asn1crypto asysocks kerbad @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "LDAP library for auditing MS AD"; homepage = "https://github.com/CravateRouge/msldap-bAD"; - changelog = "https://github.com/CravateRouge/asyauth-bAD/releases/tag/${src.tag}"; + changelog = "https://github.com/CravateRouge/msldap-bAD/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0f5cea7eb838..26ba300d01f1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -65,6 +65,7 @@ mapAliases { APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29 argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29 astropy-extension-helpers = extension-helpers; # Added 2025-10-15 + asyauth-bad = throw "'asyauth-bad' has been renamed to/replaced by 'badauth'"; # added 2025-11-06 async_generator = throw "'async_generator' has been renamed to/replaced by 'async-generator'"; # Converted to throw 2025-10-29 async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29 asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b9474a67328..921f4bff8b9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1020,8 +1020,6 @@ self: super: with self; { asyauth = callPackage ../development/python-modules/asyauth { }; - asyauth-bad = callPackage ../development/python-modules/asyauth-bad { }; - async-cache = callPackage ../development/python-modules/async-cache { }; async-dns = callPackage ../development/python-modules/async-dns { }; @@ -1694,6 +1692,8 @@ self: super: with self; { bacpypes = callPackage ../development/python-modules/bacpypes { }; + badauth = callPackage ../development/python-modules/badauth { }; + badsecrets = callPackage ../development/python-modules/badsecrets { }; bagit = callPackage ../development/python-modules/bagit { }; From 906721f29d5eaff1a71f32959972377a3de40a9e Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 11:47:11 -0800 Subject: [PATCH 1387/2279] python3Packages.badauth: 0.0.20 -> 0.1.4-unstable-2025-10-09 --- pkgs/development/python-modules/badauth/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/badauth/default.nix b/pkgs/development/python-modules/badauth/default.nix index 953aa624fbec..f0c426687f56 100644 --- a/pkgs/development/python-modules/badauth/default.nix +++ b/pkgs/development/python-modules/badauth/default.nix @@ -9,16 +9,16 @@ unicrypto, }: -buildPythonPackage rec { +buildPythonPackage { pname = "badauth"; - version = "0.0.20"; + version = "0.1.4-unstable-2025-10-09"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; repo = "badauth"; - tag = version; - hash = "sha256-NX6bvOxA4Y5KRPCIsI+o0cB4dFOXlV89iH7YqNDdaXE="; + rev = "86d6091470c98e1a5f6dc4b8749053189372bb53"; # no tag available + hash = "sha256-p7V5WkQ48b1IqCPwmJfbCiyqekfp9zW41J81JHyZNUQ="; }; build-system = [ setuptools ]; @@ -38,7 +38,6 @@ buildPythonPackage rec { meta = { description = "Unified authentication library"; homepage = "https://github.com/CravateRouge/badauth"; - changelog = "https://github.com/CravateRouge/badauth/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; From e859fbd5f11088f286c8cec181e8c74189366c26 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 12:07:52 -0800 Subject: [PATCH 1388/2279] python3Packages.unidns: init at 0.0.4 --- .../python-modules/unidns/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/unidns/default.nix diff --git a/pkgs/development/python-modules/unidns/default.nix b/pkgs/development/python-modules/unidns/default.nix new file mode 100644 index 000000000000..4655b929538d --- /dev/null +++ b/pkgs/development/python-modules/unidns/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + asysocks, +}: + +buildPythonPackage rec { + pname = "unidns"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "skelsec"; + repo = "unidns"; + tag = version; + hash = "sha256-uhTb27HeBaoI4yURpNf1+D6bWIXSsmYzUyk0RJmgbjQ="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "asysocks" + ]; + + dependencies = [ + asysocks + ]; + + # No tests provided + doCheck = false; + + pythonImportsCheck = [ + "unidns" + ]; + + meta = { + description = "Basic async DNS library"; + homepage = "https://github.com/skelsec/unidns"; + changelog = "https://github.com/skelsec/unidns/releases/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 921f4bff8b9a..1adfc1cad9f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19672,6 +19672,8 @@ self: super: with self; { unidiff = callPackage ../development/python-modules/unidiff { }; + unidns = callPackage ../development/python-modules/unidns { }; + unifi-ap = callPackage ../development/python-modules/unifi-ap { }; unifi-discovery = callPackage ../development/python-modules/unifi-discovery { }; From 00aad1290aa665b1bc3ccd90728773f934ad662f Mon Sep 17 00:00:00 2001 From: Tert0 Date: Fri, 7 Nov 2025 00:27:54 +0100 Subject: [PATCH 1389/2279] nixos/tests/restic: fix setting time in tests Use `date -s` instead of `timedatectl set-time` because it fails with `Failed to set time: Requested to set the clock to time before build time, refusing.` --- nixos/tests/restic.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 68777215c035..68ce843879b3 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -247,7 +247,7 @@ in restic.succeed( # test that remotebackup runs custom commands and produces a snapshot - "timedatectl set-time '2016-12-13 13:45'", + "date -s '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", 'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', @@ -255,7 +255,7 @@ in restic.succeed( # test that remotebackup runs custom commands and produces a snapshot - "timedatectl set-time '2016-12-13 13:45'", + "date -s '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", 'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', @@ -297,27 +297,27 @@ in "grep 'check.* --some-check-option' /root/fake-restic.log", # test that we can create four snapshots in remotebackup and rclonebackup - "timedatectl set-time '2017-12-13 13:45'", + "date -s '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", - "timedatectl set-time '2018-12-13 13:45'", + "date -s '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", - "timedatectl set-time '2018-12-14 13:45'", + "date -s '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", - "timedatectl set-time '2018-12-15 13:45'", + "date -s '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", - "timedatectl set-time '2018-12-16 13:45'", + "date -s '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", From a090aa84b715396336ff5e565b29a51bb43a954a Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 10:24:41 -0800 Subject: [PATCH 1390/2279] rename python3Packages.msldap-bad -> python3Packages.badldap --- .../{msldap-bad => badldap}/default.nix | 13 ++++++------- .../development/python-modules/bloodyad/default.nix | 6 +++--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/development/python-modules/{msldap-bad => badldap}/default.nix (76%) diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/badldap/default.nix similarity index 76% rename from pkgs/development/python-modules/msldap-bad/default.nix rename to pkgs/development/python-modules/badldap/default.nix index 8f790f4c46db..9e57addb9161 100644 --- a/pkgs/development/python-modules/msldap-bad/default.nix +++ b/pkgs/development/python-modules/badldap/default.nix @@ -1,8 +1,8 @@ { lib, asn1crypto, - badauth, asysocks, + badauth, buildPythonPackage, fetchFromGitHub, kerbad, @@ -16,13 +16,13 @@ }: buildPythonPackage rec { - pname = "msldap-bad"; + pname = "badldap"; version = "0.5.10"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; - repo = "msldap-bAD"; + repo = "badldap"; tag = version; hash = "sha256-CnHXEE1tdIXv+Qb3pS+cNxVtcTOVaq6mrQxu3wr1Xxo="; }; @@ -30,9 +30,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - badauth asn1crypto asysocks + badauth kerbad prompt-toolkit tabulate @@ -45,12 +45,11 @@ buildPythonPackage rec { # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "msldap" ]; + pythonImportsCheck = [ "badldap" ]; meta = { description = "LDAP library for auditing MS AD"; - homepage = "https://github.com/CravateRouge/msldap-bAD"; - changelog = "https://github.com/CravateRouge/msldap-bAD/releases/tag/${src.tag}"; + homepage = "https://github.com/CravateRouge/badldap"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index a993caa8e472..ff63a21d90ca 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -8,7 +8,7 @@ fetchFromGitHub, hatchling, kerbad, - msldap-bad, + badldap, pyasn1, pytestCheckHook, pythonOlder, @@ -33,7 +33,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "kerbad" - "msldap-bad" + "badldap" ]; build-system = [ hatchling ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { cryptography dnspython kerbad - msldap-bad + badldap winacl ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 26ba300d01f1..22b3143b797d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -259,6 +259,7 @@ mapAliases { mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02 mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29 mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29 + msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06 multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29 mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25 net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1adfc1cad9f4..515ff03070b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1694,6 +1694,8 @@ self: super: with self; { badauth = callPackage ../development/python-modules/badauth { }; + badldap = callPackage ../development/python-modules/badldap { }; + badsecrets = callPackage ../development/python-modules/badsecrets { }; bagit = callPackage ../development/python-modules/bagit { }; @@ -9845,8 +9847,6 @@ self: super: with self; { msldap = callPackage ../development/python-modules/msldap { }; - msldap-bad = callPackage ../development/python-modules/msldap-bad { }; - mslex = callPackage ../development/python-modules/mslex { }; msmart-ng = callPackage ../development/python-modules/msmart-ng { }; From a33cde83015cb915779f392bd61d02eb5c0b8f72 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 11:33:12 -0800 Subject: [PATCH 1391/2279] python3Packages.badldap: cleanup --- pkgs/development/python-modules/badldap/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/badldap/default.nix b/pkgs/development/python-modules/badldap/default.nix index 9e57addb9161..4010e0d781fd 100644 --- a/pkgs/development/python-modules/badldap/default.nix +++ b/pkgs/development/python-modules/badldap/default.nix @@ -1,13 +1,17 @@ { lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies asn1crypto, asysocks, badauth, - buildPythonPackage, - fetchFromGitHub, kerbad, prompt-toolkit, - setuptools, tabulate, tqdm, unicrypto, From ac88b6a3bec11eac627bd9dd978a1bbce9d1fde2 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 11:29:51 -0800 Subject: [PATCH 1392/2279] python3Packages.badldap: 0.5.10 -> 0.7.1-unstable-2025-10-28 --- pkgs/development/python-modules/badldap/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/badldap/default.nix b/pkgs/development/python-modules/badldap/default.nix index 4010e0d781fd..290c57b6e9e1 100644 --- a/pkgs/development/python-modules/badldap/default.nix +++ b/pkgs/development/python-modules/badldap/default.nix @@ -15,20 +15,21 @@ tabulate, tqdm, unicrypto, + unidns, wcwidth, winacl, }: -buildPythonPackage rec { +buildPythonPackage { pname = "badldap"; - version = "0.5.10"; + version = "0.7.1-unstable-2025-10-28"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; repo = "badldap"; - tag = version; - hash = "sha256-CnHXEE1tdIXv+Qb3pS+cNxVtcTOVaq6mrQxu3wr1Xxo="; + rev = "65af61fd7daf7dc7bef9c6248553398e6f604d43"; # no tag available + hash = "sha256-14mV+EBrpoR9suPmOYdt2ro1Gcrpj3tuVx/meaVKC2c="; }; build-system = [ setuptools ]; @@ -42,6 +43,7 @@ buildPythonPackage rec { tabulate tqdm unicrypto + unidns wcwidth winacl ]; From cc8fbf8b6a91426f542c761b155c9268ab5238cb Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 10:11:41 -0800 Subject: [PATCH 1393/2279] python3Packages.bloodyad: cleanup --- .../python-modules/bloodyad/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index ff63a21d90ca..1b068439ba19 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -1,18 +1,22 @@ { lib, - asn1crypto, buildPythonPackage, - certipy, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + asn1crypto, cryptography, dnspython, - fetchFromGitHub, - hatchling, kerbad, badldap, - pyasn1, - pytestCheckHook, - pythonOlder, winacl, + + # test + certipy, + pytestCheckHook, }: buildPythonPackage rec { @@ -20,8 +24,6 @@ buildPythonPackage rec { version = "2.1.21"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "CravateRouge"; repo = "bloodyAD"; @@ -65,11 +67,11 @@ buildPythonPackage rec { "test_certificate_authentications" ]; - meta = with lib; { + meta = { description = "Module for Active Directory Privilege Escalations"; homepage = "https://github.com/CravateRouge/bloodyAD"; changelog = "https://github.com/CravateRouge/bloodyAD/releases/tag/${src.tag}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From d7547e781eda44b6df82b5efc313c324ed3ebf59 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 2 Nov 2025 10:11:41 -0800 Subject: [PATCH 1394/2279] python3Packages.bloodyad: 2.1.21 -> 2.5.0 --- .../python-modules/bloodyad/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 1b068439ba19..9302f160aa8f 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -8,10 +9,10 @@ # dependencies asn1crypto, + badldap, cryptography, dnspython, kerbad, - badldap, winacl, # test @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "bloodyad"; - version = "2.1.21"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "CravateRouge"; repo = "bloodyAD"; tag = "v${version}"; - hash = "sha256-9yzKYSEmaPMv6AWhgr4UPPEx8s75Pg/hwqJnV29WocM="; + hash = "sha256-WKD8R1pH1dIAxMIM2SLPV+AoFi3z1O96U8XK2QyVYxQ="; }; pythonRelaxDeps = [ "cryptography" ]; @@ -40,12 +41,21 @@ buildPythonPackage rec { build-system = [ hatchling ]; + # Upstream provides two package scripts: bloodyad and bloodyAD, + # but this causes a FileAlreadyExists error during installation + # on Darwin (case-insensitive filesystem). + # https://github.com/CravateRouge/bloodyAD/issues/99 + postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' + substituteInPlace pyproject.toml \ + --replace-fail "bloodyAD = \"bloodyAD.main:main\"" "" + ''; + dependencies = [ asn1crypto + badldap cryptography dnspython kerbad - badldap winacl ]; @@ -65,6 +75,13 @@ buildPythonPackage rec { "test_04ComputerRbcdGetSetAttribute" "test_06AddRemoveGetDnsRecord" "test_certificate_authentications" + "test_04ComputerRbcdRestoreGetSetAttribute" + ]; + + disabledTestPaths = [ + # TypeError: applyFormatters() takes 1 positional argument but 2 were given + # https://github.com/CravateRouge/bloodyAD/issues/98 + "tests/test_formatters.py" ]; meta = { From b68f594aad4f8aeff47c4d35b629fe939492c2e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 23:34:10 +0000 Subject: [PATCH 1395/2279] python3Packages.yara-x: 1.8.1 -> 1.9.0 --- pkgs/development/python-modules/yara-x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index 1423429fc08f..dccaaea60ea1 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "yara-x"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; tag = "v${version}"; - hash = "sha256-dl2uxMo81K2ZEAfZk2OP0FXTY4lKGmzqZe0QQo/YIsA="; + hash = "sha256-yoQoAtgXBgniNebU9HMxF1m0UHFD6iU095he9tCNNIo="; }; buildAndTestSubdir = "py"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-+Bva1uch6fd6gl2MH2ss3S6Ea1QkvgVePhdUVUDuIE8="; + hash = "sha256-/HMyNofKpeYaFfRcZ1LAb3vfW/TQy+DsILXRCpJFlCQ="; }; nativeBuildInputs = [ From 4946ab87a695c344ea86b58e88feaae1b5d15bea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Nov 2025 00:39:48 +0100 Subject: [PATCH 1396/2279] python3Packages.css-inline: 0.17.0 -> 0.18.0 https://github.com/Stranger6667/css-inline/blob/python-v0.18.0/CHANGELOG.md --- .../python-modules/css-inline/Cargo.lock | 681 +++++++++--------- .../python-modules/css-inline/default.nix | 6 +- 2 files changed, 331 insertions(+), 356 deletions(-) diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock index d3758752bdca..94af65d4e777 100644 --- a/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/pkgs/development/python-modules/css-inline/Cargo.lock @@ -2,33 +2,12 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "allocator-api2" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -38,27 +17,18 @@ dependencies = [ "libc", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "backtrace" -version = "0.3.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - [[package]] name = "base64" version = "0.22.1" @@ -67,9 +37,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "built" @@ -87,12 +57,6 @@ version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "bytes" version = "1.10.1" @@ -113,18 +77,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.30" +version = "1.2.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -134,11 +99,10 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "num-traits", "windows-link", @@ -177,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "css-inline" -version = "0.17.0" +version = "0.18.0" dependencies = [ "cssparser", "html5ever", @@ -193,7 +157,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.17.0" +version = "0.18.0" dependencies = [ "built", "css-inline", @@ -284,6 +248,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + [[package]] name = "fnv" version = "1.0.7" @@ -292,15 +262,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foldhash" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -365,15 +335,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "getrandom" version = "0.2.16" @@ -383,35 +344,29 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasip2", "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" dependencies = [ "allocator-api2", "equivalent", @@ -477,18 +432,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "http", "http-body", "httparse", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -513,9 +470,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" dependencies = [ "base64", "bytes", @@ -529,7 +486,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", + "socket2", "tokio", "tower-service", "tracing", @@ -537,9 +494,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -561,9 +518,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", "potential_utf", @@ -574,9 +531,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -587,11 +544,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -602,42 +558,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -647,9 +599,9 @@ dependencies = [ [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -668,9 +620,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", "hashbrown", @@ -678,19 +630,11 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" - -[[package]] -name = "io-uring" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" dependencies = [ - "bitflags", - "cfg-if", - "libc", + "rustversion", ] [[package]] @@ -701,9 +645,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ "memchr", "serde", @@ -717,9 +661,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" dependencies = [ "once_cell", "wasm-bindgen", @@ -727,37 +671,36 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.174" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "lru" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" +checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" dependencies = [ "hashbrown", ] @@ -798,9 +741,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memoffset" @@ -811,24 +754,15 @@ dependencies = [ "autocfg", ] -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", -] - [[package]] name = "mio" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -846,15 +780,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -863,9 +788,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -873,22 +798,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-link", ] [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "phf" @@ -962,9 +887,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" dependencies = [ "zerovec", ] @@ -986,18 +911,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" +checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf" dependencies = [ "indoc", "libc", @@ -1012,11 +937,10 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" +checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb" dependencies = [ - "once_cell", "target-lexicon", ] @@ -1028,9 +952,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690" [[package]] name = "pyo3-ffi" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" +checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be" dependencies = [ "libc", "pyo3-build-config", @@ -1038,9 +962,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" +checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1050,9 +974,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" +checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b" dependencies = [ "heck", "proc-macro2", @@ -1063,9 +987,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", "cfg_aliases", @@ -1074,7 +998,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2", "thiserror", "tokio", "tracing", @@ -1083,12 +1007,12 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", "rand 0.9.2", "ring", @@ -1104,23 +1028,23 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -1172,14 +1096,14 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", ] [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1187,9 +1111,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1197,18 +1121,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.16" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] [[package]] name = "reqwest" -version = "0.12.22" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64", "bytes", @@ -1258,12 +1182,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustc-demangle" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -1272,9 +1190,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustls" -version = "0.23.29" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "once_cell", "ring", @@ -1286,9 +1204,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" dependencies = [ "web-time", "zeroize", @@ -1296,9 +1214,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.4" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "ring", "rustls-pki-types", @@ -1307,9 +1225,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1325,46 +1243,57 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "selectors" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df44ba8a7ca7a4d28c589e04f526266ed76b6cc556e33fe69fa25de31939a65" +checksum = "09975d3195f34dce9c7b381cb0f00c3c13381d4d3735c0f1a9c894b283b302ab" dependencies = [ "bitflags", "cssparser", "derive_more", - "fxhash", "log", "new_debug_unreachable", "phf", "phf_codegen", "precomputed-hash", + "rustc-hash", "servo_arc", "smallvec", ] [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" dependencies = [ "serde", + "serde_core", ] [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1373,14 +1302,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.141" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1427,9 +1357,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" @@ -1439,29 +1369,19 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.10" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "socket2" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" -dependencies = [ - "libc", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "string_cache" @@ -1496,9 +1416,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.104" +version = "2.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" dependencies = [ "proc-macro2", "quote", @@ -1527,9 +1447,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" [[package]] name = "tendril" @@ -1544,18 +1464,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -1564,9 +1484,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -1574,9 +1494,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -1589,26 +1509,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.0" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", "pin-project-lite", - "slab", - "socket2 0.6.0", - "windows-sys 0.59.0", + "socket2", + "windows-sys 0.61.2", ] [[package]] name = "tokio-rustls" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", "tokio", @@ -1727,9 +1644,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unindent" @@ -1745,13 +1662,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -1782,45 +1700,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" dependencies = [ "cfg-if", "js-sys", @@ -1831,9 +1736,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1841,31 +1746,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -1895,18 +1800,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" dependencies = [ "rustls-pki-types", ] [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", @@ -1917,9 +1822,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", @@ -1928,9 +1833,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", @@ -1939,24 +1844,24 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ "windows-link", ] @@ -1967,16 +1872,25 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets", + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", ] [[package]] @@ -1985,14 +1899,31 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -2001,42 +1932,84 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -2044,36 +2017,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.7.12" +name = "windows_x86_64_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winnow" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" dependencies = [ "memchr", ] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -2081,9 +2056,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -2093,18 +2068,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", @@ -2134,15 +2109,15 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" dependencies = [ "displaydoc", "yoke", @@ -2151,9 +2126,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -2162,9 +2137,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index cb58bb88517a..50ca2b9ed9dc 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-RclMgVJpK2dOtuFKearRMK8rpa6vFTa8T3Z+A7mk7Zs="; + hash = "sha256-sJOt7CX02uoECdki0iUZin4sAIgLafBLb5kjXEgYcYg="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; - hash = "sha256-WvUlumpXVLiu9htY07wfGyibro2StWgYF7XVW411ePw="; + hash = "sha256-LpknrrsIZ38NlQDMGpiA7cftspvCo/mQ8KAwKRkdVEc="; }; nativeBuildInputs = [ From 3e07bc512faa338abcf406c418354de4970676bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Nov 2025 23:46:44 +0000 Subject: [PATCH 1397/2279] magic-vlsi: 8.3.570 -> 8.3.573 --- pkgs/by-name/ma/magic-vlsi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index a9e69721d3e1..5735194590b4 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.570"; + version = "8.3.573"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; tag = "${version}"; - sha256 = "sha256-ytITe6NtCqD1HTKry8O2famVkhB1+txIIa8UQlXa9qM="; + sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E="; leaveDotGit = true; }; From 5d84757d867f3c000b8b24920536487fb4e70bb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 00:06:12 +0000 Subject: [PATCH 1398/2279] python3Packages.wgpu-py: 0.26.0 -> 0.27.0 --- pkgs/development/python-modules/wgpu-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix index affdc5361208..93b55c8d8f69 100644 --- a/pkgs/development/python-modules/wgpu-py/default.nix +++ b/pkgs/development/python-modules/wgpu-py/default.nix @@ -39,14 +39,14 @@ }: buildPythonPackage rec { pname = "wgpu-py"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "pygfx"; repo = "wgpu-py"; tag = "v${version}"; - hash = "sha256-TaWrodP1KtCLIKi+NOnq2U7CLGVEhnlJilD6Txt7vgo="; + hash = "sha256-PCZaPG2e6KpV6NDYrnsZIb/rO0/su/dA65s85+/V0HY="; }; postPatch = From 8f0acc6c2242011f3f9dbab2624ac3373fb72cb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 00:12:28 +0000 Subject: [PATCH 1399/2279] doctl: 1.145.0 -> 1.147.0 --- pkgs/by-name/do/doctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix index b7108cc4109f..869ce5f633a0 100644 --- a/pkgs/by-name/do/doctl/package.nix +++ b/pkgs/by-name/do/doctl/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.145.0"; + version = "1.147.0"; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; tag = "v${version}"; - hash = "sha256-JeIpx+i1JDVfJqCKTZMTJ7rDMGO4yA/eR56C3qr08zg="; + hash = "sha256-Z7oI35JYM4kVYAu9rspOgj6Cec9R7toUoMxgogkkYzk="; }; meta = { From 3fa9c497017ae80086dc7184ce194b59d67a512a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 00:23:54 +0000 Subject: [PATCH 1400/2279] fabric-ai: 1.4.320 -> 1.4.322 --- pkgs/by-name/fa/fabric-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 9fe423d3fa58..b9ccd1e2196c 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.320"; + version = "1.4.322"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-/K70Gm96TYD8djNZkeFAB1hS3BXWuW/Nqtu583d055o="; + hash = "sha256-vOEEBcr74BMgIw+npIN4+s/E0jMjmIWj5uqgHK4puoc="; }; - vendorHash = "sha256-V24r/xl/E37OYW59apD/ccXtDIpP3MeUEq9HvHdTSgM="; + vendorHash = "sha256-bOA4vKwiRNRCyDWKCmzwLZlhsZwjSVe194Th6MNlwvM="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; From 3158a6bbf4f73e01f36758cadff5595e0f786cda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 01:03:27 +0000 Subject: [PATCH 1401/2279] zed-editor: 0.210.4 -> 0.211.6 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index bbd8b88a2f43..33ad77f07b85 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -101,7 +101,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.210.4"; + version = "0.211.6"; outputs = [ "out" @@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-xSADK/LAbcb47Hd66p+11GuylOFSsbNTVtJtiVOylNQ="; + hash = "sha256-JlRsiQHDsQ80/8aM0trCrfvEAAXQtkO75CAKotP1mFs="; }; postPatch = '' @@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-bVRDOhjeRwS/j0Lul7JtnvXKUldOYH4dOJhUgMhfeuQ="; + cargoHash = "sha256-DHAERsHGDk7bjTi+nCTf75qt6+uGzHLojEzoDCFkVDc="; nativeBuildInputs = [ cmake From 8b4373d05b2db2779dfaac02ccba6d78d575df3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 01:07:09 +0000 Subject: [PATCH 1402/2279] saga: 9.10.0 -> 9.10.1 --- 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 533797675ed8..cc06ef86f91c 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.10.0"; + version = "9.10.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; - hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA="; + hash = "sha256-6V7KSdaU3TkdsGr6ll7Q8oSH7/rItgSrgN7Fjn+f9dM="; }; sourceRoot = "saga-${finalAttrs.version}/saga-gis"; From e306746573ea1f4790f3618b76cf8f7fe325f224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 01:18:11 +0000 Subject: [PATCH 1403/2279] asusctl: 6.1.16 -> 6.1.17 --- pkgs/by-name/as/asusctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index db51d5237c31..aa025acb6583 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -18,16 +18,16 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.16"; + version = "6.1.17"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; tag = version; - hash = "sha256-Ndwzy/2Rg5W1cF6YFjoUtgN1156VZW4Gs1DgJTrmu/w="; + hash = "sha256-rNLQYCE7NZAel2fr5VoAMlm7QkH1KrySKdEn2+WMPo8="; }; - cargoHash = "sha256-+j682yZx54DXh+45b9GzSD29/aYALI/y1YbmlfQd09Q="; + cargoHash = "sha256-/vMVSGUO6Zu/8GSTq1jsXLWVP9sWsuD7fJty3NnKXf4="; postPatch = '' files=" From 86c0e22c9c6d8525950e9dff7b3fdec01b58f16c Mon Sep 17 00:00:00 2001 From: Jet Pham Date: Wed, 29 Oct 2025 19:32:10 -0700 Subject: [PATCH 1404/2279] code-cursor: 1.7.38 -> 2.0.64 Update code-cursor with new changes as listed in https://cursor.com/changelog/2-0 --- pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index c0b420dc2d94..174f22f7b21d 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/x64/Cursor-1.7.52-x86_64.AppImage"; - hash = "sha256-nhDDdXE5/m9uASiQUJ4GHfApkzkf9ju5b8s0h6BhpjQ="; + url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage"; + hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/arm64/Cursor-1.7.52-aarch64.AppImage"; - hash = "sha256-96zL0pmcrEyDEy8oW2qWk6RM8XGE4Gd2Aa3Hhq0qvk0="; + url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage"; + hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-0//Sv57iEgRm/exnUnKVpdyk6fwxAnx0PDg2mVaB9J8="; + url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-g8Fk9+MDwzLTNitxJMApypfiLWEjze0PR2OIPC774j8="; + url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.7.52"; + version = "2.0.64"; pname = "cursor"; # You can find the current VSCode version in the About dialog: From c1ef5db4a36de5268dd95d7bc7d296bed85452aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 01:26:24 +0000 Subject: [PATCH 1405/2279] geographiclib: 2.6 -> 2.7 --- pkgs/by-name/ge/geographiclib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix index c0095d4eb9f3..4d8ab6b869af 100644 --- a/pkgs/by-name/ge/geographiclib/package.nix +++ b/pkgs/by-name/ge/geographiclib/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "geographiclib"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "geographiclib"; repo = "geographiclib"; tag = "v${version}"; - hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E="; + hash = "sha256-xqrt7KeYyYB90kuvn2qmK8VI3RVQuIhNN8qCzV//yko="; }; outputs = [ From 82c01dd4778f1ac8e62f55cfa831889bf1add216 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 02:04:11 +0000 Subject: [PATCH 1406/2279] python3Packages.oelint-parser: 8.6.1 -> 8.6.2 --- pkgs/development/python-modules/oelint-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 237660e41a60..e9e56f98b705 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "8.6.1"; + version = "8.6.2"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-parser"; tag = version; - hash = "sha256-lKHtKrR5bjBuqBvfsMAIR3K+ERhITBXzrxAvvYopDiM="; + hash = "sha256-NpaIOJ517L9k2evuM6/mQc6Da2c+veFOAlRyeUHseKY="; }; pythonRelaxDeps = [ "regex" ]; From 80fb5c6710e2f31e7fa67fe2769fcafbacab6042 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 02:14:15 +0000 Subject: [PATCH 1407/2279] scope-tui: 0.3.3 -> 0.3.4 --- pkgs/by-name/sc/scope-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix index 4e45ef1c812c..f2d07b372736 100644 --- a/pkgs/by-name/sc/scope-tui/package.nix +++ b/pkgs/by-name/sc/scope-tui/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "scope-tui"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "alemidev"; repo = "scope-tui"; rev = "v${finalAttrs.version}"; - hash = "sha256-bVe+Yyv+DcbEC15H968OhQhcFkAm7T5J6aQlKod5ocM="; + hash = "sha256-MU9avQt+qFIQzF7GYNNoGiyfBD7eLOMQaBH6lFhLlOY="; }; - cargoHash = "sha256-o5pplwNtIe2z88ZwtCHree32kv16U/ryv8PmPIqxtPQ="; + cargoHash = "sha256-yAy3kk62HYe1/1EXGUhOg++sZua65iN3ZEmPoERcu0I="; nativeBuildInputs = [ pkg-config ]; From 606a90ce300ed58ea8690c994e28ca0b1d9e678b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 02:15:46 +0000 Subject: [PATCH 1408/2279] grype: 0.102.0 -> 0.103.0 --- pkgs/by-name/gr/grype/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 552c4ecf8c24..48dff5c9d590 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "grype"; - version = "0.102.0"; + version = "0.103.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-aYY/AYHbPWs5Rtbfsvam0lE3WzcJHt6LHQ6us2dukFI="; + hash = "sha256-AXhpdEJ0T0GF9DamboT+V4ivadzR3+7HpLQs8O1QTAQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-N/J+Y3PohhnChOIEn4ZITaKEK62gwuApNf1XEZVL23k="; + vendorHash = "sha256-aoqjzF4CSzBZxvAz0vMR4ztUvpLewYi7sSCeSlSiLd0="; nativeBuildInputs = [ installShellFiles ]; From b5b656932d559a5f10e0de0282b1ddb4c7a1e4a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 02:53:10 +0000 Subject: [PATCH 1409/2279] vscode-extensions.prisma.prisma: 6.18.0 -> 6.19.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 b04d7fe3466f..5ab2de45f1b6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3768,8 +3768,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "6.18.0"; - hash = "sha256-wStFklnjX+UDykxLjl+vDYnvAgjrqFG4ahDuCX2glwI="; + version = "6.19.0"; + hash = "sha256-IeeKk4gYFq+zTYpKHAOgEh3EC2g6bbb0Qcys2m5DeAo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; From ce7a9d40bd4d3c55cb65a562368093a804a7b1a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 02:59:42 +0000 Subject: [PATCH 1410/2279] miriway: 25.11 -> 25.12 --- pkgs/by-name/mi/miriway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index 88e592debefb..efa6921acce2 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "25.11"; + version = "25.12"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; tag = "v${finalAttrs.version}"; - hash = "sha256-tXxRKGP/MMXOD1QtOYj5E9IurLoUUu1JBg8+l5z0KCQ="; + hash = "sha256-I+W3tYhjnT3SI6U1K7Xz/5rBHYM3ZAeqj3vRgOXz+lU="; }; postPatch = '' From 8a45379dc54d70165f632b68d5c7a1a8ec251cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:15:36 -0800 Subject: [PATCH 1411/2279] python3Packages.ansible: 12.1.0 -> 12.2.0 Changelog: https://github.com/ansible-community/ansible-build-data/blob/12.2.0/12/CHANGELOG-v12.rst --- pkgs/development/python-modules/ansible/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index a61d839246b5..11b07f8c2c19 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -1,6 +1,5 @@ { lib, - pythonOlder, buildPythonPackage, fetchPypi, setuptools, @@ -25,17 +24,15 @@ let pname = "ansible"; - version = "12.1.0"; + version = "12.2.0"; in buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; - hash = "sha256-It6hk41DP6UVswAc+tZcswjvl8mA8VIBdNBU3TjzLIM="; + hash = "sha256-BWPf0z69KMr2zNx6bSKn/a+9nJxC/vyuUXlhalOjUhE="; }; # we make ansible-core depend on ansible, not the other way around, From cf5dad027edd78ae01f248b6ada804892fd7eeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:10:01 -0800 Subject: [PATCH 1412/2279] python3Packages.ansible-core: use fetchFromGitHub --- pkgs/development/python-modules/ansible/core.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 9 ++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index d295105a6ef5..0b948d7236db 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, python, pythonOlder, installShellFiles, @@ -39,10 +39,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.12"; - src = fetchPypi { - pname = "ansible_core"; - inherit version; - hash = "sha256-JDppZpoAe+B5Q2C8RHf3DgEozgCR3Dr0xcuBxqRm9XM="; + src = fetchFromGitHub { + owner = "ansible"; + repo = "ansible"; + tag = "v${version}"; + hash = "sha256-/Eoq0ixAWoDvrHnxXgDth5TUKZzUDxDTzTDzjSUPugk="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcd95dbaf55d..3269a38657a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6062,7 +6062,8 @@ with pkgs; ansible_2_18 = python3Packages.toPythonApplication ( python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.18.8"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "ansible_core"; inherit version; hash = "sha256-sHZiFalqR845kz0n4emWyivrVM8bOQfHQtNckTsfeM0="; }; @@ -6071,7 +6072,8 @@ with pkgs; ansible_2_17 = python3Packages.toPythonApplication ( python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.17.8"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "ansible_core"; inherit version; hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc="; }; @@ -6080,7 +6082,8 @@ with pkgs; ansible_2_16 = python3Packages.toPythonApplication ( python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.16.14"; - src = oldAttrs.src.override { + src = fetchPypi { + pname = "ansible_core"; inherit version; hash = "sha256-gCef/9mGhrrfqjLh7HhdmKbfGy/B5Al97AWXZA10ZBU="; }; From 74f658bd1b05dcd19b9828c428b636dc9dcc7b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:11:58 -0800 Subject: [PATCH 1413/2279] python3Packages.ansible-core: 2.19.3 -> 2.19.4 Diff: https://github.com/ansible/ansible/compare/v2.19.3...v2.19.4 Changelog: https://github.com/ansible/ansible/blob/v2.19.4/changelogs/CHANGELOG-v2.19.rst --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 0b948d7236db..fd96ee93aaa1 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "ansible-core"; # IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix # There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here - version = "2.19.3"; + version = "2.19.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "ansible"; tag = "v${version}"; - hash = "sha256-/Eoq0ixAWoDvrHnxXgDth5TUKZzUDxDTzTDzjSUPugk="; + hash = "sha256-TjafUlPKuxpXrfREK65D88SoGThGBzpbfCHr0ZkviI0="; }; # ansible_connection is already wrapped, so don't pass it through From 7ed27198f4f98df237e266f810c6f84e8be266b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 03:20:49 +0000 Subject: [PATCH 1414/2279] brave: 1.84.132 -> 1.84.135 --- pkgs/by-name/br/brave/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 2cbbacccb688..0d4a929b82d1 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.84.132"; + version = "1.84.135"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc="; + hash = "sha256-DekkbvOpVn+NDSzltiafsS7cE2QbVn47mIaVvXUQUUM="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg="; + hash = "sha256-mPZqszSPkMC77eUY+CpTzYbbDKMKt7LoM6lncgBqSFo="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0="; + hash = "sha256-yC1XS1NdJ6kTd16kK/MlVV5KYoMVgRAr8/JLOdr+r74="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8="; + hash = "sha256-Au42zUX21ZFvfNyrNRb3sWH+c+DGqqGUulbK02Xjrsg="; }; }; From f9a2957d688f131ea888ad859a99f7e09da1a8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:31:45 -0800 Subject: [PATCH 1415/2279] python3Packages.cucumber-expressions: init at 18.0.1 --- .../cucumber-expressions/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/cucumber-expressions/default.nix diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix new file mode 100644 index 000000000000..dd0a28ebe6f2 --- /dev/null +++ b/pkgs/development/python-modules/cucumber-expressions/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytestCheckHook, + pyyaml, +}: + +buildPythonPackage rec { + pname = "cucumber-expressions"; + version = "18.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cucumber"; + repo = "cucumber-expressions"; + tag = "v${version}"; + hash = "sha256-Mbf7bG7NvKFdv6kYPkd6UlPDJGjnK2GPl0qnLUhQ3es="; + }; + + sourceRoot = "${src.name}/python"; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ "cucumber_expressions" ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + meta = { + changelog = "https://github.com/cucumber/cucumber-expressions/blob/${src.tag}/CHANGELOG.md"; + description = "Human friendly alternative to Regular Expressions"; + homepage = "https://github.com/cucumber/cucumber-expressions/tree/main/python"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3eef16dbee78..7d02dfb75aee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3218,6 +3218,8 @@ self: super: with self; { cu2qu = callPackage ../development/python-modules/cu2qu { }; + cucumber-expressions = callPackage ../development/python-modules/cucumber-expressions { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cupy = callPackage ../development/python-modules/cupy { From 4bc74b146354ff989108c15de00bfcfd40321340 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Nov 2025 03:33:52 +0000 Subject: [PATCH 1416/2279] models-dev: 0-unstable-2025-11-04 -> 0-unstable-2025-11-06 --- pkgs/by-name/mo/models-dev/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index f7baee7d47eb..ad448911bb9c 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-11-04"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "234ba091f2d37ea925e4e38fecd7b3ed661b52a9"; - hash = "sha256-7djp/VoAWK29tcwD9mDPCTZiGeJKB8puOnlbEMgOqKQ="; + rev = "db75a6d97efdd7a3f73cc2c0ebc3f362ebce608c"; + hash = "sha256-pl6Ra7QPmM15ndl/skxE+XTqWP9oD2olcs+EQFW0U/0="; }; node_modules = stdenvNoCC.mkDerivation { From b39b1fdb234ca14ff4877c669a3b247943c1ab0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 19:20:51 -0800 Subject: [PATCH 1417/2279] python3Packages.behave: 1.2.7.dev5 -> 1.3.3 Diff: https://github.com/behave/behave/compare/v1.2.7.dev5...v1.3.3 Changelog: https://github.com/behave/behave/blob/v1.3.3/CHANGES.rst --- .../python-modules/behave/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 1600e3e0ed57..3e7ff095fe1c 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -2,17 +2,18 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, buildPythonPackage, python, - pythonOlder, pytestCheckHook, assertpy, + chardet, + freezegun, mock, path, pyhamcrest, pytest-html, colorama, + cucumber-expressions, cucumber-tag-expressions, parse, parse-type, @@ -22,41 +23,34 @@ buildPythonPackage rec { pname = "behave"; - version = "1.2.7.dev5"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "behave"; repo = "behave"; - rev = "v${version}"; - hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA="; + tag = "v${version}"; + hash = "sha256-sHsnBeyl0UJ0f7WcTUc+FhUxATh84RPxVE3TqGYosrs="; }; - patches = [ - # fix tests: https://github.com/behave/behave/pull/1214 - (fetchpatch2 { - url = "https://github.com/behave/behave/pull/1214/commits/98b63a2524eff50ce1dc7360a46462a6f673c5ea.patch?full_index=1"; - hash = "sha256-MwODEm6vhg/H8ksp5XBBP5Uhu2dhB5B1T6Owkxpy3v0="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook assertpy + chardet + freezegun mock path pyhamcrest pytest-html ]; - doCheck = pythonOlder "3.12"; - pythonImportsCheck = [ "behave" ]; dependencies = [ colorama + cucumber-expressions cucumber-tag-expressions parse parse-type @@ -80,7 +74,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/behave/behave/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/behave/behave/blob/${src.tag}/CHANGES.rst"; homepage = "https://github.com/behave/behave"; description = "Behaviour-driven development, Python style"; mainProgram = "behave"; From b200d32e6c91425eae943c0cff6d0faa983668f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 03:40:08 +0000 Subject: [PATCH 1418/2279] python3Packages.schedula: 1.5.69 -> 1.5.70 --- pkgs/development/python-modules/schedula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix index 395a46fe100a..0a411a9fa3bf 100644 --- a/pkgs/development/python-modules/schedula/default.nix +++ b/pkgs/development/python-modules/schedula/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "schedula"; - version = "1.5.69"; + version = "1.5.70"; pyproject = true; src = fetchFromGitHub { owner = "vinci1it2000"; repo = "schedula"; tag = "v${version}"; - hash = "sha256-4TIppCYfCIf5mEqBeuX/pP27RyAI40es1ULidb+i+o8="; + hash = "sha256-F/mP9z+FfcOXZx8neVg5hbCNORaqwrF0jjhcs1jXFEE="; }; build-system = [ setuptools ]; From 29757fe4ac3a469e61954f53308da03d542144ce Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 7 Nov 2025 11:48:16 +0800 Subject: [PATCH 1419/2279] dopamine: 3.0.0-preview.40 -> 3.0.0 Diff: https://github.com/digimezzo/dopamine/compare/v3.0.0-preview.40...v3.0.0 Changelog: https://github.com/digimezzo/dopamine/blob/3.0.0/CHANGELOG.md --- pkgs/by-name/do/dopamine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index 181df75dfbb4..50a0011e28d2 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "dopamine"; - version = "3.0.0-preview.40"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-Cd0qUNkUXup9l3/tzagswY/MUgx4cCnXcML7c5ZSo4k="; + hash = "sha256-kvXan5J+rxJ/ugcEz9xytq3eQG0saWrYZjF7O1d6rTA="; }; extraInstallCommands = From f8d747b52be09d4f83235d913de70dc248712b9b Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 7 Nov 2025 11:58:14 +0800 Subject: [PATCH 1420/2279] pocket-id: 1.14.2 -> 1.15.0 Diff: https://github.com/pocket-id/pocket-id/compare/v1.14.2...v1.15.0 Changelog: https://github.com/pocket-id/pocket-id/releases/tag/v1.15.0 --- pkgs/by-name/po/pocket-id/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 6d4a3087ce73..f51345721410 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -11,13 +11,13 @@ buildGo125Module (finalAttrs: { pname = "pocket-id"; - version = "1.14.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-0x80oykzMTEsuGUBtXXdKgWJld8mrDPUssYpAznqKnc="; + hash = "sha256-mnmBwQ79sScTPM4Gh9g0x/QTmqm1TgxaOkww+bvs1b4="; }; sourceRoot = "${finalAttrs.src.name}/backend"; From ff3cc409508eb014149bfcf4e9808c37b21ecf07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 03:59:18 +0000 Subject: [PATCH 1421/2279] weaver: 0.18.0 -> 0.19.0 --- pkgs/by-name/we/weaver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index aa8a0bd7f52b..3adee4a722f6 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-kEGz6alm+P6zKR4vxzsyZ67R99tVBjEIK0OEx6SzdvQ="; + hash = "sha256-6rBgGU+6/EZaKkDdbRZPY+5ZS2mnUiPIPymhVpqVPX0="; }; - cargoHash = "sha256-//nPXBUi7swKPusaamSJdsUTObnyh+wNc7i8CoyGWrU="; + cargoHash = "sha256-9i+6xqOUUSWBPeoqgO9TpS2AkVLRB1CCZfMrPsZj8JQ="; checkFlags = [ # Skip tests requiring network From 988431a27fc59498988952d1ab0a22d06ea22dc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:03:51 +0000 Subject: [PATCH 1422/2279] luau-lsp: 1.55.0 -> 1.56.1 --- pkgs/by-name/lu/luau-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index aed342c18c23..176a8c7532a2 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.55.0"; + version = "1.56.1"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-ZrvPZi3ss83onsinyAl1AlQmV6jFctW8agYO9ieJtno="; + hash = "sha256-IRBVLLWycc4zkjR82jAEcTlmDgXSLbaAA7ejSIYm41U="; fetchSubmodules = true; }; From 7a9dca80dd65da4901ec7f0b3e8be7c0474a2f74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:04:59 +0000 Subject: [PATCH 1423/2279] adminneo: 5.1.1 -> 5.2.0 --- pkgs/by-name/ad/adminneo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix index 962d9c4ecb07..f2922edebaed 100644 --- a/pkgs/by-name/ad/adminneo/package.nix +++ b/pkgs/by-name/ad/adminneo/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adminneo"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "adminneo-org"; repo = "adminneo"; tag = "v${finalAttrs.version}"; - hash = "sha256-ckz0LvKLY6xm3thPmY/ry8G5kkt29rmDsG/D6NNeRoY="; + hash = "sha256-x92APmqRbH9XxMJjQASwHAgD0SWTK63MMYwkbiEq7U8="; }; nativeBuildInputs = [ From 3cd3fc55022bab92903f15080ac2927228095257 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:26:15 +0000 Subject: [PATCH 1424/2279] git-buildpackage: 0.9.38 -> 0.9.39 --- pkgs/by-name/gi/git-buildpackage/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-buildpackage/package.nix b/pkgs/by-name/gi/git-buildpackage/package.nix index 91d0e1488111..a91a9ca09cbf 100644 --- a/pkgs/by-name/gi/git-buildpackage/package.nix +++ b/pkgs/by-name/gi/git-buildpackage/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication rec { pname = "git-buildpackage"; - version = "0.9.38"; + version = "0.9.39"; pyproject = true; src = fetchFromGitHub { owner = "agx"; repo = "git-buildpackage"; tag = "debian/${version}"; - hash = "sha256-dZ/uJLcDPkpwIz+Y6WInJ4XlSJ5zzDY65li/xghsJTQ="; + hash = "sha256-glj0WtlZb42wetD5sKHbWvgPOZ/lQofPYtChuk3rie0="; fetchSubmodules = true; }; From 5f65e4a88f9e72032f65c9c225e9fd88e713d67d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:27:29 +0000 Subject: [PATCH 1425/2279] python3Packages.txtai: 9.0.1 -> 9.1.0 --- pkgs/development/python-modules/txtai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index c79a1a6fc36f..0139a000f1ff 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -93,7 +93,7 @@ pytestCheckHook, }: let - version = "9.0.1"; + version = "9.1.0"; agent = [ mcpadapt smolagents @@ -241,7 +241,7 @@ let owner = "neuml"; repo = "txtai"; tag = "v${version}"; - hash = "sha256-ciQDKpqTdgYe4oIgd2uxY7491SMr9Snha9XyTpxgXyY="; + hash = "sha256-5wr9fTfLVwGksD/+wbw4CktSznDi/xI/WfZBG3+BNYc="; }; in buildPythonPackage { From fcacfd0484bbc9e7363c5c4d62fe6c13f42159c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:30:23 +0000 Subject: [PATCH 1426/2279] yaneuraou: 8.60 -> 9.01 --- pkgs/by-name/ya/yaneuraou/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yaneuraou/package.nix b/pkgs/by-name/ya/yaneuraou/package.nix index f0f8280db1be..644b503fad90 100644 --- a/pkgs/by-name/ya/yaneuraou/package.nix +++ b/pkgs/by-name/ya/yaneuraou/package.nix @@ -43,13 +43,13 @@ # with clangStdenv. clangStdenv.mkDerivation (finalAttrs: { pname = "yaneuraou"; - version = "8.60"; + version = "9.01"; src = fetchFromGitHub { owner = "yaneurao"; repo = "YaneuraOu"; tag = "v${finalAttrs.version}git"; - hash = "sha256-1awnGCGIdeMAqAd0TWgoJr5spJo2mFBWdR3iMc2i4OM="; + hash = "sha256-uhr3jS+ttN5pF1zZpHq2xWy3sdMV19eRUhuj2uPspak="; }; sourceRoot = "${finalAttrs.src.name}/source"; From 163349185c6aa8e08434f13e296ba4e29512b99f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:36:51 +0000 Subject: [PATCH 1427/2279] libretro-shaders-slang: 0-unstable-2025-10-30 -> 0-unstable-2025-11-06 --- pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 4d294e14732f..239c3845eddb 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-10-30"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "bb15fc268529cad6132f288f90e87c07c37212e3"; - hash = "sha256-EVthZs6zrqJYWpTPae8ZNxY9J69YauVxr45MQ0OXQc4="; + rev = "edfb56fe7b0951348b7253846dc7a5bd56a765a7"; + hash = "sha256-xmSAz6iZJe7SAgfc290b326URdYdogDNm62YTiypqPg="; }; dontConfigure = true; From 92c20cac07ceac379d35ae77d43b1e908e8f73cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:58:13 +0000 Subject: [PATCH 1428/2279] vscode-extensions.danielsanmedium.dscodegpt: 3.14.158 -> 3.14.172 --- 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 b04d7fe3466f..a81a712af099 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1154,8 +1154,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.14.158"; - hash = "sha256-c+5CJqjn7dmwDgNcaaDBapi3T8OI+5UnPJj9+t8sWng="; + version = "3.14.172"; + hash = "sha256-bJnGao3RrbjeMSkRkakM6UA9piYGEzwMInoBOev2YeM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; From e992ba914307ec078417f83d67cdf7a85c0c4829 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 04:58:36 +0000 Subject: [PATCH 1429/2279] mdserve: 0.5.0 -> 0.5.1 --- pkgs/by-name/md/mdserve/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix index b87d34793030..3e6ddf1b91c1 100644 --- a/pkgs/by-name/md/mdserve/package.nix +++ b/pkgs/by-name/md/mdserve/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdserve"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jfernandez"; repo = "mdserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-dYB49+vLcokCnJ8yH0ab+Ns/RPLzdxTN/PmkaKc+THs="; + hash = "sha256-tycFsE/jGh5OYD5ewv12vvOhhlbYtlvANk6BhDW38hw="; }; - cargoHash = "sha256-KszPB5xpfLw7DA/yMl5o6yRn5lHLF+6EAXnEdhD0qFE="; + cargoHash = "sha256-otEa6+IdKHJAT+lPptXgnP5yggTkB3uYfbGhSKTXodo="; __darwinAllowLocalNetworking = true; From 2f3e3c587c82f379aa743b6b902789953d8d4566 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 05:23:02 +0000 Subject: [PATCH 1430/2279] coder: 2.26.3 -> 2.27.3 --- pkgs/by-name/co/coder/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix index ab969d17d3c7..a864f1b36896 100644 --- a/pkgs/by-name/co/coder/package.nix +++ b/pkgs/by-name/co/coder/package.nix @@ -15,15 +15,6 @@ let channels = { stable = { - version = "2.26.3"; - hash = { - x86_64-linux = "sha256-CqV3fCx3TtMLFjzo0Y7/vpAgXyOLABiFyqS8N5pA6xc="; - x86_64-darwin = "sha256-PDPU3k1Bao5ibLFx3Zjbh1xsxSpJWUOOHuRbuwMmYDg="; - aarch64-linux = "sha256-iq9LPHK6wPSdDRQqWRPr7OfN/HoESIIkOxf9luRS9ck="; - aarch64-darwin = "sha256-n+jUocq1MaDRe14gibeA+ujLoGcSCdKQ58wihcTmdlI="; - }; - }; - mainline = { version = "2.27.3"; hash = { x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA="; @@ -32,6 +23,15 @@ let aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI="; }; }; + mainline = { + version = "2.28.0"; + hash = { + x86_64-linux = "sha256-Z56Q5ETE3wpBJPIaZ9/qgAJ8Tj67L1ScDwuAk0Ijjkc="; + x86_64-darwin = "sha256-tydx9Q32TvPF36+meoQ+NBQ7MXUHRPHBI4L7UNBhXQ0="; + aarch64-linux = "sha256-x7WErWe3p6Cdr2moKG0X/DEY+dkeMhnaG2RUNWfyoQU="; + aarch64-darwin = "sha256-jVK599hDIhWy0HOhJmPevhnZnYLylxmZ59rhrOSRGIU="; + }; + }; }; in stdenvNoCC.mkDerivation (finalAttrs: { From e6befdcbbac2bfdc136d4bfab85cdd64db06849e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 05:30:32 +0000 Subject: [PATCH 1431/2279] python3Packages.django-import-export: 4.3.12 -> 4.3.13 --- .../python-modules/django-import-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index b0788bb9de88..1985e90bda49 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.12"; + version = "4.3.13"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-52nlqgKWh37Qr5UvCRBEPz2WHb2BU987+Ibt9yQyFVM="; + hash = "sha256-LE3eNHdPHFH4xVrMzQeOwRlJh4v7rmLTHdNGMQMgo6I="; }; pythonRelaxDeps = [ "tablib" ]; From c751424de8f96df20625c56cc01f71c774c7c4a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 05:37:36 +0000 Subject: [PATCH 1432/2279] plasma-panel-colorizer: 5.0.1 -> 5.2.1 --- pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index f719ae5e3e41..7fbdf809b4f0 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "5.0.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-E6VX2naAS2xof5sdnuaSuKueIKecW0fi9SycgLVRQVU="; + hash = "sha256-QyW3F0PwTSE6wUNW3pwI/Xj9/7Rxl0GXJ6W02oZBeKU="; }; nativeBuildInputs = [ From 3e8eab7a26d291b7c8756ffa3bdd35c9da129800 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 05:38:31 +0000 Subject: [PATCH 1433/2279] terraform-providers.splunk-terraform_signalfx: 9.22.2 -> 9.22.3 --- .../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 6b094731b9e2..150cbea2630d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1237,11 +1237,11 @@ "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw=" }, "splunk-terraform_signalfx": { - "hash": "sha256-kErd5DLViYA9yHyBAHxntPRJET9QmpCMWcpbFx/Qwhk=", + "hash": "sha256-nhep3042bOUSQKCsS8gOIYLImgXnHmBNsDlXWOCixwI=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.22.2", + "rev": "v9.22.3", "spdx": "MPL-2.0", "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320=" }, From 132e07e198e2aa85584896f995528b245523e62c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 7 Nov 2025 02:40:18 -0300 Subject: [PATCH 1434/2279] heroic-unwrapped: bump electron version --- pkgs/by-name/he/heroic-unwrapped/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 68cf15bb57b6..40ddf2d279fa 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -9,7 +9,7 @@ python3, makeWrapper, # Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL. - electron_36, + electron_37, vulkan-helper, gogdl, nile, @@ -21,7 +21,7 @@ let legendary = callPackage ./legendary.nix { }; epic-integration = callPackage ./epic-integration.nix { }; comet-gog = comet-gog_heroic; - electron = electron_36; + electron = electron_37; in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; @@ -119,12 +119,12 @@ stdenv.mkDerivation (finalAttrs: { inherit epic-integration legendary; }; - meta = with lib; { + meta = { description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac"; homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ iedame ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ iedame ]; # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform. # It may also work on other Linux targets, but all the game stores only # support x86 Linux, so it would require extra hacking to run games via QEMU From 3113ec6fa27abcadae10033ecbf9f61fcf824d6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 05:54:44 +0000 Subject: [PATCH 1435/2279] gcsfuse: 3.4.3 -> 3.4.4 --- pkgs/by-name/gc/gcsfuse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 1f027aa60d47..7d0494036f68 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gcsfuse"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-fjZdBf7tUMlAqumTz8b5LDqIcLstr56ugGmdsPb/FBI="; + hash = "sha256-UeYKgxBdxH7GQmPeO82CKR1RWzWCYCSUUc0nQX5VLjg="; }; vendorHash = "sha256-BirzhmYwFSs2poA5tNOlK2bDO71mCkgSck7fE9la2wA="; From e33f7789bb10e431dbc006ca813aea4a39ffa068 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 05:55:07 +0000 Subject: [PATCH 1436/2279] python3Packages.langsmith: 0.4.38 -> 0.4.41 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 81eda030ba69..1607f4b261a9 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.4.38"; + version = "0.4.41"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-uBCR3rKcsbgPW/x1V7BVii+NhFigmMxaWesB+vzHAuo="; + hash = "sha256-hZRZ4IAPKxCtvDZfk9D5irkYk0KM6pG2l+HSq742KYw="; }; sourceRoot = "${src.name}/python"; From 708dc1602d1607ba0c69dfe300757caee3b07c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 21:49:43 -0800 Subject: [PATCH 1437/2279] python3Packages.ufo2ft: 3.6.0 -> 3.6.2 Diff: https://github.com/googlefonts/ufo2ft/compare/v3.6.0...v3.6.2 Changelog: https://github.com/googlefonts/ufo2ft/releases/tag/v3.6.1 https://github.com/googlefonts/ufo2ft/releases/tag/v3.6.2 --- .../python-modules/ufo2ft/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 871fb640c09f..5e443864e609 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -6,11 +6,10 @@ compreffor, cu2qu, defcon, - fetchPypi, + fetchFromGitHub, fontmath, fonttools, pytestCheckHook, - pythonOlder, setuptools-scm, skia-pathops, syrupy, @@ -19,14 +18,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.6.0"; + version = "3.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-hKqTjD8cTgyxHZnaojPAT5JY11okvLiNOnemoULnpmw="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "ufo2ft"; + tag = "v${version}"; + hash = "sha256-TIeq4As5nThYck5jQLTdZySfOg51DtkiiYiiWEVSzxo="; }; build-system = [ @@ -69,11 +68,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "ufo2ft" ]; - meta = with lib; { + meta = { description = "Bridge from UFOs to FontTools objects"; homepage = "https://github.com/googlefonts/ufo2ft"; - changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}"; - license = licenses.mit; + changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/${src.tag}"; + license = lib.licenses.mit; maintainers = [ ]; }; } From 25d99f033661b5d4aa95703064eb1ebdad268745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 21:44:31 -0800 Subject: [PATCH 1438/2279] python3Packages.fontmake: 3.10.1 -> 3.11.0 Diff: https://github.com/googlefonts/fontmake/compare/v3.10.1...v3.11.0 Changelog: https://github.com/googlefonts/fontmake/releases/tag/v3.11.0 --- pkgs/development/python-modules/fontmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 27a653155fb8..9cbb2ba902c2 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.10.1"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "fontmake"; tag = "v${version}"; - hash = "sha256-cHFxb7lWUj/7ATynoMGQkhArKWCHHLYvQG5IoaXwVBs="; + hash = "sha256-H3r5G+lEoIlS7mmQ1abQeZ1cD/aGskphm5X0rAshX+U="; }; build-system = [ From 1665d3827be62538a708b8205161980d861fdff0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 4 Nov 2025 15:42:08 +0100 Subject: [PATCH 1439/2279] electron_38: fix build with Rust 1.90.0 --- pkgs/development/tools/electron/common.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index dbfe917ed23d..1cc57988ff23 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -82,16 +82,14 @@ in patches = base.patches - # Fix build with Rust 1.89.0 ++ lib.optionals (lib.versionOlder info.version "38") [ + # Fix build with Rust 1.89.0 # https://chromium-review.googlesource.com/c/chromium/src/+/6624733 (fetchpatch { name = "Define-rust-no-alloc-shim-is-unstable-v2.patch"; url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch"; hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM="; }) - ] - ++ lib.optionals (lib.versionOlder info.version "38") [ # Fix build with LLVM 21+ # https://chromium-review.googlesource.com/c/chromium/src/+/6633292 (fetchpatch { @@ -99,6 +97,15 @@ in url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch"; hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY="; }) + ] + ++ lib.optionals (lib.versionOlder info.version "39") [ + # Fix build with Rust 1.90.0 + # https://chromium-review.googlesource.com/c/chromium/src/+/6875644 + (fetchpatch { + name = "Define-rust-alloc-error-handler-should-panic-v2.patch"; + url = "https://github.com/chromium/chromium/commit/23d818d3c7fba4658248f17fd7b8993199242aa9.patch"; + hash = "sha256-JVv36PgU/rr34jrhgCyf4Pp8o5j2T8fD1xBVH1avT48="; + }) ]; npmRoot = "third_party/node"; From 2b557810a05d1e5e87df5a73e66b3c8bfb6565da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 06:14:44 +0000 Subject: [PATCH 1440/2279] steam-lancache-prefill: 3.4.0 -> 3.4.1 --- pkgs/by-name/st/steam-lancache-prefill/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix index 5afe8b4be93c..d7e5162c8b43 100644 --- a/pkgs/by-name/st/steam-lancache-prefill/package.nix +++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix @@ -10,13 +10,13 @@ buildDotnetModule (finalAttrs: { pname = "steam-lancache-prefill"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "tpill90"; repo = "steam-lancache-prefill"; tag = "v${finalAttrs.version}"; - hash = "sha256-8iYAg6Cpoehnnk/JXdBLkG0QSNnD9hpqizX0jCtp3PM="; + hash = "sha256-6XBe64hAe5mPakjcTAPdwnMKsVlvCeorItLVS5cf+cI="; fetchSubmodules = true; }; From a64cdc2243a10f292ab3844d47fc4dc4d05c4aed Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 7 Nov 2025 07:16:53 +0100 Subject: [PATCH 1441/2279] gemini-cli: 0.11.3 -> 0.13.0 --- pkgs/by-name/ge/gemini-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 5f151e0010f9..23469817d376 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.11.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-43ohCUqdM0quxwoN3s/3vOq4IRc+sck+BkAfqMEDq8g="; + hash = "sha256-Y6RIFF65uzgeOKU03wibEeLtUub1iG52tljM+rHDZbg="; }; - npmDepsHash = "sha256-wqzsHBFXo5NhsFHOErxVVG9Y08daEQs6YdRZHFeOq98="; + npmDepsHash = "sha256-6YhbPj+gbSi/OvyH+dFxkTD4qVj+/7TiMQuP7f1aZYE="; nativeBuildInputs = [ jq From f428216cda05e3efc9af0cb2df35dd9507c0aef7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 06:29:48 +0000 Subject: [PATCH 1442/2279] python3Packages.json-repair: 0.52.4 -> 0.52.5 --- pkgs/development/python-modules/json-repair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index 3b1828f75e73..49df177bdf69 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.52.4"; + version = "0.52.5"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; tag = "v${version}"; - hash = "sha256-eO9F2c3hIHhxLC5j2+ZtPaj+zD7Mby44N7ULsxfAQxg="; + hash = "sha256-+WWGykTu7hOMgVKr16oay90ZkI9tYnJfluzaETpOcRw="; }; build-system = [ setuptools ]; From 55f07362912fbdf52f041e3d284967529cf8007f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 22:37:54 -0800 Subject: [PATCH 1443/2279] github-backup: 0.50.3 -> 0.51.0 Diff: https://github.com/josegonzalez/python-github-backup/compare/0.50.3...0.51.0 Changelog: https://github.com/josegonzalez/python-github-backup/blob/0.51.0/CHANGES.rst --- pkgs/by-name/gi/github-backup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index 6f0bbf6a5304..24671a330386 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.50.3"; + version = "0.51.0"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = version; - hash = "sha256-MBKBY86qIM/rgvGMvE7K9x9n+zDVtoimkVGLBxCWRmI="; + hash = "sha256-XqQw2Qu5b5Gdna8krwvkYsTPbM5p1gUBV2P7JLypqVU="; }; build-system = with python3Packages; [ From 367d085b3e3ca5b8725ca4e385c5759846a31999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 06:40:10 +0000 Subject: [PATCH 1444/2279] python3Packages.fastbencode: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/fastbencode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 34e9c83e978c..b56aca8ff290 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "fastbencode"; tag = "v${version}"; - hash = "sha256-Vn9NcJQaSF+k2TyRTAA9yMWiV+kYrfw6RIbIe99CCsg="; + hash = "sha256-fNvxeAKCHjtD9nl7Jhkzecu2CbTfOyPjdYedCPpqYgc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-r229xfSrkbDEfm/nGFuQshyP4o04US0xJiRK4oXtaYE="; + hash = "sha256-e6TaJyHfrUHampTX42rPqdjQu7myj2+zahVJS+7SzIM="; }; nativeBuildInputs = [ From 9d250a4ed10980816376727be5732ad9e97f7b11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 06:41:35 +0000 Subject: [PATCH 1445/2279] lcrq: 0.3.0 -> 0.3.1 --- pkgs/by-name/lc/lcrq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lc/lcrq/package.nix b/pkgs/by-name/lc/lcrq/package.nix index 521b713cee47..8ce9de456942 100644 --- a/pkgs/by-name/lc/lcrq/package.nix +++ b/pkgs/by-name/lc/lcrq/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "lcrq"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; - hash = "sha256-l8/mgcckc90FjcbAjGGUnXAN/GyOTQjjGvsA++VSen4="; + hash = "sha256-hNH5SdvKhNPUJWs7vpPECcBsRyNdHQF+Ot3LmyX2V3c="; }; installFlags = [ "PREFIX=$(out)" ]; From 6b6b1c534ddb2b98838cbcbddf8bf173b4cbaf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 22:50:21 -0800 Subject: [PATCH 1446/2279] github-backup: run versionCheckHook --- pkgs/by-name/gi/github-backup/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index 24671a330386..b4cb7b3ef4c8 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -1,9 +1,11 @@ { lib, python3Packages, + cacert, fetchFromGitHub, git, git-lfs, + versionCheckHook, }: python3Packages.buildPythonApplication rec { @@ -32,8 +34,13 @@ python3Packages.buildPythonApplication rec { ]) ]; - # has no unit tests - doCheck = false; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + versionCheckKeepEnvironment = [ "SSL_CERT_FILE" ]; meta = with lib; { description = "Backup a github user or organization"; From 046f13b4d26f24af7e6712029d26f379159641ca Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Thu, 6 Nov 2025 22:51:01 -0800 Subject: [PATCH 1447/2279] onetbb: 2022.2.0 -> 2022.3.0 --- pkgs/by-name/on/onetbb/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix index ad181f1464ca..f820dc7a80ac 100644 --- a/pkgs/by-name/on/onetbb/package.nix +++ b/pkgs/by-name/on/onetbb/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "onetbb"; - version = "2022.2.0"; + version = "2022.3.0"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "oneapi-src"; repo = "oneTBB"; tag = "v${finalAttrs.version}"; - hash = "sha256-ASQPAGm5e4q7imvTVWlmj5ON4fGEao1L5m2C5wF7EhI="; + hash = "sha256-HIHF6KHlEI4rgQ9Epe0+DmNe1y95K9iYa4V/wFnJfEU="; }; patches = [ @@ -39,18 +39,6 @@ stdenv.mkDerivation (finalAttrs: { # # ./fix-libtbbmalloc-dlopen.patch - - # Only enable fcf-protection on x86 based processors - # - # - (fetchpatch { - url = "https://github.com/uxlfoundation/oneTBB/commit/65d46656f56200a7e89168824c4dbe4943421ff9.patch?full_index=1"; - hash = "sha256-hhHDuvUsWSqs7AJ5smDYUP1yYZmjV2VISBeKHcFAfG4="; - }) - (fetchpatch { - url = "https://github.com/uxlfoundation/oneTBB/commit/e57411968661ab1205322ba1c84fc1cd90a306c6.patch"; - hash = "sha256-PFixW4lYqA5oy4LSwewvxgJbjVKJceRHnp8mgW9zBF0="; - }) ]; nativeBuildInputs = [ From 6a2e323fb3d310f932e02935d3f2b04920c5a6fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 07:19:08 +0000 Subject: [PATCH 1448/2279] home-assistant-custom-lovelace-modules.material-you-utilities: 2.0.21 -> 2.0.22 --- .../material-you-utilities/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix index 42bb7a201b75..bcd442717ed1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "material-you-utilities"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "material-you-utilities"; tag = version; - hash = "sha256-rGwa5vP0Wka9w1m4s6q8stqSe1QVu2US59/RnMOR8+A="; + hash = "sha256-wsNAW+0px4WhaMGSE4T0k5R4E+7c594AiwKYU+5V7rw="; }; - npmDepsHash = "sha256-Coc8SOqc2tElx3HzzUsYxc+eKkdjkbROh8LvPB2Iro8="; + npmDepsHash = "sha256-Gnr5C2VsGUtcfsRo0w8TB/NUxCK5Y20qfvYSBzL4UQ8="; postPatch = '' # Remove git dependency from rspack config From c500a1c06a82b3d782793eda68782d80a4494952 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 7 Nov 2025 04:17:56 -0300 Subject: [PATCH 1449/2279] tt-metal: fix build with cmake4 --- pkgs/by-name/tt/tt-metal/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix index dc6d877f7a02..3733045c7d62 100644 --- a/pkgs/by-name/tt/tt-metal/package.nix +++ b/pkgs/by-name/tt/tt-metal/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true) (lib.cmakeFeature "VERSION_NUMERIC" finalAttrs.version) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10") ]; preConfigure = '' From 8bf0dabc0ec81aa0157f330011af25ae0b48f8a6 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:10:53 -0800 Subject: [PATCH 1450/2279] wlock: 0-unstable-2024-09-13 -> 1.0 --- pkgs/by-name/wl/wlock/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index b6870e7fd0ff..b9001a86d369 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -9,16 +9,16 @@ libxkbcommon, wayland-scanner, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "wlock"; - version = "0-unstable-2024-09-13"; + version = "1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "sewn"; repo = "wlock"; - rev = "be975445fa0da7252f8e13b610c518dd472652d0"; - hash = "sha256-Xt7Q51RhFG+UXYukxfORIhc4Df86nxtpDhAhaSmI38A="; + tag = finalAttrs.version; + hash = "sha256-vbGrePrZN+IWwzwoNUzMHmb6k9nQbRLVZmbWIAsYneY="; }; postPatch = '' @@ -52,4 +52,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ fliegendewurst ]; mainProgram = "wlock"; }; -} +}) From 93cc30545fbc70d25a12929e3fc7d86e5e917896 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:15:44 -0800 Subject: [PATCH 1451/2279] wlock: cleanup --- pkgs/by-name/wl/wlock/package.nix | 34 +++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index b9001a86d369..a11b00955c29 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -2,13 +2,15 @@ lib, stdenv, fetchFromGitea, - libxcrypt, pkg-config, + wayland-scanner, wayland, wayland-protocols, libxkbcommon, - wayland-scanner, + libxcrypt, + nix-update-script, }: + stdenv.mkDerivation (finalAttrs: { pname = "wlock"; version = "1.0"; @@ -25,28 +27,30 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile --replace-fail 'chmod 4755' 'chmod 755' ''; - buildInputs = [ - libxcrypt - wayland - wayland-protocols - libxkbcommon - ]; - strictDeps = true; - makeFlags = [ - "PREFIX=$(out)" - ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner) - ]; - nativeBuildInputs = [ pkg-config wayland-scanner ]; + buildInputs = [ + wayland + wayland-protocols + libxkbcommon + libxcrypt + ]; + + makeFlags = [ + "PREFIX=$(out)" + ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner) + ]; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Sessionlocker for Wayland compositors that support the ext-session-lock-v1 protocol"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; homepage = "https://codeberg.org/sewn/wlock"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fliegendewurst ]; From 8b18ceb274580dbe70926fbde0618566678960ec Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 4 Nov 2025 09:17:05 -0800 Subject: [PATCH 1452/2279] wlock: add maintainer --- pkgs/by-name/wl/wlock/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix index a11b00955c29..24d7462a648a 100644 --- a/pkgs/by-name/wl/wlock/package.nix +++ b/pkgs/by-name/wl/wlock/package.nix @@ -53,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Only; homepage = "https://codeberg.org/sewn/wlock"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ fliegendewurst ]; + maintainers = with lib.maintainers; [ + fliegendewurst + yiyu + ]; mainProgram = "wlock"; }; }) From f646b17f1de30bd5986e335efd9603051b850a4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 07:34:59 +0000 Subject: [PATCH 1453/2279] libphonenumber: 9.0.17 -> 9.0.18 --- pkgs/by-name/li/libphonenumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 1d891e5fd5ae..508eb3d507df 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.17"; + version = "9.0.18"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-xw159QIBNloMks/888shAEPdfd4WKmIGDRpmJ4h2JsE="; + hash = "sha256-u+2QN72ZvsfpKAsU9R94cq+S7aKSwZtIsg+uUz/sDtU="; }; patches = [ From 2db14527806f4d7856ee57b398c52326e64da650 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Fri, 7 Nov 2025 08:36:54 +0100 Subject: [PATCH 1454/2279] claude-code: 2.0.34 -> 2.0.35 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- .../vscode/extensions/anthropic.claude-code/default.nix | 4 ++-- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 6a4f9c485d02..d430a956728f 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.34"; - hash = "sha256-e+pjuGY0xrg43+pDDkQ4Svb1yBx2Fv+Z8WZoJv/k6D4="; + version = "2.0.35"; + hash = "sha256-1wN82mZk3zCGGFQ8FNwLFm1793U8GEC8p46BJiPNaUo="; }; meta = { diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index b86d4ca4ada2..eebf0b81eb5b 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.34", + "version": "2.0.35", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.34", + "version": "2.0.35", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index da13768205ad..370e33bc8d25 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.34"; + version = "2.0.35"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-GYykbpvkFTsj7tlsAimDrNbN9kP1+8AtfG+Boch8eSk="; + hash = "sha256-cPy2xudIH1OVVzDlq5YAg1uFu59h6zDOvXpKaJ+fuP8="; }; - npmDepsHash = "sha256-D0sbwZ5eCzIobFGf5LY7u3/RWQ6bYpGFDlU/ClPTA7Y="; + npmDepsHash = "sha256-07MUZ8i6K/uLodyDM1kFnhGGkRB2uVf88CkbaAVw5jk="; postPatch = '' cp ${./package-lock.json} package-lock.json From a673976393f99dd7d21e5ea6a5b099eaa143be0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 07:38:06 +0000 Subject: [PATCH 1455/2279] lxgw-neoxihei: 1.226 -> 1.227 --- 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 65a60ef0dc19..8a261b6c1ab5 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.226"; + version = "1.227"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-rKhEnNbqQRlTepZTPM9Naau74YWRU4K22jrHYTOXKOE="; + hash = "sha256-7EJlMgY++YrUQ9BKZLOft1isc8EHuOLVoORMLMPngTI="; }; dontUnpack = true; From 98474ee82121720c5b795a6bd6b515e2d72d41f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 07:42:41 +0000 Subject: [PATCH 1456/2279] pkarr: 4.0.0 -> 5.0.1 --- pkgs/by-name/pk/pkarr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index 45b2256e15f2..1cf10145d3e8 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "pkarr"; - version = "4.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "pubky"; repo = "pkarr"; rev = "v${version}"; - hash = "sha256-9sTF5h2+vWcz5ohAoo95vldTJGQyz/ICkVpIgaxilwA="; + hash = "sha256-564JL7EG/RB2k2JdxAENpP5UZtKtaGlrZfeYOgsLBEY="; }; - cargoHash = "sha256-26OlV/Xnl1+VFOaCWUjb8LxuJWrCsfY7QTlPZ7VMBCs="; + cargoHash = "sha256-HG4cmKQleiWdYBrOgv1Aj/erWjZX5PMwIZpQSQc+sFU="; meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; From 1941f1564e4af67fa4d21c003fbaebd8890a4544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 Nov 2025 23:45:31 -0800 Subject: [PATCH 1457/2279] unit: fix build with OpenSSL 3.6 --- pkgs/by-name/un/unit/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix index eb3841fbac71..7262caef8a9a 100644 --- a/pkgs/by-name/un/unit/package.nix +++ b/pkgs/by-name/un/unit/package.nix @@ -75,6 +75,11 @@ stdenv.mkDerivation rec { ${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"} ''; + env.NIX_CFLAGS_COMPILE = toString [ + # 'EVP_PKEY_asn1_find_str' is deprecated since OpenSSL 3.6 + "-Wno-error=deprecated-declarations" + ]; + passthru.tests = { unit-perl = nixosTests.unit-perl; unit-php = nixosTests.unit-php; From 02b55c129d4035f42ca4bc13aa1339c40d35877b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 07:52:12 +0000 Subject: [PATCH 1458/2279] polarity: latest-unstable-2025-10-30 -> latest-unstable-2025-11-06 --- pkgs/by-name/po/polarity/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 6c7ed240c923..b52433049ac0 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-10-30"; + version = "latest-unstable-2025-11-06"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "309532f08f8bac21b52708ccce0cedad42f0ab39"; - hash = "sha256-s/sDx9SWrsbNuidfDNQyXeJflvwvwwMH4IEiSQ6Fh24="; + rev = "52211970b601db2e449ea6bc0a2e785d39c489c0"; + hash = "sha256-jDhkBrLbk9B9xeEZ4A7jp6at/Hp4q2A/egoFgY2xK8I="; }; - cargoHash = "sha256-DyqK5cxdsZWMr79clw8oRHTAAlzGzP8i4Vu/UXH/ptE="; + cargoHash = "sha256-cH+cgYIUPQTHgGCZmP562VzCxz+i6LkymHtnHJXnd+A="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From 216b8072dd9f9f7023ff4f8b5ef164cc05f9a616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Nov 2025 00:04:00 -0800 Subject: [PATCH 1459/2279] flet-client-flutter: fix build --- pkgs/by-name/fl/flet-client-flutter/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index cf2bbab86e8a..470a9185cad6 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -60,6 +60,10 @@ flutter329.buildFlutterApplication rec { ++ mpv-unwrapped.buildInputs ++ libplacebo.buildInputs; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=nontrivial-memcall" + ]; + passthru = { updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) From e20213f2d0d71dabae72381411aaa5cffeca6aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 7 Nov 2025 09:11:15 +0100 Subject: [PATCH 1460/2279] python3Packages.aiohttp: drop patch included in 3.13.2 This was forgotten during the update in bbf20cd77847ee. --- .../python-modules/aiohttp/default.nix | 4 ---- .../python-modules/aiohttp/remove-isal.patch | 21 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/python-modules/aiohttp/remove-isal.patch diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index d481ea44be06..35d176e3f70b 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -61,10 +61,6 @@ buildPythonPackage rec { hash = "sha256-LqYGrrWgSZazk0hjQvTFwqtU/PtMEaPi+m1Ya8Ds+pU="; }; - patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [ - ./remove-isal.patch - ]; - postPatch = '' rm -r vendor patchShebangs tools diff --git a/pkgs/development/python-modules/aiohttp/remove-isal.patch b/pkgs/development/python-modules/aiohttp/remove-isal.patch deleted file mode 100644 index 4a91fca368ae..000000000000 --- a/pkgs/development/python-modules/aiohttp/remove-isal.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index 62fb04f2e..bb5b279dd 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -12,7 +12,6 @@ from typing import Any, AsyncIterator, Callable, Generator, Iterator - from unittest import mock - from uuid import uuid4 - --import isal.isal_zlib - import pytest - import zlib_ng.zlib_ng - from blockbuster import blockbuster_ctx -@@ -333,7 +332,7 @@ def unused_port_socket() -> Generator[socket.socket, None, None]: - s.close() - - --@pytest.fixture(params=[zlib, zlib_ng.zlib_ng, isal.isal_zlib]) -+@pytest.fixture(params=[zlib, zlib_ng.zlib_ng]) - def parametrize_zlib_backend( - request: pytest.FixtureRequest, - ) -> Generator[None, None, None]: From 39581a0fe6155ad6bdc5cc0818e1fdff3e62c2e1 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Sat, 18 Oct 2025 03:52:56 +0300 Subject: [PATCH 1461/2279] limbo: rename to turso --- pkgs/by-name/{li/limbo => tu/tursodb}/package.nix | 14 +++++++------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/by-name/{li/limbo => tu/tursodb}/package.nix (73%) diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/tu/tursodb/package.nix similarity index 73% rename from pkgs/by-name/li/limbo/package.nix rename to pkgs/by-name/tu/tursodb/package.nix index 306962ff40dc..f0d1e1394d63 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/tu/tursodb/package.nix @@ -6,12 +6,12 @@ nix-update-script, }: rustPlatform.buildRustPackage rec { - pname = "limbo"; + pname = "tursodb"; version = "0.0.14"; src = fetchFromGitHub { owner = "tursodatabase"; - repo = "limbo"; + repo = "turso"; tag = "v${version}"; hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4="; }; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" - "limbo" + "turso_cli" ]; cargoTestFlags = cargoBuildFlags; @@ -31,11 +31,11 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = { - description = "Interactive SQL shell for Limbo"; - homepage = "https://github.com/tursodatabase/limbo"; - changelog = "https://github.com/tursodatabase/limbo/blob/v${version}/CHANGELOG.md"; + description = "Interactive SQL shell for Turso"; + homepage = "https://github.com/tursodatabase/turso"; + changelog = "https://github.com/tursodatabase/turso/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nartsiss ]; - mainProgram = "limbo"; + mainProgram = "tursodb"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8cf4433b21b4..af7b786208b3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -839,6 +839,7 @@ mapAliases { lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03 lima-bin = warnAlias "lima-bin has been replaced by lima" lima; # Added 2025-05-13 + limbo = warnAlias "limbo has been renamed to turso" turso; # Added 2025-11-07 lincity_ng = warnAlias "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09 linphone = linphonePackages.linphone-desktop; # Added 2025-09-20 linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01 From 785183dbc417d299c7ec2d44c46106d3c8ee5589 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Sat, 18 Oct 2025 03:58:57 +0300 Subject: [PATCH 1462/2279] turso: 0.0.14 -> 0.3.2 --- .../by-name/tu/{tursodb => turso}/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) rename pkgs/by-name/tu/{tursodb => turso}/package.nix (67%) diff --git a/pkgs/by-name/tu/tursodb/package.nix b/pkgs/by-name/tu/turso/package.nix similarity index 67% rename from pkgs/by-name/tu/tursodb/package.nix rename to pkgs/by-name/tu/turso/package.nix index f0d1e1394d63..f2315e5499a8 100644 --- a/pkgs/by-name/tu/tursodb/package.nix +++ b/pkgs/by-name/tu/turso/package.nix @@ -5,26 +5,27 @@ versionCheckHook, nix-update-script, }: -rustPlatform.buildRustPackage rec { - pname = "tursodb"; - version = "0.0.14"; +rustPlatform.buildRustPackage (finalAttrs: { + pname = "turso"; + version = "0.3.2"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso"; - tag = "v${version}"; - hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-biElXD4d6h28Nq7LIjuL+at/y69TxnsJzvnEX8cOM9E="; }; - cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k="; + cargoHash = "sha256-G2VowcxnCRulQ4pJcpfJbH73vkG+KIteeUF1Hq8TEZg="; cargoBuildFlags = [ "-p" "turso_cli" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; versionCheckProgramArg = "--version"; @@ -33,9 +34,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Interactive SQL shell for Turso"; homepage = "https://github.com/tursodatabase/turso"; - changelog = "https://github.com/tursodatabase/turso/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/tursodatabase/turso/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "tursodb"; }; -} +}) From a6c5eda96ca634901ee715f29107ec36d34769b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 08:37:07 +0000 Subject: [PATCH 1463/2279] crosvm: 0-unstable-2025-10-30 -> 0-unstable-2025-11-05 --- pkgs/by-name/cr/crosvm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 4b82ac879d6d..e4efa7ff3062 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-10-30"; + version = "0-unstable-2025-11-05"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "7f9512777db72a1e89ba0880af7bc5467ee461bf"; - hash = "sha256-ptx9JA/uyH05r/NvgtK4ppifOiW/zjl7Bsy7vgBYkjI="; + rev = "cc4086ef67b347624ae2dbe3e435824e1ecedffb"; + hash = "sha256-wo0opn5oZT0jPno1lLxBkEOullERh0GB95tQSvCBSrs="; fetchSubmodules = true; }; From 4a2defed1c54656066f31d16e3bf48999d517acc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 08:40:24 +0000 Subject: [PATCH 1464/2279] tutanota-desktop: 310.251008.0 -> 314.251030.0 --- pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index 4aa4f6cc0020..66e0afc45c46 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -8,11 +8,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "310.251008.0"; + version = "314.251030.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-HMwfSMEEP3+CWSiThiEGbCkLiKndmLyt4KIZ4fPHCxM="; + hash = "sha256-xGErTMDLJOQIRxFavo8lOZUjTyUvVOD10Df4EPNF+eo="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From 15fdf4269cdbcd0297a727a1ded1cfb3e12b4644 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 08:49:35 +0000 Subject: [PATCH 1465/2279] velero: 1.17.0 -> 1.17.1 --- pkgs/by-name/ve/velero/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index d6bc2e960d62..433196cdd82e 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "velero"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; tag = "v${finalAttrs.version}"; - hash = "sha256-2hffuTcz6mBwrEjCMhZqrDvNbC5m6lK3vM9umgV4l+0="; + hash = "sha256-ZVnYHBcnYOCBFJ9wyvMDrRIf3NyDV1Zqqf7e6JbA+go="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-khG/6mSYOCKBjTY+JyakFD65bLWLXpcQKPlhPT31uxc="; + vendorHash = "sha256-AuvJmHRAmxKduP6q7k81GapGbGLS4x7cwccSnZWvPwI="; excludedPackages = [ "issue-template-gen" From 2a26bbf3e409acee762d92b8a7c34c278d840a55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 08:53:22 +0000 Subject: [PATCH 1466/2279] python3Packages.elevenlabs: 2.21.0 -> 2.22.0 --- pkgs/development/python-modules/elevenlabs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index c42af62a6c95..962e47f0d702 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.21.0"; + version = "2.22.0"; tag = "v${version}"; in buildPythonPackage { @@ -25,7 +25,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-jDpTCflRPfm13ZFA5OUsl1bsFZ8ftSbf23BtgcpL5pQ="; + hash = "sha256-tSPMHEvce4lRT2weyDl6EFONCT8dRGgLfGptNuTdAPc="; }; build-system = [ poetry-core ]; From f5b2c296d509bb76f1a6fb99d775ff08d6cdf39c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 08:58:07 +0000 Subject: [PATCH 1467/2279] typos: 1.38.1 -> 1.39.0 --- pkgs/by-name/ty/typos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 68e025f314c8..c81d03799e06 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.38.1"; + version = "1.39.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-xr3k3wx9EWKm00kt1GxE31Mw5wa3N3VJJCKaUbQa4ic="; + hash = "sha256-S4toajgpKtPfvr6hhXE59lt0HPDHK/hF5vJJtxR0lTM="; }; - cargoHash = "sha256-2XgnCXYqBvx7LRWaPt4iXznIXIEzYBlWMXbwEVZyGA8="; + cargoHash = "sha256-DFbWFhj7ixO1kpgJNDIrtZ+FZfc4GEyw4AnwlTCXw4w="; passthru.updateScript = nix-update-script { }; From 00d3ea593e74a8187e8691383ec56a4a58c303d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 09:12:37 +0000 Subject: [PATCH 1468/2279] plantuml: 1.2025.9 -> 1.2025.10 --- pkgs/by-name/pl/plantuml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index 129f45843867..fad0e753dba9 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2025.9"; + version = "1.2025.10"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-sQeOboLmTsHeT5Gk/hSBs9IsMMqiYrjThv7OSAIvyNg="; + hash = "sha256-fUFZrW8LD6M1WV6I2pYigr9rJaDlo0OLY8NZdB+w2yk="; }; nativeBuildInputs = [ From 2b0fb592f10efe58179119efcbe538bd94a64fc4 Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Fri, 25 Apr 2025 13:22:20 +0200 Subject: [PATCH 1469/2279] python313Packages.rospkg: init at 1.6.0 --- .../python-modules/rospkg/default.nix | 49 +++++++++++++++++++ .../python-modules/rospkg/setup-hook.sh | 1 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/rospkg/default.nix create mode 100644 pkgs/development/python-modules/rospkg/setup-hook.sh diff --git a/pkgs/development/python-modules/rospkg/default.nix b/pkgs/development/python-modules/rospkg/default.nix new file mode 100644 index 000000000000..5445aa1023dc --- /dev/null +++ b/pkgs/development/python-modules/rospkg/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + catkin-pkg, + distro, + distutils, + fetchFromGitHub, + pytestCheckHook, + pyyaml, + setuptools, +}: + +buildPythonPackage rec { + pname = "rospkg"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ros-infrastructure"; + repo = "rospkg"; + tag = version; + hash = "sha256-6nfdY+p3P3iGuj+7Lo7ybsZ+1x104m7WzGgxr8dDDuw="; + }; + + build-system = [ setuptools ]; + + setupHook = ./setup-hook.sh; + + dependencies = [ + catkin-pkg + distro + distutils + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportCheck = [ "rospkg" ]; + + meta = { + description = "ROS package library for Python"; + homepage = "http://wiki.ros.org/rospkg"; + changelog = "https://github.com/ros-infrastructure/rospkg/blob/${version}/CHANGELOG.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ guelakais ]; + }; +} diff --git a/pkgs/development/python-modules/rospkg/setup-hook.sh b/pkgs/development/python-modules/rospkg/setup-hook.sh new file mode 100644 index 000000000000..cb4a79899a71 --- /dev/null +++ b/pkgs/development/python-modules/rospkg/setup-hook.sh @@ -0,0 +1 @@ +export ROS_OS_OVERRIDE=nixos diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71da13207798..2378512f6376 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16212,6 +16212,8 @@ self: super: with self; { rosbags = callPackage ../development/python-modules/rosbags { }; + rospkg = callPackage ../development/python-modules/rospkg { }; + rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { }; rouge-score = callPackage ../development/python-modules/rouge-score { }; From 53c2098b345f7330ab75b7831e8dfdfdc8ec41d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 09:49:26 +0000 Subject: [PATCH 1470/2279] nu_scripts: 0-unstable-2025-10-15 -> 0-unstable-2025-11-02 --- pkgs/by-name/nu/nu_scripts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index bc12cbaf6c8d..41a510f961a1 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-10-15"; + version = "0-unstable-2025-11-02"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "0b97c5e1444b13db7c263bee646dea1e1ffe4ddb"; - hash = "sha256-tKMLaSNniylbo9f0wdUzUZm059RPqyFQlxMtiTPIkWQ="; + rev = "449dd3d06598714c2ba0ee3fa3556e24d034c624"; + hash = "sha256-4ibgz7y1fsBn2aDuptqpdLd4Wdfx2sKGs7wVRJxCWW0="; }; installPhase = '' From 51408cf1b1f6f12a79c9f3533315393f41765722 Mon Sep 17 00:00:00 2001 From: Klaus Frank <2544867+agowa@users.noreply.github.com> Date: Sun, 31 Aug 2025 14:15:01 +0200 Subject: [PATCH 1471/2279] biglybt: Fix swt and add add platforms --- pkgs/by-name/bi/biglybt/package.nix | 19 ++++++++++++++++++- pkgs/by-name/sw/swt/package.nix | 11 +++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix index ef6fa1cd71e7..63619e92bbfe 100644 --- a/pkgs/by-name/bi/biglybt/package.nix +++ b/pkgs/by-name/bi/biglybt/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + swt, fetchurl, jre, wrapGAppsHook3, @@ -16,7 +17,18 @@ stdenv.mkDerivation rec { hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4="; }; - nativeBuildInputs = [ wrapGAppsHook3 ]; + nativeBuildInputs = [ + swt + wrapGAppsHook3 + ]; + + buildInputs = [ + swt + ]; + + runtimeDeps = [ + swt + ]; configurePhase = '' runHook preConfigure @@ -34,6 +46,11 @@ stdenv.mkDerivation rec { cp -r ./* $out/share/biglybt/ + ln -s ${swt}/lib/* $out/share/biglybt/ + rm -rf $out/share/biglybt/swt/*.jar $out/share/biglybt/swt/J17/*.jar + ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/swt-$(uname -m).jar + ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/J17/swt-$(uname -m).jar + ln -s $out/share/biglybt/biglybt.desktop $out/share/applications/ ln -s $out/share/biglybt/biglybt.svg $out/share/icons/hicolor/scalable/apps/ diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index 75b6c994da35..da7139ae86b1 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -17,10 +17,21 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; passthru.srcMetadataByPlatform = { + # Note: This may look like an error but the content of the src.zip is in fact + # equal on all linux systems as well as all darwin systems. Even though each + # of these zip archives themselves contains a different hash. x86_64-linux.platform = "gtk-linux-x86_64"; x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; + aarch64-linux.platform = "gtk-linux-aarch64"; + aarch64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; + ppc64le-linux.platform = "gtk-linux-ppc64le"; + ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; + riscv64-linux.platform = "gtk-linux-riscv64"; + riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; x86_64-darwin.platform = "cocoa-macosx-x86_64"; x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI="; + aarch64-darwin.platform = "cocoa-macosx-aarch64"; + aarch64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI"; }; passthru.srcMetadata = finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null; From 8c96f6aec9c3d202e56cf46cacf7e0216edf54e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 10:27:46 +0000 Subject: [PATCH 1472/2279] vscode-extensions.saoudrizwan.claude-dev: 3.35.0 -> 3.36.1 --- .../vscode/extensions/saoudrizwan.claude-dev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index c241ce3317ce..bb2eba5d4764 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.35.0"; - hash = "sha256-fPoSrpWHfDEGLbawTVV65MAQAXWUy6WTb7ijhKaoLvc="; + version = "3.36.1"; + hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g="; }; meta = { From de5156391e0a8290bdd8b8d172e603f5dc8c0769 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 10:43:57 +0000 Subject: [PATCH 1473/2279] aliyun-cli: 3.1.0 -> 3.1.2 --- pkgs/by-name/al/aliyun-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 2c518e3952c5..f111d93990d1 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-5gwI2lhEMkKZZnYwzyegVm8EByox1XexHjW799vVeLE="; + hash = "sha256-8nwCVhUMQLXnWcrA9XSOM6R+Y7E+H+gwSYXDjk2WtAs="; fetchSubmodules = true; }; From d28ccdc34da42f9ae2111e223fe3969d4f2a8d28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 11:04:28 +0000 Subject: [PATCH 1474/2279] cpuinfo: 0-unstable-2025-09-05 -> 0-unstable-2025-11-06 --- pkgs/by-name/cp/cpuinfo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 65424033c77d..b91e4c0c257e 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2025-09-05"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "877328f188a3c7d1fa855871a278eb48d530c4c0"; - hash = "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc="; + rev = "f01ce870215f9e5d4c32006796994469c5334fd7"; + hash = "sha256-v6U+Z5YHHSP0WUPxQ0G2zpP4a2D4I+BfhdY6q5BylBo="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cpu-info"; maintainers = with lib.maintainers; [ pawelchcki ]; pkgConfigModules = [ "libcpuinfo" ]; - # https://github.com/pytorch/cpuinfo/blob/877328f188a3c7d1fa855871a278eb48d530c4c0/CMakeLists.txt#L98 + # https://github.com/pytorch/cpuinfo/blob/f01ce870215f9e5d4c32006796994469c5334fd7/CMakeLists.txt#L98 platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv; }; }) From 4b0777a6115177a8161b474bc37db096f7a30881 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 11:11:23 +0000 Subject: [PATCH 1475/2279] usacloud: 1.19.2 -> 1.19.3 --- pkgs/by-name/us/usacloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix index 95b59318b802..6111d773cefe 100644 --- a/pkgs/by-name/us/usacloud/package.nix +++ b/pkgs/by-name/us/usacloud/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "usacloud"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "sacloud"; repo = "usacloud"; tag = "v${version}"; - hash = "sha256-Yci2mka92covvddDehT5PkEdmaUnS2rhPn7FT3oCvks="; + hash = "sha256-uHZJnhj36NEAZxWfwrm0Dsw42NgQp37SgOduEGA8SEU="; }; - vendorHash = "sha256-sSM7ZdGknhVvccKJtkwPmzwXEPRzUmxGlGojasqpul8="; + vendorHash = "sha256-bJV/m3b6UC3j1/SGJ7riz0GRxoCQ6lVU5DiatQWnIVc="; ldflags = [ "-s" From 226f0ae3f3f6982dc051d800449a66424764fc25 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 16 Oct 2025 12:32:42 +0200 Subject: [PATCH 1476/2279] mastodon: 4.4.8 -> 4.5.0 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.5.0 Co-authored-by: Izorkin --- nixos/modules/services/web-apps/mastodon.nix | 6 + pkgs/servers/mastodon/default.nix | 8 +- pkgs/servers/mastodon/gemset.nix | 805 +++++++++---------- pkgs/servers/mastodon/missing-hashes.json | 74 +- pkgs/servers/mastodon/source.nix | 6 +- 5 files changed, 439 insertions(+), 460 deletions(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index c1582b3ee9ff..9d71b8112cf4 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -838,6 +838,12 @@ in )); message = "There must be exactly one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\"."; } + { + assertion = + databaseActuallyCreateLocally + -> lib.versionAtLeast config.services.postgresql.finalPackage.version "14"; + message = "Mastodon requires at least PostgreSQL 14."; + } ]; environment.systemPackages = [ mastodonTootctl ]; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 7614aae7bc6c..48e0e7155f6f 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -80,9 +80,11 @@ stdenv.mkDerivation rec { find public/assets -type f -regextype posix-extended -iregex '.*\.(css|html|js|json|svg)' \ -exec gzip --best --keep --force {} ';' \ -exec brotli --best --keep {} ';' - + find public/packs -type f -regextype posix-extended -iregex '.*\.(css|js|json|svg)' \ + -exec brotli --best --keep {} ';' + find public/packs/emoji -maxdepth 1 -type f -name '*.json' \ + -exec gzip --best --keep --force {} ';' gzip --best --keep public/packs/sw.js - brotli --best --keep public/packs/sw.js runHook postBuild ''; @@ -124,6 +126,8 @@ stdenv.mkDerivation rec { # Remove execute permissions find public/emoji -type f ! -perm 0555 \ -exec chmod 0444 {} ';' + find public -maxdepth 1 -type f ! -perm 0555 \ + -exec chmod 0444 {} ';' # Create missing static gzip and brotli files find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(js|txt)' \ diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 9760b1b16a54..a45fb51ba0bd 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -11,10 +11,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18nn95z23m7cpfsypfnlvpblj9rbnkddbs396nljiflznc6v473g"; + sha256 = "14vlhzrgfgmz0fvrvd81j9xfw8ig091yiwq496firapgxffd7jpq"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; actionmailbox = { dependencies = [ @@ -29,10 +29,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bbc1a2m8zp0ci2js8wz00fgyamkflkjimn1dz0632a43viwda4f"; + sha256 = "0bxxqqflmczwl4ivcqjwwsnrhljcalk1i2hj02qisr3wjgw4811a"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; actionmailer = { dependencies = [ @@ -50,10 +50,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "176vgl9rhy9xqi5i1qdgw4ny8sr6jw32zjsq109sn7jl0j6lvq8d"; + sha256 = "08y7ihafq71879ncq963rwi541b0gafqx8h5ba26zab521qc7h3d"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; actionpack = { dependencies = [ @@ -77,10 +77,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02ibk3ldqs1xk74b8lycqh1g6bm4vj5ph8bjlln1brfv64df3rv1"; + sha256 = "1lsspr8nffzn8qpfmj654w1qja1915x6bnzzhpbjj1cy235j2g6n"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; actiontext = { dependencies = [ @@ -95,10 +95,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1f6n43v5r9d0nq09g66rfkqfmx6pv89v01bvd731bndrrysv7i0c"; + sha256 = "1x4xd8h5sdwdm3rc8h2pxxmq4a0i0wa0gk6c56zq58pzc3xgsihw"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; actionview = { dependencies = [ @@ -118,10 +118,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0izkrdg7r7432mw99d7cwhsr5s9whl3aqh5946i88yqbrc6d59if"; + sha256 = "0rnfn44g217n9hgvn4ga7l0hl149b91djnl07nzra7kxy1pr8wai"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; active_model_serializers = { dependencies = [ @@ -151,10 +151,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "129bldx70vahaargg0spx5sdqw378591gbrq7b0zm3pc0zdg5rfn"; + sha256 = "1dm1vc5vvk5pwq4x7sfh3g6qzzwbyac37ggh1mm1rzraharxv7j6"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -166,10 +166,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i3y0ynf16cgc9p28603pxva528a91jgh8nz2d0q8cb5p36vdfhp"; + sha256 = "0z565q17fmhj4b9j689r0xx1s26w1xcw8z0qyb6h8v0wb8j0fsa0"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; activerecord = { dependencies = [ @@ -185,10 +185,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wbdijshd3dqgzwhdpb32ig6rz8my5zkmanj32fqiwskvmxnwmd6"; + sha256 = "1a6fng58lria02wlwiqjgqway0nx1wq31dsxn5xvbk7958xwd5cv"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; activestorage = { dependencies = [ @@ -202,10 +202,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y3nmzzr17fzxxi9vwi1lc3vc58x1j0i6s56wq0y4wal26g3vfs3"; + sha256 = "0plck0b57b9ni8n52hj5slv5n8i7w3nfwq6r47nkb2hjbpmsskjg"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; activesupport = { dependencies = [ @@ -232,10 +232,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184"; + sha256 = "08vqq5y6vniz30p747xa8yfqb3cz8scqd8r65wij62v661gcw4d7"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -281,10 +281,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g6ahzpdbybryzlfrbb18pybr4230hw1n6g475hh61mk4nlqgl1y"; + sha256 = "1xwbz5zk37f7p3g6ypxzamisay06hidjmdsrvhxw4q0xin4jw6w7"; type = "gem"; }; - version = "4.16.0"; + version = "4.20.0"; }; ast = { groups = [ @@ -314,20 +314,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y34xkflb4fd54k1cbrd9xw6ff2znwn1drbnvy9ywngiyynwff1i"; + sha256 = "0ys6h3hhhv2w9j9d2ls8d3aaqywdcbipiqnqwr09c6gmqv6fgvv5"; type = "gem"; }; - version = "1.1103.0"; + version = "1.1168.0"; }; aws-sdk-core = { dependencies = [ @@ -380,10 +380,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.1"; }; azure-blob = { dependencies = [ "rexml" ]; @@ -391,10 +391,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zfl00vwx28a8s38spfxinicic1nd7q1phd3cmjxj8mwlfswc3j4"; + sha256 = "198ndg8m0w54csxb3fidzpjp491ak9jcrmjc8zmp7axi0ncvbsmx"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.9.1"; }; base64 = { groups = [ @@ -446,10 +446,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl"; + sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6"; type = "gem"; }; - version = "0.4.1"; + version = "0.5.0"; }; better_errors = { dependencies = [ @@ -478,10 +478,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r"; + sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.1"; }; bindata = { groups = [ "default" ]; @@ -531,10 +531,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11ip6dgi7147wp8jgwk9g95k07323zh83q699d6wxif6rqdxj0mn"; + sha256 = "164l8dh3c22c8448hgd0zqhsffxvn4d9wad2zzipav29sssjd532"; type = "gem"; }; - version = "7.0.2"; + version = "7.1.1"; }; browser = { groups = [ "default" ]; @@ -603,10 +603,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09jyhmyngwbw2apc77z80kw4d4kd0wdvn46xxks7vjlzgywilipg"; + sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7"; type = "gem"; }; - version = "0.5.6"; + version = "0.5.7"; }; case_transform = { dependencies = [ "activesupport" ]; @@ -624,10 +624,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; + sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr"; type = "gem"; }; - version = "0.5.9.8"; + version = "0.5.10.1"; }; cgi = { groups = [ "default" ]; @@ -746,10 +746,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; cose = { dependencies = [ @@ -777,10 +777,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jaa7is4fw1cxigm8vlyhg05bw4nqy4f91zjqxk7pp4c8bdyyfn8"; + sha256 = "0zjcdl5i6lw508r01dym05ibhkc784cfn93m1d26c7fk1hwi0jpz"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; crass = { groups = [ @@ -828,10 +828,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy"; + sha256 = "1203q6zdw14vwmnr2hw0d6b1rdz4d07w3kjg1my1zhw862gnnac8"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; database_cleaner-core = { groups = [ @@ -923,10 +923,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "041c6zrwm3za1scr07kdgmnlxj7lnrr1jcb832grkavf1sh9wf4h"; + sha256 = "19j0vs9y0zixzvp14i7xkvk907q60w7q6d0bi91lbzf6km8zax4a"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; devise_pam_authenticatable2 = { dependencies = [ @@ -1032,10 +1032,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nyrgj4a0ppk0qfp8cny4wb3hsr2cw55ynh2w973brhf54xxz5wc"; + sha256 = "113f4b01pf6igzmb7zkbcd3zgp118gfsqc35ggw9p3bzkmgp2jlq"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; elasticsearch = { dependencies = [ @@ -1124,10 +1124,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08rc8pzri3g7c85c76x84j05hkk12jvalrm2m3n97k1n7f03j13n"; + sha256 = "0rqfmrgp4ihwmnpi9ah0y6pah7rr7d3pid94z2cqd93bgc2m6vjn"; type = "gem"; }; - version = "5.0.1"; + version = "5.1.3"; }; erubi = { groups = [ @@ -1151,10 +1151,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; + sha256 = "1g785lz4z2k7jrdl7bnnjllzfrwpv9pyki94ngizj8cqfy83qzkc"; type = "gem"; }; - version = "1.2.11"; + version = "1.4.0"; }; excon = { dependencies = [ "logger" ]; @@ -1162,10 +1162,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a"; + sha256 = "1gj6h2r9ylkmz9wjlf6p04d3hw99qfnf0wb081lzjx3alk13ngfq"; type = "gem"; }; - version = "1.2.5"; + version = "1.3.0"; }; fabrication = { groups = [ @@ -1189,10 +1189,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z4vhl6lbd0la2j0ab05sz8wq5mqvpikzhjrc142z24x4zmgpl8s"; + sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r"; type = "gem"; }; - version = "3.5.1"; + version = "3.5.2"; }; faraday = { dependencies = [ @@ -1204,10 +1204,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc"; + sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6"; type = "gem"; }; - version = "2.13.1"; + version = "2.14.0"; }; faraday-follow_redirects = { dependencies = [ "faraday" ]; @@ -1215,10 +1215,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; + sha256 = "1nfmmnmqgbxci7dlca0qnwxn8j29yv7v8wm26m0f4l0kmcc13ynk"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; faraday-httpclient = { dependencies = [ "httpclient" ]; @@ -1237,10 +1237,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.1"; }; fast_blank = { groups = [ "default" ]; @@ -1362,14 +1362,15 @@ version = "1.1.5"; }; formatador = { + dependencies = [ "reline" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl"; + sha256 = "18jdg7y4746pfisvab6i3j1vl61bzhiap52dv8sf2i5g0kybian8"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; forwardable = { groups = [ "default" ]; @@ -1390,10 +1391,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; + sha256 = "00v5zy1s7cl4hbaaz2sqp02g6kaajn1yslvfpqcra55hndvdyg83"; type = "gem"; }; - version = "1.11.1"; + version = "1.12.0"; }; globalid = { dependencies = [ "activesupport" ]; @@ -1404,10 +1405,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; + sha256 = "04gzhqvsm4z4l12r9dkac9a75ah45w186ydhl0i4andldsnkkih5"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; google-protobuf = { dependencies = [ @@ -1421,10 +1422,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14a8pv6npmv3ppp5097rladsynk8fs4w6chlcylkls6xj9ngxdjd"; + sha256 = "1rqmj1sl0bs42jjxdfpcqs8sgq6zvhjdixbsciaj1043l993zv6r"; type = "gem"; }; - version = "4.31.0"; + version = "4.32.1"; }; googleapis-common-protos-types = { dependencies = [ "google-protobuf" ]; @@ -1435,10 +1436,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zyh9pxsw4zwv3iissirwqnx98qzkywqf3bwdrai6zpwph34ndsy"; + sha256 = "1iy4pxpsbxjdiyd03mslalbcvrrga57h1mb0r0c01nnngfvr4x7r"; type = "gem"; }; - version = "1.20.0"; + version = "1.22.0"; }; haml = { dependencies = [ @@ -1469,10 +1470,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sjrdwc4azzfpsp2xk0365z031482gcrs0c54d5wx0igkqca0fr7"; + sha256 = "0psqln0xs2hkcziag6m9fiwsaxyg3q7vazy8rbcj39awm2bf87q9"; type = "gem"; }; - version = "2.1.0"; + version = "3.0.0"; }; haml_lint = { dependencies = [ @@ -1486,10 +1487,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb"; + sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab"; type = "gem"; }; - version = "0.64.0"; + version = "0.66.0"; }; hashdiff = { groups = [ @@ -1499,10 +1500,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c"; + sha256 = "1lbw8lqzjv17vnwb9vy5ki4jiyihybcc5h2rmcrqiz1xa6y9s1ww"; type = "gem"; }; - version = "1.1.2"; + version = "1.2.1"; }; hashie = { groups = [ "default" ]; @@ -1555,10 +1556,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07sm9gp4l2khw8m259paw1xcy9yd1jabqnyjzsrgl3ndgqgrj6f8"; + sha256 = "0nsw7h1hab5f4hy778kd21y8q4hfiy0j9yxa5pjp3g49a9jl9jh6"; type = "gem"; }; - version = "0.24.0"; + version = "0.26.1"; }; hkdf = { groups = [ "default" ]; @@ -1605,10 +1606,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi"; + sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q"; type = "gem"; }; - version = "1.0.8"; + version = "1.1.0"; }; http-form_data = { groups = [ "default" ]; @@ -1650,10 +1651,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "098n4dfmiydbm9if52h17kxglbli9gihjgzhcghv274ni2c9ab49"; + sha256 = "04d75idhzybfr1zn0n8c6mk3ssgl3vh6cqkgcwc5rr0csh0sf3gb"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.3"; }; i18n = { dependencies = [ "concurrent-ruby" ]; @@ -1729,10 +1730,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; + sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; irb = { dependencies = [ @@ -1750,10 +1751,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2"; + sha256 = "1aja320qnimlnfc80wf2i2x8i99kl5sdzfacsfzzfzzs3vzysja3"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.3"; }; jd-paperclip-azure = { dependencies = [ @@ -1784,14 +1785,15 @@ groups = [ "default" "development" + "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s"; + sha256 = "128bp3mihh175l9wm7hgg9sdisp6hd3kf36fw01iksqnq7kv5hdi"; type = "gem"; }; - version = "2.12.2"; + version = "2.15.1"; }; json-canonicalization = { groups = [ "default" ]; @@ -1816,10 +1818,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19bjs404inbydn40nampk5ij7vqkwpmqp3hp4dmjf50sdm6gzayc"; + sha256 = "1k64mp59jlbqd5hyy46pf93s3yl1xdngfy8i8flq2hn5nhk91ybg"; type = "gem"; }; - version = "1.16.7"; + version = "1.17.0"; }; json-ld = { dependencies = [ @@ -1849,10 +1851,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l32rjawsxhgi59y7lmjwgmnk32585gih1ylvy08m3vx7cdbzmdg"; + sha256 = "1q8y2f9c9940sgqdb57zmlbhjx3rvmq2l8kpi3a9bgzkx8kl6aa6"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.2"; }; json-schema = { dependencies = [ @@ -1863,10 +1865,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gzrf6q4d9kbixj6bpi2bp8dizmqxcmlq30ni86h3ifzpkcrm0mk"; + sha256 = "0gv3b0nry1sn1n7imfs2drqyfp4g8b2zcrizjc98j04pl7xszv3r"; type = "gem"; }; - version = "5.1.1"; + version = "6.0.0"; }; jsonapi-renderer = { groups = [ "default" ]; @@ -1884,10 +1886,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6"; + sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; kaminari = { dependencies = [ @@ -2058,10 +2060,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v2dxpc7g2b0b300mpx2janhzph3j8vrjxj5k42bidla7j74kbl7"; + sha256 = "09rjxsmmnahxsaw0hc4f0ffw4rcncjxa01xd9v5z4q9radfidr5j"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.7"; }; llhttp-ffi = { dependencies = [ @@ -2131,6 +2133,7 @@ }; mail = { dependencies = [ + "logger" "mini_mime" "net-imap" "net-pop" @@ -2144,10 +2147,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; + sha256 = "0ha9sgkfqna62c1basc17dkx91yk7ppgjq32k4nhrikirlz6g9kg"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.0"; }; marcel = { groups = [ "default" ]; @@ -2178,10 +2181,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0"; type = "gem"; }; - version = "0.4.2"; + version = "0.4.3"; }; memory_profiler = { groups = [ @@ -2221,10 +2224,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lnkfxcayx682rjjxmkjaaxq605akfka90m5rliw897sli6nprcj"; + sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj"; type = "gem"; }; - version = "3.2025.0514"; + version = "3.2025.0924"; }; mini_mime = { groups = [ @@ -2267,10 +2270,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; + sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm"; type = "gem"; }; - version = "5.25.5"; + version = "5.26.0"; }; msgpack = { groups = [ "default" ]; @@ -2287,10 +2290,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; mutex_m = { groups = [ "default" ]; @@ -2326,20 +2329,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14zmzjy2sp87ac6iygkk3pz9snjvx4ks681vg4gxz8x8q7gmzajj"; + sha256 = "0i24prs7yy1p1zdps2x1ksb7lmvbn2f0llxwdjdw3z2ksddx136b"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.12"; }; net-ldap = { + dependencies = [ + "base64" + "ostruct" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g9gz39bs2iy4ky4fhjphimqd9m9wdsaz50anxgwg3yjrff3famy"; + sha256 = "0wjkrvcwnxa6ggq0nfz004f1blm1c67fv7c6614sraak0wshn25j"; type = "gem"; }; - version = "0.19.0"; + version = "0.20.0"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -2411,10 +2418,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc"; + sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; type = "gem"; }; - version = "1.18.9"; + version = "1.18.10"; }; oj = { dependencies = [ @@ -2433,6 +2440,7 @@ omniauth = { dependencies = [ "hashie" + "logger" "rack" "rack-protection" ]; @@ -2440,10 +2448,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d"; + sha256 = "0g3n12k5npmmgai2cs3snimy6r7h0bvalhjxv0fjxlphjq25p822"; type = "gem"; }; - version = "2.1.3"; + version = "2.1.4"; }; omniauth-cas = { dependencies = [ @@ -2455,10 +2463,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yynk95xhccvkb1j7rcb834ch80y85n2bhyimq946ib487z8wcx1"; + sha256 = "03b034imgj5jwflc4db7hsp0n5ivqyqkmsfhc5drlidrcdfv2f0q"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; omniauth-rails_csrf_protection = { dependencies = [ @@ -2531,10 +2539,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n"; + sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.2"; }; openssl-signature_algorithm = { dependencies = [ "openssl" ]; @@ -2555,10 +2563,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15x9bq13k53k14r3h5r0pn7cnl3g7pdy0p0662k1s2x7mgkk7k4d"; + sha256 = "0kr1jyk67zn4axafcb2fji5b8xvr56hhfg2y33s5pnzjlr72dzfc"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; opentelemetry-common = { dependencies = [ "opentelemetry-api" ]; @@ -2569,10 +2577,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13c7qnqai6djfd6rjwdwcwbz9f77vcmy0chx1avpxmiqz2h9cpnf"; + sha256 = "0b5k7qc81ln96ayba90hm6ww7qpk8y7lc1r2mphblmwx8y812wns"; type = "gem"; }; - version = "0.22.0"; + version = "0.23.0"; }; opentelemetry-exporter-otlp = { dependencies = [ @@ -2587,10 +2595,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15xssmviwsi7wqmrbx5khm2imvwsrzmxdli7rkvzqbbqpd309jq7"; + sha256 = "0jj78y79mawj86v5g3kcz6k81izd0m0w47wyyk2br744swbvwn2k"; type = "gem"; }; - version = "0.30.0"; + version = "0.31.1"; }; opentelemetry-helpers-sql = { dependencies = [ "opentelemetry-api" ]; @@ -2601,10 +2609,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13fvxvia6qxrdz06s5g4bs4fc1hdgkps7yz45s2n26wxqv163s0r"; + sha256 = "0kc8pdlm2avyvahg40bfbrimxmvmra0i30m4ha3pzvn6r9xrf8wz"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; opentelemetry-helpers-sql-obfuscation = { dependencies = [ "opentelemetry-common" ]; @@ -2615,35 +2623,13 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jwyx8jk1faszd20s0qrvgvxs9ddvnfrqixy099pn9lqizandn7m"; - type = "gem"; - }; - version = "0.3.0"; - }; - opentelemetry-instrumentation-action_mailer = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; - groups = [ - "default" - "opentelemetry" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "18p9dvq4mb8s5f1ndabjng07yabv5xgl5d80fcvc1383faarbdg8"; + sha256 = "0h935j5ah9s2v9qm61ddp62kaffk1rn8assgljqap3fz2fgijlkj"; type = "gem"; }; version = "0.4.0"; }; - opentelemetry-instrumentation-action_pack = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - "opentelemetry-instrumentation-rack" - ]; + opentelemetry-instrumentation-action_mailer = { + dependencies = [ "opentelemetry-instrumentation-active_support" ]; groups = [ "default" "opentelemetry" @@ -2651,17 +2637,27 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k09hr93fib38i6ajh0abkfvpvng6k2qsvds4jd08znfzyjs17jf"; + sha256 = "0mqh8z6myff0j11zcnm34s1lc8qzmzzqdrhzk95y2sh6vdmqd143"; type = "gem"; }; - version = "0.12.1"; + version = "0.6.1"; + }; + opentelemetry-instrumentation-action_pack = { + dependencies = [ "opentelemetry-instrumentation-rack" ]; + groups = [ + "default" + "opentelemetry" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wzj0xmivyx243slz526z54lqyhsiyzzrbha4szyxjl30xsdxyl4"; + type = "gem"; + }; + version = "0.15.1"; }; opentelemetry-instrumentation-action_view = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-active_support" ]; groups = [ "default" "opentelemetry" @@ -2669,45 +2665,35 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qf5pklfyxrn2pskhmhd1gnp9i72yaqw114rmc5nrxhbcm24chsb"; + sha256 = "16gmwl1v4jnz1x670qprkbc35phnbpbljsp2mcr71dq4fvfk8qa2"; type = "gem"; }; - version = "0.9.0"; + version = "0.11.1"; }; opentelemetry-instrumentation-active_job = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gb1snnd087nh8r5vvnl8ahg3k3bi2b9rb1m8r2aj7220m78hpcx"; + sha256 = "129ajjrxigl4pag1nlzbdv1js5bij4ll92i1ix50c3f24h9338df"; type = "gem"; }; - version = "0.8.0"; + version = "0.10.1"; }; opentelemetry-instrumentation-active_model_serializers = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-active_support" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gjbdkamj147vd1hcjyyqir8z4nwmd05a8ac3h94y3n9n6phzzgx"; + sha256 = "05ff7yxy2v96kslsqn1y68669is00798i9fgk9fy85vx2r21xs4g"; type = "gem"; }; - version = "0.22.0"; + version = "0.24.0"; }; opentelemetry-instrumentation-active_record = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "default" "opentelemetry" @@ -2715,17 +2701,13 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h01lq8xjjdaprprqzj6alq7gw9lwdkkakjjyyxsg3ylpwnvkg4w"; + sha256 = "14kwks0130mrggk3irg4qvx5fmwk9gxv6w23dy6ryi50xqs3y20v"; type = "gem"; }; - version = "0.9.0"; + version = "0.11.1"; }; opentelemetry-instrumentation-active_storage = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-active_support" ]; groups = [ "default" "opentelemetry" @@ -2733,16 +2715,13 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00x7yjzflxmqiywczlih6vi301b1xm6rwbwlzv0hx87cpdm94m56"; + sha256 = "17p8zmfyigdqvgy3d1691ayzm6nj4q4nx2n3qk01f7wjakphz6zq"; type = "gem"; }; - version = "0.1.1"; + version = "0.3.1"; }; opentelemetry-instrumentation-active_support = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "default" "opentelemetry" @@ -2750,10 +2729,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16frcxhnb5vjihkff3wl6pnq0m4wkpii7la1d25d03j29qsh5qcv"; + sha256 = "0zf5kg2h9zgmrwnq7v7by2nyhkxa20gmi5nyqqrpwyaqf4v9isl2"; type = "gem"; }; - version = "0.8.0"; + version = "0.10.1"; }; opentelemetry-instrumentation-base = { dependencies = [ @@ -2768,98 +2747,79 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l0w7iya56y458mzws9q246whff2bf597553d5i3xkrcxb707qdk"; - type = "gem"; - }; - version = "0.23.0"; - }; - opentelemetry-instrumentation-concurrent_ruby = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15v8khcyg9wz5v7kysagkbmdv895qahb0b6q7ajk2qznniaix9pv"; - type = "gem"; - }; - version = "0.22.0"; - }; - opentelemetry-instrumentation-excon = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01rzi9d1hi402a8vdr439by4zy8x4rfq3vwnlzz3nzs50mxcbr9s"; - type = "gem"; - }; - version = "0.23.0"; - }; - opentelemetry-instrumentation-faraday = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0r25vvkxawngzm7an652npawjhir6zwics8635k5z7d60hfb2xi3"; - type = "gem"; - }; - version = "0.27.0"; - }; - opentelemetry-instrumentation-http = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; - groups = [ "opentelemetry" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0p9z9nwrf71inh7n84i37x156da1vm7mqnfp3jh6faqiar65icl1"; + sha256 = "09ysfv2x25svwl4yxrbgmjkwrlkylr7plci3jjb6wkim11zklak4"; type = "gem"; }; version = "0.25.0"; }; - opentelemetry-instrumentation-http_client = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + opentelemetry-instrumentation-concurrent_ruby = { + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p4w5zd2b0ndzwwfc8np1xyp4kzd59k7hpcwpkk0ghlmbnsmbkwh"; + sha256 = "1lniyy8yzmvz1mrh7az0yn94j4d9p0vvd6v0jgk9vi8042vxi6r2"; type = "gem"; }; - version = "0.23.0"; + version = "0.24.0"; + }; + opentelemetry-instrumentation-excon = { + dependencies = [ "opentelemetry-instrumentation-base" ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01rwnxml7h9vcwfdf2n1zr6kfxfcplr1i00aga8xd76wmbvld8fg"; + type = "gem"; + }; + version = "0.26.0"; + }; + opentelemetry-instrumentation-faraday = { + dependencies = [ "opentelemetry-instrumentation-base" ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0n32aqsqj9lf46mvm1pr5f2j386aq1jia00aajp4qpb9vgf0jnq1"; + type = "gem"; + }; + version = "0.30.0"; + }; + opentelemetry-instrumentation-http = { + dependencies = [ "opentelemetry-instrumentation-base" ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ad0rrw0a74dzlhpcyccas54cl9zggfvdjxs6hdklhwkdla0vmr7"; + type = "gem"; + }; + version = "0.27.0"; + }; + opentelemetry-instrumentation-http_client = { + dependencies = [ "opentelemetry-instrumentation-base" ]; + groups = [ "opentelemetry" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1mfa0ma9kl5yjzm1kph01y7cwk99nib4vibwz7d76rrk7qmiisx8"; + type = "gem"; + }; + version = "0.26.0"; }; opentelemetry-instrumentation-net_http = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "100a3kzk8ckifxaw0n6xpg6hxxw0yrqmfwjp47khgy2831r3n4li"; + sha256 = "14hx651frq9hncd14vi3yh5isrjsj2nalziy68k5j8afh4ydrhaf"; type = "gem"; }; - version = "0.23.0"; + version = "0.26.0"; }; opentelemetry-instrumentation-pg = { dependencies = [ - "opentelemetry-api" "opentelemetry-helpers-sql" "opentelemetry-helpers-sql-obfuscation" "opentelemetry-instrumentation-base" @@ -2868,28 +2828,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09sgqwxavzgd7gsgr5w909p794g75602qsn6jvhs5qqj03bkldc5"; + sha256 = "02pvkv1f374ibvpnha8y64zdjdyav7rk77rz9bkxnn61gcnvip56"; type = "gem"; }; - version = "0.30.1"; + version = "0.32.0"; }; opentelemetry-instrumentation-rack = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bbvp2mnbcrldcp3hzm2fv52zdsqf0i9kz4r12msq24f6l5r2mca"; + sha256 = "0xzk88iiiggx3kdfy5y75cb79cc5gn8jsl1vwg5n8w086s1vnb4y"; type = "gem"; }; - version = "0.26.0"; + version = "0.29.0"; }; opentelemetry-instrumentation-rails = { dependencies = [ - "opentelemetry-api" "opentelemetry-instrumentation-action_mailer" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" @@ -2897,45 +2853,38 @@ "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_storage" "opentelemetry-instrumentation-active_support" - "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-concurrent_ruby" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05xpiq4j17vcjnrxxb0zkb67c4y2b7q1g4qvf6ln83b6svx2c7pj"; + sha256 = "0vy93a3hpi8l8crljxwxzxwmvyf9gg1pff6dnpxl0c2ljmwdynbr"; type = "gem"; }; - version = "0.36.0"; + version = "0.39.1"; }; opentelemetry-instrumentation-redis = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "183v8q8a74fc9dnb6ny44dsgq6142smic6x4ivz3v50casjznpii"; + sha256 = "001rd4ix10hja64y2arhpcd0hlmjilx7zlb4slmx4zaj3iyra8c7"; type = "gem"; }; - version = "0.26.1"; + version = "0.28.0"; }; opentelemetry-instrumentation-sidekiq = { - dependencies = [ - "opentelemetry-api" - "opentelemetry-instrumentation-base" - ]; + dependencies = [ "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lpkc1ihifbjns2wf17kf9pmhx73j3i1in4fkar469k4i2fylfl5"; + sha256 = "0vi2ac1l66vsflslxv6ay4ml95svcq53v8rdmwf2c3vl94f6b3bl"; type = "gem"; }; - version = "0.26.1"; + version = "0.28.0"; }; opentelemetry-registry = { dependencies = [ "opentelemetry-api" ]; @@ -2962,10 +2911,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xqx6zxf6msrryz5hr2s3nwakin0nmxfgz9bkwpmpbf7lss7kngs"; + sha256 = "06jjh25s94lv94ljgbq13baqgnkccdsvzsw6xg54vwldpr4rjwa3"; type = "gem"; }; - version = "1.8.0"; + version = "1.10.0"; }; opentelemetry-semantic_conventions = { dependencies = [ "opentelemetry-api" ]; @@ -2976,10 +2925,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jzx18lmcv27pma1hbrccb9g6daadd6c4192r8w8x2nli3shkwl9"; + sha256 = "05znn2iijg1qli52m09bgyq4b74nfs5nwgz2z73sllvqpiyn1cf1"; type = "gem"; }; - version = "1.11.0"; + version = "1.36.0"; }; orm_adapter = { groups = [ @@ -2999,10 +2948,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.3"; }; ox = { dependencies = [ "bigdecimal" ]; @@ -3040,10 +2989,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4"; + sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll"; type = "gem"; }; - version = "3.3.8.0"; + version = "3.3.9.0"; }; parslet = { groups = [ "default" ]; @@ -3071,10 +3020,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; + sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq"; type = "gem"; }; - version = "1.5.9"; + version = "1.6.2"; }; pghero = { dependencies = [ "activerecord" ]; @@ -3092,17 +3041,14 @@ "concurrent-ruby" "mime-types" ]; - groups = [ - "default" - "test" - ]; + groups = [ "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "114wkr2hj55c7n4xq30nb4g7kcm9a1mhsy0934jr9mzwfr0kyhaa"; + sha256 = "02ivcflls7fy5axsqk602rqgfq9r6p8pmqkcxp9sdpgvvf8hflb0"; type = "gem"; }; - version = "1.52.0"; + version = "1.55.0"; }; pp = { dependencies = [ "prettyprint" ]; @@ -3116,10 +3062,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll"; + sha256 = "1xlxmg86k5kifci1xvlmgw56x88dmqf04zfzn7zcr4qb8ladal99"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; premailer = { dependencies = [ @@ -3175,10 +3121,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw"; + sha256 = "07fz0p6nlifm983cac3ayi7nwrpb5l4s3jl7p70imbsm79k429qr"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.2"; }; prometheus_exporter = { dependencies = [ "webrick" ]; @@ -3186,26 +3132,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15vl8fw8vjnaj9g129dzrwk9nlrdqgffaj3rys4ba9ns2bqim9rq"; + sha256 = "0x98zrcd83dq1y9qhshx8hqvlvy81wlns6k15hq1xr3lrsdxvrdz"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; propshaft = { dependencies = [ "actionpack" "activesupport" "rack" - "railties" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sqg0xf46xd47zdpm8d12kfnwl0y5jb2hj10imzb3bk6mwgkd2fk"; + sha256 = "14n3fhz5hzpsczp4spqc26csfgk2qga7mgcm7px9z0byyr76dk4s"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.1"; }; psych = { dependencies = [ @@ -3247,10 +3192,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j"; + sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74"; type = "gem"; }; - version = "6.6.0"; + version = "7.1.0"; }; pundit = { dependencies = [ "activesupport" ]; @@ -3258,10 +3203,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nmy0nkgayjifi2j38fn55nb7z1xq3ma2wp19d7c7rmz7ynvidjg"; + sha256 = "1gcb23749jwggmgic4607ky6hm2c9fpkya980iihpy94m8miax73"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.2"; }; raabro = { groups = [ "default" ]; @@ -3300,10 +3245,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i44156w3k6c88nv72wskizpyq3nwysisnj9qi9vkxwffrzp17b6"; + sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x"; type = "gem"; }; - version = "3.1.18"; + version = "3.2.4"; }; rack-attack = { dependencies = [ "rack" ]; @@ -3311,10 +3256,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; + sha256 = "1wpcxspprm187k6mch9fxhaaq1a3s9bzybd2fdaw1g45pzg9yjgj"; type = "gem"; }; - version = "6.7.0"; + version = "6.8.0"; }; rack-cors = { dependencies = [ @@ -3447,10 +3392,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b5k9608wxp8hksyvnc3vvdrairyv2qldcw48cv4xrv9amhrbaqk"; + sha256 = "0igxnfy4xckvk2b6x17zrwa8xwnkxnpv36ca4wma7bhs5n1c10sx"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; rails-dom-testing = { dependencies = [ @@ -3468,10 +3413,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; + sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; rails-html-sanitizer = { dependencies = [ @@ -3505,10 +3450,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03dy8nmq2gxvkg8zqq6c0wwz98mdwp3i9krn0slcknhb8nak2c0m"; + sha256 = "1brqyx0cn46lwgxni943ri9lcg12hskzw8d54j0d4pzqabv32kv2"; type = "gem"; }; - version = "8.0.1"; + version = "8.0.2"; }; railties = { dependencies = [ @@ -3518,6 +3463,7 @@ "rackup" "rake" "thor" + "tsort" "zeitwerk" ]; groups = [ @@ -3530,10 +3476,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k0x630ipimzv6vzhwflsjl7n1fvrmvf196mfbspha7wf4bhxr2l"; + sha256 = "1lpiazaaq8di4lz9iqjqdrsnha6kfq6k35kd9nk9jhhksz51vqxc"; type = "gem"; }; - version = "8.0.2.1"; + version = "8.0.3"; }; rainbow = { groups = [ @@ -3570,15 +3516,18 @@ "bcp47_spec" "bigdecimal" "link_header" + "logger" + "ostruct" + "readline" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mlalmbj1wkwvjha92f7v91v0pbjar9gdb2ddxdyqd24zcifn3ln"; + sha256 = "1har1346p7jwrs89d5w1gv98jk2nh3cwkdyvkzm2nkjv3s1a0zx7"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.4"; }; rdf-normalize = { dependencies = [ "rdf" ]; @@ -3595,6 +3544,7 @@ dependencies = [ "erb" "psych" + "tsort" ]; groups = [ "default" @@ -3606,10 +3556,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ssi6b33bwr1b1qsssnyjkldwwy087z33yzl58jyz5njdiwzlplh"; + sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8"; type = "gem"; }; - version = "6.14.1"; + version = "6.15.1"; + }; + readline = { + dependencies = [ "reline" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0shxkj3kbwl43rpg490k826ibdcwpxiymhvjnsc85fg2ggqywf31"; + type = "gem"; + }; + version = "0.0.4"; }; redcarpet = { groups = [ "default" ]; @@ -3640,21 +3601,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fsx10xg4n18w9sr1xa128y4yf0jv5zicrj5ff5n0f1crcwywrgf"; + sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y"; type = "gem"; }; - version = "0.24.0"; - }; - redlock = { - dependencies = [ "redis" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xvjwfzq7rqj4k311kidwmv5app3i7glz4miys6ixqy6c8yylz3c"; - type = "gem"; - }; - version = "1.3.2"; + version = "0.26.1"; }; regexp_parser = { groups = [ @@ -3665,10 +3615,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb"; + sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.3"; }; reline = { dependencies = [ "io-console" ]; @@ -3682,10 +3632,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s"; + sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.2"; }; request_store = { dependencies = [ "rack" ]; @@ -3713,10 +3663,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06ilkbbwvc8d0vppf8ywn1f79ypyymlb9krrhqv4g0q215zaiwlj"; + sha256 = "0npm7nyld47f516idsmslfhypp7gm3jcl90ml5c68vz11anddhl9"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.0"; }; rexml = { groups = [ @@ -3750,10 +3700,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3"; + sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah"; type = "gem"; }; - version = "4.5.2"; + version = "4.6.1"; }; rpam2 = { groups = [ @@ -3805,10 +3755,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.1"; }; rspec-core = { dependencies = [ "rspec-support" ]; @@ -3820,10 +3770,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n1rlagplpcgp41s3r68z01539aivwj0cn3v19hq4p3pgdmibnpr"; + sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb"; type = "gem"; }; - version = "3.13.4"; + version = "3.13.5"; }; rspec-expectations = { dependencies = [ @@ -3889,10 +3839,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01b5d37i3igh11v5y801gxzb1df2v0il0mfdqi4cdmxn1aqh0dqc"; + sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i"; type = "gem"; }; - version = "8.0.1"; + version = "8.0.2"; }; rspec-sidekiq = { dependencies = [ @@ -3905,10 +3855,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rr8229zd5ylwn78dxr4w43a07k58v4chr5lblws53llm7j1qrzd"; + sha256 = "0rn2yzkn3ywryvrigmsr1902zd14kx5ya8n41jd1zc1szxkgbpvv"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; rspec-support = { groups = [ @@ -3919,10 +3869,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xx3f4mgr84jz07fifd3r68hm6giqy91hqyzawmi0s59yqa1hjqq"; + sha256 = "1cmgz34hwj5s3jwxhyl8mszs24nci12ffbrmr5jb1si74iqf739f"; type = "gem"; }; - version = "3.13.4"; + version = "3.13.6"; }; rubocop = { dependencies = [ @@ -3941,10 +3891,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h48rhmp178ppzc4ybfj42a2savs4bxgy3bvw95i4ypgfm2hndhz"; + sha256 = "0hpgpyzpzgmp28pirlyrif3albsk5kni2k67h5yvxfvr3g55w2d7"; type = "gem"; }; - version = "1.77.0"; + version = "1.81.6"; }; rubocop-ast = { dependencies = [ @@ -3958,10 +3908,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gis8w51k5dsmzzlppvwwznqyfd73fa3zcrpl1xihzy1mm4jw14l"; + sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr"; type = "gem"; }; - version = "1.45.1"; + version = "1.47.1"; }; rubocop-capybara = { dependencies = [ @@ -4001,10 +3951,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h9flnqk2f3llwf8g0mk0fvzzznfj7hsil3qg88m803pi9b06zbg"; + sha256 = "0d0qyyw1332afi9glwfjkb4bd62gzlibar6j55cghv8rzwvbj6fd"; type = "gem"; }; - version = "1.25.0"; + version = "1.26.1"; }; rubocop-rails = { dependencies = [ @@ -4018,10 +3968,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1404nfa0gw3p0xzmv4b9zg9v1da0nwc4m7796pl73zi2hwy65k4z"; + sha256 = "1danlfzfqx3x1kna248sm2b1br5ki369r51x90jc4vbh6xk8zv1l"; type = "gem"; }; - version = "2.32.0"; + version = "2.33.4"; }; rubocop-rspec = { dependencies = [ @@ -4032,10 +3982,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ya4815sp8g13w7a86sm0605fx7xyldck77f9pjjfrvpf5c21r60"; + sha256 = "13q588yrqr195d4d4vkv1y3px12llc8xiwh0dnfdnd1027d19cmp"; type = "gem"; }; - version = "3.6.0"; + version = "3.7.0"; }; rubocop-rspec_rails = { dependencies = [ @@ -4102,20 +4052,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j8wxbkl261nwg7jr6kdz0zlyim4zcnnb72ynky97grqid6d61d3"; + sha256 = "0n3pgw1jkkivgkn08qpc4fb1kiivhbshkj0lhrms4sy3fahlgigk"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.5"; }; rubyzip = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; + sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0"; type = "gem"; }; - version = "2.4.1"; + version = "3.2.2"; }; rufus-scheduler = { dependencies = [ "fugit" ]; @@ -4134,10 +4084,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + sha256 = "1apjjd99bqsc22bfq66j27dp4im0amisy619hr9qbghdapfh3kf8"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; sanitize = { dependencies = [ @@ -4162,10 +4112,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w0dafg0gz3snm30247wwai0cy3j235ynwx2karyh05ayfqhm4ii"; + sha256 = "1nb3an8af7f08jnhhbn8bxvgfxqb43qc9d5hgrz16ams96h3mv3f"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; securerandom = { groups = [ @@ -4196,8 +4146,8 @@ }; sidekiq = { dependencies = [ - "base64" "connection_pool" + "json" "logger" "rack" "redis-client" @@ -4209,10 +4159,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i"; + sha256 = "1vpj4jqcvnybc6h6hxpvgq36h311jqz3myax36z9ls8ilnw2y3ns"; type = "gem"; }; - version = "7.3.9"; + version = "8.0.9"; }; sidekiq-bulk = { dependencies = [ "sidekiq" ]; @@ -4229,16 +4179,15 @@ dependencies = [ "rufus-scheduler" "sidekiq" - "tilt" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gnm98hdw1ndw0sryjimp4a0805yhwhjxg6njhz8xmdh5ycgljda"; + sha256 = "0qj0lfy0860lbdg92mmv4f4yy3vr7pq01ay6df4xkqm3a7l09z71"; type = "gem"; }; - version = "5.0.6"; + version = "6.0.1"; }; sidekiq-unique-jobs = { dependencies = [ @@ -4275,10 +4224,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q3lwin7pk5rsxy2a663x6lph5arax9lqqk12fgwdy57i5ma749q"; + sha256 = "1vhh91l7pjx7fpvs62kmz99ypsnkk93yq1ra5qgigbinxjqfa77b"; type = "gem"; }; - version = "5.3.1"; + version = "5.4.0"; }; simplecov = { dependencies = [ @@ -4303,20 +4252,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx"; + sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.2"; }; simplecov-lcov = { groups = [ "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h8kswnshgb9zidvc88f4zjy4gflgz3854sx9wrw8ppgnwfg6581"; + sha256 = "1ka6cdwywd6a6pqjwggm0439437xdq2r7514n3a5wn8a40ga6xvs"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; simplecov_json_formatter = { groups = [ @@ -4356,15 +4305,15 @@ version = "0.2.0"; }; stoplight = { - dependencies = [ "redlock" ]; + dependencies = [ "zeitwerk" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16j5w162pv45gjm0jah9hhy8q5fjplbka913c0qwxx209lbmsizd"; + sha256 = "1mxy9x9zpi1grx24lds1kkipmh0rgcwsi74c7pbm1dza39m6p7nh"; type = "gem"; }; - version = "4.1.1"; + version = "5.4.0"; }; stringio = { groups = [ @@ -4388,10 +4337,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mg8z7ikc7rj53hy3c5n7pqdwd4m4h22k8ig36057nnchqa34d6v"; + sha256 = "09llhlw9ddsjyv6c59z3yjwdhrxc2q60a60wjvqhrhhy96dkmjlb"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.1"; }; swd = { dependencies = [ @@ -4430,10 +4379,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz"; + sha256 = "0b7pzx45f1vg6f53midy70ndlmb0k4k03zp4nsq8l0q9dx5yk8dp"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; terminal-table = { dependencies = [ "unicode-display_width" ]; @@ -4455,10 +4404,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mkmbw5z2ma4hkrg3i697bx0j8w7ggpxyj1d7kv7fgya8cdr15lx"; + sha256 = "0aakswgqk6cfamq3h6fxdls81ia7v3fi1v825i5pdrgzbh293blw"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; test-prof = { groups = [ @@ -4497,10 +4446,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; + sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.1"; }; timeout = { groups = [ @@ -4531,6 +4480,22 @@ }; version = "0.14.1"; }; + tsort = { + groups = [ + "default" + "development" + "pam_authentication" + "production" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n"; + type = "gem"; + }; + version = "0.2.0"; + }; tty-color = { groups = [ "default" ]; platforms = [ ]; @@ -4662,10 +4627,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc"; + sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c"; type = "gem"; }; - version = "3.1.4"; + version = "3.2.0"; }; unicode-emoji = { groups = [ @@ -4675,10 +4640,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c"; + sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9"; type = "gem"; }; - version = "4.0.4"; + version = "4.1.0"; }; uri = { groups = [ @@ -4785,10 +4750,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sn399i804pg87b1j30x8lv2602qcndhvg0k0g4xqdfxg28zdipp"; + sha256 = "1z710ndfr9yajywhji8mr5gc3j3wnr0alq754q15nh7k73wgbrlv"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.3"; }; webfinger = { dependencies = [ @@ -4815,10 +4780,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db"; + sha256 = "0w1x1k3bkkvi1438kx9qa1b9hn6zff1ykh55278fjrax1nycsa6d"; type = "gem"; }; - version = "3.25.1"; + version = "3.26.0"; }; webpush = { dependencies = [ diff --git a/pkgs/servers/mastodon/missing-hashes.json b/pkgs/servers/mastodon/missing-hashes.json index af1b796f0a53..a1e246d54bbe 100644 --- a/pkgs/servers/mastodon/missing-hashes.json +++ b/pkgs/servers/mastodon/missing-hashes.json @@ -37,39 +37,43 @@ "@parcel/watcher-win32-arm64@npm:2.5.0": "cff6516b1dad597ca1ec8c385cf8251f5050b32ab46fc15360f2eff3a40b61b7107eee56df73764007d9bd6b826960d2f3589c8e0ce270bb5b2a292313bd7a1b", "@parcel/watcher-win32-ia32@npm:2.5.0": "ad9d2c9ae3a7031105fc90418050a910d4b679ead36e5fdcbb1b3e4afbaf56aec6566863e3a374c645c82f57073d8f643183f19c67c8c48b0aa62224c05fdb9d", "@parcel/watcher-win32-x64@npm:2.5.0": "aa9660bdb2fe70de5163f9f8419e263711fd30612244fb7feb58fce49a653b88ac0e1e29646fb1fc76b86fd8215e62eea5ded0616725987dfca5372041925bd2", - "@rollup/rollup-android-arm-eabi@npm:4.40.2": "cb502d6933de94860f9d49a4b4e849a206d10d9b1a424847cb2545667f8937ac891a37854e2934992b39521dc8b8daa2ec6b683da6bb47ef893ab24f9424c887", - "@rollup/rollup-android-arm64@npm:4.40.2": "42e04ae6605f8a31cc7daf484f9104e6d2174a99e39d829c24d77780cd257a6dab67f5c6a38e84e5a967ad4a64a042f1e6dfbe75444aa03517e83d8436179726", - "@rollup/rollup-darwin-arm64@npm:4.40.2": "8e641fd8a888504c516e76e525a7fcc099d363a82ce8569a1a5bb2fdcf632fa262e1a73b47932a922d132e0c46fab6ba04490053f63e6e4fb30c313a499b139f", - "@rollup/rollup-darwin-x64@npm:4.40.2": "9dca62986fa2afef8c5addcb1eb4ee08afbd3aa03ece3c5372a82a785af67ae441b9782dd542018fa5bb39a6de34ea53f10795d6f6f801a0469ce7979c52c729", - "@rollup/rollup-freebsd-arm64@npm:4.40.2": "f21c73712c4cb74a797998e8adfa83bb7ff0d6cc3e7353eae5b213b4bb3f9f481e025d37dd67aeee7488b9fc9ecd0bc8f85a61469cfa6592ed9292d14ba868d0", - "@rollup/rollup-freebsd-x64@npm:4.40.2": "9f8b6abb5be2527e6cffdaf0dd95a8bbb6f4aa5599be2bfe919e8252f57558f0a06b66748d29cb1e42d0b65e1d2ef0ec2d6a429d3c8a1a85352269d88ffbda17", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.2": "fc205b61c54ddaac7bb45768c3b4bbd79632df3f7bbe65532f5453d54e1a31c1d3f1e4508a00323cf0656d6c5a69f0793989d11fd0805dc2621053c8c6fbcaa3", - "@rollup/rollup-linux-arm-musleabihf@npm:4.40.2": "14fde6bac72d734462b9c2fa3594934454069d01422fe12e650ae6fc9e998daac3d43d1726a0aa040cac9d4de43cf75ca34d82932e0a2c3f564f49f0b6fba4af", - "@rollup/rollup-linux-arm64-gnu@npm:4.40.2": "1a7c361022d74025076d322cdeb741923f1d3e0d5e1a12fd4dcc678a7c3dc8a07002f6ec4d537b6f089c75b90273cd700580b9ac1b1d45fa68908eadb524f1c7", - "@rollup/rollup-linux-arm64-musl@npm:4.40.2": "2fbf7f6f28bfe5148b1a82b04569574bc865b65f6e8f874aa8b175ad3c3ee9197a9a22bc3693153f0d55ff2bd78938b15e162cafa4b77756d1933036b0520bf0", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.2": "ae77d9e7a797868fbd6887b8b4a8a26bcd96ea632022ddc47c570d90ad6e47b2ac0b3a933885c06a0af5ad57b5f818f4531ff6961b351e9705f5af6dd26b2427", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.2": "867b6bc576e07110181f41c588b1a7ee22a6571bf5a3ceff0527c1e7c4540b5122d34b99f0c56c00d5c33a2e517fbb16c3e269cc4c08110e69dc0f0e4b2fbf26", - "@rollup/rollup-linux-riscv64-gnu@npm:4.40.2": "52f07f3e5e008cd0d277d5290524682c8ec5c03e08659b07a800fddc00b450dbf8df08612921b9fe6e4e16d60d5e282027d9b260ff520c40bf3e7c5e1efabb60", - "@rollup/rollup-linux-riscv64-musl@npm:4.40.2": "6483ab13ac5626c5b94d72aad3ffafe63a3572899824b1d37e59bc071b147f3d498864a0e19942e013a4488aa9262a92817232ca6c38339e3de62c3c4aca87e3", - "@rollup/rollup-linux-s390x-gnu@npm:4.40.2": "842ad92a20ff994091d4ba4c16f87e2f8a57e1eb9e3004c20aaeeb692bc2061619dd43ba4dd246712f8904fe1480e6211b43e9fd2e11a5faebbeebea0c79da63", - "@rollup/rollup-linux-x64-gnu@npm:4.40.2": "c440df4beca32d238b0a0f0b1017fb30da52c0f705946177c01a08d7d214ae190b2070885d93e15ff5fb5741e0964e1370bdd45f8a94e9a4689816f06f18c5a0", - "@rollup/rollup-linux-x64-musl@npm:4.40.2": "9874b4cce42573d460634443ddb730d348360089bf93667309e660301e4e389d8ae80abe7f33fa9a20db5e67984e107e17d1479bdfee278d74bc60dde6ab5f83", - "@rollup/rollup-win32-arm64-msvc@npm:4.40.2": "b61552ab831efde1ca4823cab1982d3d681e1be269d67d60558cd2ac86fe3802f6d569300d9ada084acebae27257b00c68f9d858261a579b5d8686956aa92ba0", - "@rollup/rollup-win32-ia32-msvc@npm:4.40.2": "13ad059483b26bbf12af5108207d66a98ae2aef7599f27a506b998c781921b653dacc63ee0db57bb6f37c920163fd8bc40072e0be0ec6b1e5f52eb3f1455efeb", - "@rollup/rollup-win32-x64-msvc@npm:4.40.2": "98ab8600ecbeab358c53ed563a7b586da0c5cdf26c03456a982a016b2f8eff6e2ec07055d15fe039b982a18a970744390d85a05970c9a8b1533c54702026f8df", - "@unrs/resolver-binding-darwin-arm64@npm:1.3.2": "c8c61120e2bead2e0fec054399107e1ebd39455a2b7d59a5446cafad86cca376e0010e65644c41da0958a065869dcbe0509a29394b52a469a48990d32bf7a6e8", - "@unrs/resolver-binding-darwin-x64@npm:1.3.2": "ee67a4043d2e297cb1362b7aa25be3f5defef9eb13f4e80358c3f22ffdef043ef905ac661fc9e70359383bafed5837a52bd001b49a8ea4f70372051d89ee6eff", - "@unrs/resolver-binding-freebsd-x64@npm:1.3.2": "5f19ef3991435a96e682d427a8d9b28886b4afc9ea5b723e51c4bca51f25bb24add8819ed91c9f228bd39e139d51625cc127ddd35efd6c3f6e1d88106808fad1", - "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.3.2": "f77b2345c2b572b569089092fa6c08b5a55fdb08d26e1db3cdfa0d195511a0efbe109c558e77bfd78d7aed4ffe47b6542890c9cad032cc00bb0fcd5f373f5090", - "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.3.2": "8b7156d8c641994c39626522ba42e69eef8d868a69b319c9ea5f7584ef0c4ea98bc698c1a4417d209dd3a786630be404d459680cf5b5b2500d3c4b0eb1be894f", - "@unrs/resolver-binding-linux-arm64-gnu@npm:1.3.2": "93b28c2ea0dae2d452659e0afde6099107b70362043e19800e35b7ae86350856dfa0a4d6ba2be566c225965b458b5fba78a10219cf78e6fc0c581373cd2e2a52", - "@unrs/resolver-binding-linux-arm64-musl@npm:1.3.2": "49ed9f24838e876eb1bba9b5f3e283af0716ee23f7d11a799a6376a47fa59a2e28b724431ca165a3874d60b1ed5a6b6c7650fe207f0610a788c88baa7862688f", - "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.3.2": "9fad22ffbf7aadf471a6d054c833a9b4cea74e2c38be40d546e6ba71058a6be10fa4e28947425ef33d42dc77de1c81b631fbff5a96a637c3a7652910f3e27d76", - "@unrs/resolver-binding-linux-s390x-gnu@npm:1.3.2": "dd28e351f19268c4735da984e96301d8433603cf109b2b6880aab9bb8f448242699b7f84c36c536ca4a9443f944153098a3d3e78fce26d0c56fe3406d73d4b55", - "@unrs/resolver-binding-linux-x64-gnu@npm:1.3.2": "e1cc70d8e012bc61bf5af85c2e9905aa1953c06daaab9b3857d780424c62807ccd0c5a20acb919e3accec7152badee426b1514ab9a4256b77945c3e7c8df3496", - "@unrs/resolver-binding-linux-x64-musl@npm:1.3.2": "e97b95e53d029e4ccaf7cf32072e644c495d8e1f097b6fdeb417860db4db4b752d84f5fa6310b9f170a1fbf0562696f0145005dda4a95d658ea0857fac6c51dd", - "@unrs/resolver-binding-wasm32-wasi@npm:1.3.2": "d3f16f36ba5dd714ef3eaf7bc57597e9f9a1fab7c6b5fb5dc5bf688d81a1bd4a574da16bd3e2b383181032a71001583b6534c21e5ffde1ee43fcfa95bc292f3b", - "@unrs/resolver-binding-win32-arm64-msvc@npm:1.3.2": "de65010d133e99a062827f698a7e50c30db15d9f6b9011d351762cc8809497e97c4617b7d6ca3052583ca3f6b8c3cb1f2857fd0c9afd944c7ebb65d5e1da74f6", - "@unrs/resolver-binding-win32-ia32-msvc@npm:1.3.2": "f214a8950e823c60656d2d113584c3cd20c6e92668f43f73c13c3ddfe38a7063615e42537645e2aa52a0652ace9c82e8fd5d9411043a6985ccb49d8dc8bb2595", - "@unrs/resolver-binding-win32-x64-msvc@npm:1.3.2": "38ca5f5912d7cddd3f3e1983ad8e79d084ab3f5990189ce8cdfcfc3b58d97cc0dd7b543cc78ff43eb1769d15a8c235339a5942c688ab680192caa4c97116a511" + "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8", + "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be", + "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019", + "@rollup/rollup-darwin-x64@npm:4.46.2": "c53e31df756cb8d44e179c167db1ec5d321225561a1aff2b320091c226c2dfafd080a98a1466f2dc697ff0173b52c41d89c60cae97f73b41fbd128d4c87fde66", + "@rollup/rollup-freebsd-arm64@npm:4.46.2": "9495d87e670bbea87e43d06df53ae83fcd46e2c82a80927556f3516ac76613b8b7739bbd4b43c3f264bbab57a50a3b6cd2dfa6c1b2741bd3acdeba8af7c47018", + "@rollup/rollup-freebsd-x64@npm:4.46.2": "890a965b45f4c4b9beb4696912ee30472180a040dafb24ce32f8811aed4d0d0ee90bf675d234abc6d8e66266d2966a72483fff7e6f1dbd116424b23e18fe38a9", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2": "ce9720f61b4f7d9a791ba78e13cbbea67ef5f46c465e054c08f009cd06de8c1e4518df8e8578366a27cc9ae4280d37528dd0762906a19e820ca1a95158b47090", + "@rollup/rollup-linux-arm-musleabihf@npm:4.46.2": "b884f568a681d8c13ffdfa77ad6183ed6f7f9fe5bc952b1c82dc21e36b4bc8eb7ee292168929a2575ff5ff14582060d7d73c583aef7edf04fd0bddd67140f4b0", + "@rollup/rollup-linux-arm64-gnu@npm:4.46.2": "519477372d8358a4d3f1f1245bc2b5b57b65960f9a7d02bc5795ba68aed471fe87b20391a63c334bf0abb94085ad8c89d8d3b2e4d79ca0fed702537e9a0949eb", + "@rollup/rollup-linux-arm64-musl@npm:4.46.2": "a5dec7799dd832b5374171a73a6b57cffef8be317482dd9ea4e6554db6fc8afb4bdb91ec725502f1b378aa9cb9a1333684056d55c9120262cb7744a33b961a76", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2": "76ebbf40535f68c6922edf7d866dad00608cd475c8436d199653341ea09124cb4478f67c12d32b5363634f3f811926acb14a086eb146a1fe6b310fdbde01f2c8", + "@rollup/rollup-linux-ppc64-gnu@npm:4.46.2": "31b62a51393e0f2608e1133701523e894ff5d04038e3d9af95abf595ab7fbe827167a651b200e9975d0e76904699cde3428aa1afbf46bf939f836f8ef90b1d88", + "@rollup/rollup-linux-riscv64-gnu@npm:4.46.2": "4f22bc5fe58730026085d1a5372b51d9ed933b314cde2d3dec1d73ad76106406915c313d331f094176ed917863c0041667e63184d9730da7107b11266dad477f", + "@rollup/rollup-linux-riscv64-musl@npm:4.46.2": "1bc37b77ac38d7e82e7d661b67fc043a1db01272a0566e5432c61e3c7a5e6c11b5ecb4a49547da2de33a8e0a7b0d685f3c7341572fa77c90e9b71e515f753e86", + "@rollup/rollup-linux-s390x-gnu@npm:4.46.2": "1b1821a848d8bf86fa5e01ae57f60ebe5566cbcb0c605b5d05050821e94b8b45a72515ef302a3021196018b289aaffade5c41a5f89b3f8324d509a25d28dcfc4", + "@rollup/rollup-linux-x64-gnu@npm:4.46.2": "66231802689c1ac1d6ecec6fd65d14c01c900537e588808e0a2c92ba34e322665bb6df3853500717cf600f40a93de4c490838290e21bb10eed4249f587a08109", + "@rollup/rollup-linux-x64-musl@npm:4.46.2": "064ed54e9ddb05eec1b5da5ac8366f3290b7b65e63959a76a26d6940ce44d741c30488e39ce94c51a2679b2c56217c2e0aaf74e123a1c0928503712c115d6047", + "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c", + "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7", + "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49", + "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", + "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", + "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", + "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848", + "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5", + "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea", + "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419", + "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022", + "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea", + "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b", + "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207", + "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c", + "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e", + "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8", + "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824", + "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5", + "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9", + "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854", + "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940" } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 348bd973f3b8..a57f431d4789 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -5,17 +5,17 @@ patches ? [ ], }: let - version = "4.4.8"; + version = "4.5.0"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-EE0A9EH+8ND9Whig2dhM27EONjJfdVtd9g+Mo0/2iHo="; + hash = "sha256-06OXK4lscmEX6qDy2GRnO2plZW2ngQoqS/9FiVgsgeM="; passthru = { inherit version; - yarnHash = "sha256-K1EqeLi4dWnaLIaUU5apxE5ZOM98XBn6KTHWTkPLWE0="; + yarnHash = "sha256-FxJe18DBfdEhbuWoFem/ozbbiUD9R/+BjHuwNGK+jRY="; yarnMissingHashes = ./missing-hashes.json; }; }; From c140fd4f1bcc9afd375c77d54352f10eb2ae0707 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 7 Nov 2025 08:35:14 -0300 Subject: [PATCH 1477/2279] bbedit: fix build --- pkgs/by-name/bb/bbedit/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix index 7537b198f9f9..2c39f1e6ca57 100644 --- a/pkgs/by-name/bb/bbedit/package.nix +++ b/pkgs/by-name/bb/bbedit/package.nix @@ -27,6 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + # app bundle may be messed up by standard fixup + dontFixup = true; + meta = { description = "Powerful and full-featured professional HTML and text editor for macOS"; homepage = "https://www.barebones.com/products/bbedit/"; From e47bfb02b37ea7ed2449ab803c962cd42a06f692 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 7 Nov 2025 19:47:17 +0800 Subject: [PATCH 1478/2279] wemeet: 3.26.10.400 -> 3.26.10.401 --- pkgs/by-name/we/wemeet/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index e7122a299b35..a332c97757d8 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -133,16 +133,16 @@ let in stdenv.mkDerivation { pname = "wemeet"; - version = "3.26.10.400"; + version = "3.26.10.401"; src = selectSystem { x86_64-linux = fetchurl { - url = "https://updatecdn.meeting.qq.com/cos/9cfd93b10ee81b2fc3ad26357f27ed13/TencentMeeting_0300000000_3.26.10.400_x86_64_default.publish.officialwebsite.deb"; - hash = "sha256-7gN40mkAD/0/k0E+bBNfiMcY+YtIaLWycFoI+hhrjgc="; + url = "https://updatecdn.meeting.qq.com/cos/72e0e0023e1d1e6d4123fba28821aea1/TencentMeeting_0300000000_3.26.10.401_x86_64_default.publish.officialwebsite.deb"; + hash = "sha256-cPN7ApIJwO+RvpgT7r9mUMbLmgD3xxhJAVh3Pi/mrK8="; }; aarch64-linux = fetchurl { - url = "https://updatecdn.meeting.qq.com/cos/e5f447f30343e27c49438db8d035ae23/TencentMeeting_0300000000_3.26.10.400_arm64_default.publish.officialwebsite.deb"; - hash = "sha256-ShxcDwwBThwe2YKNy/5+HmYcnnodPhrMaOwkw3gTq0E="; + url = "https://updatecdn.meeting.qq.com/cos/c06d6bc4a3370dbfb2f43bbc6ff8969e/TencentMeeting_0300000000_3.26.10.401_arm64_default.publish.officialwebsite.deb"; + hash = "sha256-W50E1bmqJLPDU7FY0qNKPlh1z8A9Ez1Gc+NrHQhBwgI="; }; }; From 264a60c02589e38f31f1d134cd3fe4659ea5b29f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 11:57:15 +0000 Subject: [PATCH 1479/2279] ledger-live-desktop: 2.131.1 -> 2.132.0 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index c201fa010d2a..c191781aa357 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.131.1"; + version = "2.132.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-O5pdrnnAfDrgP8s4A0R/mf7Mx6U2VWPNqaky+rExzgc="; + hash = "sha256-wxOzx8Eo/AAbPor/nA3gjVC8vAfRTNjVmvxON5Ta5d0="; }; appimageContents = appimageTools.extractType2 { From a21f7eee9de00a8ccd7a2b5c0e250312f77ef3ed Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Fri, 7 Nov 2025 13:01:28 +0100 Subject: [PATCH 1480/2279] databricks-cli: 0.270.0 -> 0.276.0 --- pkgs/by-name/da/databricks-cli/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 4cb2ec023d5c..7973ac33c3b3 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.270.0"; + version = "0.276.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-DCgj2IXGidWET8jCmmmuz9viOjdO89UqloZ5yvnXluk="; + hash = "sha256-iD8fB/sMHBGSL6pCEN3TPxlgcBd7+ckPXd7Gq3CLPEM="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,12 +25,13 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-U5H20Csk8EhIqmUBN8DVYA5jta2LoGLs/EYiZbGo6Tc="; + vendorHash = "sha256-mFM5i1ec+eB4IhxoZipMgXK3IZm9KcSmifE2kJRV9BY="; excludedPackages = [ "bundle/internal" "acceptance" "integration" + "tools/testrunner" ]; ldflags = [ From d3122d7a9290b18f3e3dc86af7ac83654d659cb4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Nov 2025 13:00:49 +0100 Subject: [PATCH 1481/2279] projecteur: use `finalAttrs` pattern --- pkgs/os-specific/linux/projecteur/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 1ee127f15b80..b4c55d9cb9a0 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -10,14 +10,14 @@ udevCheckHook, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "projecteur"; version = "0.10"; src = fetchFromGitHub { owner = "jahnf"; repo = "Projecteur"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = false; hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A="; }; @@ -56,4 +56,4 @@ mkDerivation rec { ]; platforms = lib.platforms.linux; }; -} +}) From 9d2630ce05d840c0a9c1d608539b1e0b87846444 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 12:03:10 +0000 Subject: [PATCH 1482/2279] terraform-providers.fastly_fastly: 8.3.2 -> 8.4.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 6b094731b9e2..ab1380f9675c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,11 +390,11 @@ "vendorHash": null }, "fastly_fastly": { - "hash": "sha256-b/lAUadx6vRzA5QfzEboqwZYO7vWxPV00XD81uXLK1k=", + "hash": "sha256-3jXm7uY93g2NE6HfaWKQqQr05AvnCKvzt3981thgV8Q=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v8.3.2", + "rev": "v8.4.0", "spdx": "MPL-2.0", "vendorHash": "sha256-NBp18Ult6o1hQUEZX1r9I0ebfY9VnwVY4QhChIjsGSI=" }, From 5007dc33a72e43d34937f9fd9226d89e2e0d8393 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Nov 2025 13:03:04 +0100 Subject: [PATCH 1483/2279] projecteur: add `versionCheckHook` --- pkgs/os-specific/linux/projecteur/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index b4c55d9cb9a0..726728539586 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -8,6 +8,7 @@ qtgraphicaleffects, wrapQtAppsHook, udevCheckHook, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -38,14 +39,16 @@ stdenv.mkDerivation (finalAttrs: { udevCheckHook ]; - doInstallCheck = true; - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}" "-DPACKAGE_TARGETS=OFF" "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)"; homepage = "https://github.com/jahnf/Projecteur"; From 38d6bdf45fd7d132e0ae5e006f5162fa008cf6a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 12:04:31 +0000 Subject: [PATCH 1484/2279] stasis: 0.5.2 -> 0.6.1 --- pkgs/by-name/st/stasis/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix index 63ebd8057440..e6a3029dc41c 100644 --- a/pkgs/by-name/st/stasis/package.nix +++ b/pkgs/by-name/st/stasis/package.nix @@ -14,16 +14,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stasis"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "saltnpepper97"; repo = "stasis"; tag = "v${finalAttrs.version}"; - hash = "sha256-t8molNHV0FnJO9F2muME2JAfw6EtxDQZiQX3JFW8DTs="; + hash = "sha256-GES7mBWEEyute/ljl7JiwzbgFSk4+JR5YUia4+Wzs3I="; }; - cargoHash = "sha256-nACVS4BAjtI+aRO8Tg0FdOQSXiZMX/iVh22w0s6NLpw="; + cargoHash = "sha256-+SGeuT0oAt5T15eZABGegiVhyV4GcHDp4LMMRpCl/U0="; nativeBuildInputs = [ pkg-config From 4bf7679772b243e4ab04b71788a27c4aa805634a Mon Sep 17 00:00:00 2001 From: kyehn Date: Thu, 30 Oct 2025 10:29:50 +0000 Subject: [PATCH 1485/2279] scip: 0.6.0 -> 0.6.1 Diff: https://github.com/sourcegraph/scip/compare/v0.6.0...v0.6.1 Changelog: https://github.com/sourcegraph/scip/blob/refs/tags/v0.6.1/CHANGELOG.md --- pkgs/by-name/sc/scip/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix index 7ba2d321cc1e..e7f552274ce8 100644 --- a/pkgs/by-name/sc/scip/package.nix +++ b/pkgs/by-name/sc/scip/package.nix @@ -10,20 +10,19 @@ buildGo124Module (finalAttrs: { pname = "scip"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZyU1CmDBVDNP6zCXpvqEoQ3ttWNPGLCIjkj4mezUcKc="; + hash = "sha256-l68xhOMgwt+ySChk7BCyklcuC6r51GgobAg3lRLvOCU="; }; - vendorHash = "sha256-RwBlzBqGd/xEaTL6m3sm6e/tcNUc7Mfdf213qzuMPug="; + vendorHash = "sha256-8HgeG/SXkM7ptOwKSi/PUH3VySxFqqoIpXI7bZtbO4A="; ldflags = [ "-s" - "-w" "-X=main.Reproducible=true" ]; @@ -56,6 +55,6 @@ buildGo124Module (finalAttrs: { homepage = "https://github.com/sourcegraph/scip"; changelog = "https://github.com/sourcegraph/scip/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ ]; }; }) From 86a379258b0350aa54e15a63d78648d8c33502f6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Nov 2025 10:44:55 +0000 Subject: [PATCH 1486/2279] python3Packages.coffea: 2025.10.2 -> 2025.11.0 Diff: https://github.com/CoffeaTeam/coffea/compare/v2025.10.2...v2025.11.0 Changelog: https://github.com/CoffeaTeam/coffea/releases/tag/v2025.11.0 --- pkgs/development/python-modules/coffea/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 32524ca40c76..55a37b4ff4cb 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -18,6 +18,7 @@ dask-histogram, fsspec, hist, + ipywidgets, lz4, matplotlib, mplhep, @@ -27,6 +28,7 @@ pandas, pyarrow, requests, + rich, scipy, toml, tqdm, @@ -42,14 +44,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2025.10.2"; + version = "2025.11.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; tag = "v${version}"; - hash = "sha256-vTTjdffQHzKnU41rW5XYTD7C4pH2fxhSy8mfKGMZbLc="; + hash = "sha256-vv1eHb8vt4nxdnpLmE0J5g/3oYmcoIykKCuOcQoxA60="; }; build-system = [ @@ -72,6 +74,7 @@ buildPythonPackage rec { dask-histogram fsspec hist + ipywidgets lz4 matplotlib mplhep @@ -81,6 +84,7 @@ buildPythonPackage rec { pandas pyarrow requests + rich scipy toml tqdm From 6f82fffdf22ceaa10f4a3720bc5eed7fc82bc8fa Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 7 Nov 2025 07:16:02 -0500 Subject: [PATCH 1487/2279] nixos/gnome-initial-setup: Fix dependency ordering The upstream unit dependencies in `${gnome-initial-setup}/share/systemd/user/gnome-session.target.wants` and `${gnome-initial-setup}/share/systemd/user/graphical-session-pre.target.wants` were the other way around. The way we had it caused a systemd unit cycle. TODO: Build a way to use the upstream `.wants` dirs. --- nixos/modules/services/desktops/gnome/gnome-initial-setup.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index f12113251d6a..3df01b59738d 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -77,11 +77,11 @@ in ]; systemd.user.targets."gnome-session".wants = [ - "gnome-initial-setup-copy-worker.service" + "gnome-initial-setup-first-login.service" ]; systemd.user.targets."graphical-session-pre".wants = [ - "gnome-initial-setup-first-login.service" + "gnome-initial-setup-copy-worker.service" ]; systemd.user.targets."gnome-session@gnome-initial-setup".wants = [ From e44ebca0433ad57c10328184f2781dd00c07d3c8 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 13:19:07 +0100 Subject: [PATCH 1488/2279] nixosTests.freshrss.extensions: replace lxml-stubs with types-lxml lxml-stubs is broken, unmaintained upstream, and advertises types-lxml as its successor [1]. Also don't skip type checking anymore as it now passes. [1] https://github.com/lxml/lxml-stubs --- nixos/tests/freshrss/extensions.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix index d956d4fe32fb..bf624a6041b6 100644 --- a/nixos/tests/freshrss/extensions.nix +++ b/nixos/tests/freshrss/extensions.nix @@ -16,9 +16,8 @@ }; extraPythonPackages = p: [ p.lxml - p.lxml-stubs + p.types-lxml ]; - skipTypeCheck = true; testScript = '' machine.wait_for_unit("multi-user.target") From 4431e491067fdec79029ed10e153db7390738e3d Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 13:21:44 +0100 Subject: [PATCH 1489/2279] python313Packages.lxml-stubs: drop lxml-stubs is broken, unmaintained upstream, and advertises types-lxml as its successor [1]. [1] https://github.com/lxml/lxml-stubs --- .../python-modules/lxml-stubs/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/lxml-stubs/default.nix diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix deleted file mode 100644 index 7562874daaa0..000000000000 --- a/pkgs/development/python-modules/lxml-stubs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - lxml, - pytest-mypy-plugins, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "lxml-stubs"; - version = "0.5.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "lxml"; - repo = "lxml-stubs"; - tag = version; - hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ lxml ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-mypy-plugins - ]; - - disabledTests = [ - # Output difference, https://github.com/lxml/lxml-stubs/issues/101 - "etree_element_iterchildren" - ]; - - meta = with lib; { - description = "Type stubs for the lxml package"; - homepage = "https://github.com/lxml/lxml-stubs"; - license = licenses.asl20; - maintainers = with maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 22b3143b797d..bd55bef928de 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -242,6 +242,7 @@ mapAliases { lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29 logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29 loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29 + lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07 mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29 macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04 Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 451502c1d2ee..455b55c2d238 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8967,8 +8967,6 @@ self: super: with self; { lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { }; - lxml-stubs = callPackage ../development/python-modules/lxml-stubs { }; - lyricwikia = callPackage ../development/python-modules/lyricwikia { }; lz4 = callPackage ../development/python-modules/lz4 { }; From b7bbae81a8fee5a1863d3f21d359bb9ea2d0a6d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 12:49:50 +0000 Subject: [PATCH 1490/2279] coc-flutter: 0-unstable-2023-03-22 -> 1.9.3-unstable-2023-03-22 --- pkgs/by-name/co/coc-flutter/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-flutter/package.nix b/pkgs/by-name/co/coc-flutter/package.nix index e720ed66bc48..1451c935e879 100644 --- a/pkgs/by-name/co/coc-flutter/package.nix +++ b/pkgs/by-name/co/coc-flutter/package.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "coc-flutter"; - version = "0-unstable-2023-03-22"; + version = "1.9.3-unstable-2023-03-22"; src = fetchFromGitHub { owner = "iamcco"; From 18e4ed738312e03f66e5b9b0b458beeed0e5a9a1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Nov 2025 13:51:31 +0100 Subject: [PATCH 1491/2279] haskellPackages.pdftotext: move jailbreak into overrideCabal --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d31e2e788679..cc24b84c8ea4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2932,6 +2932,7 @@ with haskellLib; zinza = dontCheck super.zinza; pdftotext = overrideCabal (drv: { + jailbreak = true; postPatch = '' # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6 substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources @@ -2943,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext))); + }) (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)); # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403 From 2f1f72d5a2ea8d96f5ba200567815cb6d43d79f3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Nov 2025 13:53:56 +0100 Subject: [PATCH 1492/2279] haskellPackages.pdftotext: use existing poppler-cpp input This is correctly added to libraryPkgconfigDepends where it needs to go. We could drop this in the future if we add a corresponding mapping to cabal2nix. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc24b84c8ea4..ce2c3143bb67 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2944,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)); + }) (super.pdftotext.override { poppler-cpp = pkgs.poppler; }); # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403 From 2aba3c894e60218d2c6f9936ac134edaafa831da Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 14:03:35 +0100 Subject: [PATCH 1493/2279] cjdns: fix build --- pkgs/by-name/cj/cjdns/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix index b52a910f59da..ce1bd7ad125d 100644 --- a/pkgs/by-name/cj/cjdns/package.nix +++ b/pkgs/by-name/cj/cjdns/package.nix @@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec { 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="; From ea6198b00e03eff35c6790ecb15625719d308336 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 14:07:48 +0100 Subject: [PATCH 1494/2279] cjdns: add meta.changelog --- pkgs/by-name/cj/cjdns/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix index ce1bd7ad125d..f6f2ce3a71dc 100644 --- a/pkgs/by-name/cj/cjdns/package.nix +++ b/pkgs/by-name/cj/cjdns/package.nix @@ -86,8 +86,9 @@ rustPlatform.buildRustPackage rec { passthru.tests.basic = nixosTests.cjdns; meta = { - homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; + homepage = "https://github.com/cjdelisle/cjdns"; + changelog = "https://github.com/cjdelisle/cjdns/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; From a0e4d5fa7e8a0b92dc0235634aebd32a89cc0b66 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 7 Nov 2025 14:08:42 +0100 Subject: [PATCH 1495/2279] projecteur: remove obsolete `postPatch` step --- pkgs/os-specific/linux/projecteur/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix index 726728539586..30ae0ba4543d 100644 --- a/pkgs/os-specific/linux/projecteur/default.nix +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A="; }; - postPatch = '' - sed '1i#include ' -i src/device.h # gcc12 - ''; - buildInputs = [ qtbase qtgraphicaleffects From 42369a0ad0568bb496ba2598054cdc870d720e03 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 7 Nov 2025 13:03:46 +0000 Subject: [PATCH 1496/2279] todds: fix cuda build, cleanup --- pkgs/by-name/to/todds/package.nix | 40 ++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix index e77fec6f4e25..edf79a484893 100644 --- a/pkgs/by-name/to/todds/package.nix +++ b/pkgs/by-name/to/todds/package.nix @@ -1,16 +1,30 @@ { lib, + config, stdenv, + fetchFromGitHub, + + # nativeBuildInputs cmake, + ispc, ninja, pkg-config, - ispc, + cudaPackages, + + # buildInputs boost, fmt, hyperscan, - opencv, onetbb, - fetchFromGitHub, + opencv, + + # tests + versionCheckHook, + + # passthru + nix-update-script, + + cudaSupport ? config.cudaSupport, }: stdenv.mkDerivation (finalAttrs: { pname = "todds"; @@ -22,30 +36,44 @@ stdenv.mkDerivation (finalAttrs: { owner = "todds-encoder"; repo = "todds"; tag = finalAttrs.version; - hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c="; fetchSubmodules = true; + hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c="; }; nativeBuildInputs = [ cmake + ispc ninja pkg-config - ispc + ] + ++ lib.optionals cudaSupport [ + (lib.getBin cudaPackages.cuda_nvcc) ]; buildInputs = [ boost fmt hyperscan - opencv onetbb + opencv + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart ]; strictDeps = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "CPU-based DDS encoder optimized for fast batch conversions with high encoding quality"; homepage = "https://github.com/todds-encoder/todds"; + changelog = "https://github.com/todds-encoder/todds/releases/tag/${finalAttrs.version}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ weirdrock ]; mainProgram = "todds"; From 0ef2e58999a3cb56f1f3f9ee7cb0dc9c9bfe09c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 13:11:29 +0000 Subject: [PATCH 1497/2279] coc-rust-analyzer: 0-unstable-2025-10-31 -> 0-unstable-2025-11-01 --- pkgs/by-name/co/coc-rust-analyzer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index 278b29e6a592..e41f5bcd892d 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,7 +7,7 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2025-10-31"; + version = "0-unstable-2025-11-01"; src = fetchFromGitHub { owner = "fannheyward"; From 86f27bc30435910a2273e7d4dc168fe67c226b87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 13:21:47 +0000 Subject: [PATCH 1498/2279] gfal2: 2.23.2 -> 2.23.5 --- pkgs/by-name/gf/gfal2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index 62e9714929b6..7c8e2fbd55bb 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gfal2"; - version = "2.23.2"; + version = "2.23.5"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2"; rev = "v${finalAttrs.version}"; - hash = "sha256-gyEmz0sNHyxjvJA/3uSzLW42PQ3UVKx6nptNYl/3ExM="; + hash = "sha256-Dt6xA7U4aPKFZmO2iAiYM99w5ZIZNQJ+JXzuVItIlBM="; }; passthru.enablePluginStatus = { From dfa87a7f1621a1abca9f56b923f06d383bbf426f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 13:34:43 +0000 Subject: [PATCH 1499/2279] planify: 4.15.1 -> 4.15.2 --- pkgs/by-name/pl/planify/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index 55bc6548512a..5a89ecce1279 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.15.1"; + version = "4.15.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; tag = "v${version}"; - hash = "sha256-b0I6UXdE0EqRP9FrqRyf1CscYSlYjFPcmIgkMjCLWMc="; + hash = "sha256-i6yAObfSMZyHHK/1YUFppU9gcFJj7WL48Eqe6IQAh4M="; }; nativeBuildInputs = [ From d0b482bc1755ffe5131c92111caaf61bbfa8f00c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 13:40:06 +0000 Subject: [PATCH 1500/2279] coc-vimlsp: 0-unstable-2023-06-26 -> 0.8.0-unstable-2023-06-26 --- pkgs/by-name/co/coc-vimlsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix index 06ac152b85e4..7090854bc472 100644 --- a/pkgs/by-name/co/coc-vimlsp/package.nix +++ b/pkgs/by-name/co/coc-vimlsp/package.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "coc-vimlsp"; - version = "0-unstable-2023-06-26"; + version = "0.8.0-unstable-2023-06-26"; src = fetchFromGitHub { owner = "iamcco"; From 35418f012f1c7dec2532a77ebfc896f768835b15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 13:43:44 +0000 Subject: [PATCH 1501/2279] helix-db: 2.0.5 -> 2.1.0 --- pkgs/by-name/he/helix-db/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix index 30ad67eed5e4..6175bd201978 100644 --- a/pkgs/by-name/he/helix-db/package.nix +++ b/pkgs/by-name/he/helix-db/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "helix-db"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { repo = "helix-db"; owner = "HelixDB"; tag = "v${finalAttrs.version}"; - hash = "sha256-lNAaOpF6g2yunGP9bgsMVvVc7YMfZ44WfkumR+8Btlg="; + hash = "sha256-ucDo8jvVBM0KmCTSEbduBYHJSHAJljJQg1+HEQvJ7pU="; }; - cargoHash = "sha256-YCBTSm252eUJeOyMIEcZ+0AyHoYM1QceYSHhp+qwf6Q="; + cargoHash = "sha256-LimHFXr7hacpBaULSbMz+q/j3R943HDz2fQir1FA2E0="; patches = [ #There are no feature yet From 85802e3c4ac522364440fa2820e8528893c89e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Neumann?= Date: Fri, 7 Nov 2025 15:08:31 +0100 Subject: [PATCH 1502/2279] adminneo: Replace Makefile hack by passing PHP flag --- pkgs/by-name/ad/adminneo/package.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix index f2922edebaed..33cf4825cb9e 100644 --- a/pkgs/by-name/ad/adminneo/package.nix +++ b/pkgs/by-name/ad/adminneo/package.nix @@ -21,16 +21,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { php ]; - # Package provides a Makefile, which is currently broken - # https://github.com/adminneo-org/adminneo/issues/161 - # As soon, as this is fixed, the buildPhase can be removed - buildPhase = '' - runHook preBuild - - ${php}/bin/php bin/compile.php - - runHook postBuild - ''; + makeFlags = [ + "PHP=${php}/bin/php" + ]; installPhase = '' runHook preInstall From cac9cac707de7d993f11439947247f430a3d4754 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 14:09:26 +0000 Subject: [PATCH 1503/2279] hcloud: 1.55.0 -> 1.56.0 --- pkgs/by-name/hc/hcloud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix index 72076d9a6e21..674b4c2fdbbb 100644 --- a/pkgs/by-name/hc/hcloud/package.nix +++ b/pkgs/by-name/hc/hcloud/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; tag = "v${version}"; - hash = "sha256-4UPZ3SCKTjmSt6mm0zHwecVq3UtR+cSkQmNdbkq/dMY="; + hash = "sha256-mK4CF3Is+gfu7euU5drU3jZitAe7501lvpy6N6NXLCI="; }; - vendorHash = "sha256-heCGRW8yT/aTrh4PKj62P8EPT7mXVDMo9Z8pIypOT6o="; + vendorHash = "sha256-geFjIYvVhbKpwGsEuSm3NbYt8kkBsLtJqCmnY4zhJL8="; ldflags = [ "-s" From 5d38a7995a1089a6c319be0e5bb919fad25236da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 14:15:19 +0000 Subject: [PATCH 1504/2279] nnd: 0.57 -> 0.58 --- pkgs/by-name/nn/nnd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix index 3eee2f2ee8d8..b38f98afec73 100644 --- a/pkgs/by-name/nn/nnd/package.nix +++ b/pkgs/by-name/nn/nnd/package.nix @@ -8,16 +8,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "nnd"; - version = "0.57"; + version = "0.58"; src = fetchFromGitHub { owner = "al13n321"; repo = "nnd"; tag = "v${finalAttrs.version}"; - hash = "sha256-olW1Sx29TPw9TFCKZcIbKZU1LHObVGD6/vpl4EY27BE="; + hash = "sha256-+6qIGs8O7EoziP03qJJ+tztxoubnnBwDijD84UZ0C4c="; }; - cargoHash = "sha256-9y0CLBYFfasyJLWyD26B3ZdUkkNJV9Y8BHJGdMEVwKY="; + cargoHash = "sha256-pLGLMz7q63uEr9lGeq25q8fKWY+D75PRmS7bDO4ZyKM="; meta = { description = "Debugger for Linux"; From 4125339410d9e2ea2d3b3c9b308391fd9bb98cb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 14:30:23 +0000 Subject: [PATCH 1505/2279] emmylua-check: 0.16.0 -> 0.17.0 --- pkgs/by-name/em/emmylua-check/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix index 7dbf104870d6..a973b97fa508 100644 --- a/pkgs/by-name/em/emmylua-check/package.nix +++ b/pkgs/by-name/em/emmylua-check/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_check"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; + hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg="; }; buildAndTestSubdir = "crates/emmylua_check"; - cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; + cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8="; nativeInstallCheckInputs = [ versionCheckHook From 2f46dc62dd3c7d525a42d8fabd957c2196243a43 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Fri, 7 Nov 2025 15:35:25 +0100 Subject: [PATCH 1506/2279] maintainers/scripts/get-maintainer-pings-between: drop documentation The script was dropped in commit 44e4c1ba9f7521ab1ffcd04691677c3a306897ef as part of PR #452566, but the corresponding README entry was left in place. This change removes that README entry. --- maintainers/scripts/README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 6ae6cb851bc4..fd6e8bd21f64 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -52,17 +52,6 @@ The maintainer is designated by a `selector` which must be one of: [`maintainer-list.nix`]: ../maintainer-list.nix -### `get-maintainer-pings-between.sh` - -Gets which maintainers would be pinged between two Nixpkgs revisions. -Outputs a JSON object on stdout mapping GitHub usernames to the attributes that they would be getting pinged for. - -Example: - -```sh -maintainers/scripts/get-maintainer-pings-between.sh HEAD^ HEAD -``` - ## Conventions ### `sha-to-sri.py` From afac8b5aa13ca0e6b94fbdd1e4580d870ee4ec70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 14:37:52 +0000 Subject: [PATCH 1507/2279] emmylua-doc-cli: 0.16.0 -> 0.17.0 --- pkgs/by-name/em/emmylua-doc-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix index cbd96a27de53..b0c4642ead5e 100644 --- a/pkgs/by-name/em/emmylua-doc-cli/package.nix +++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix @@ -6,18 +6,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_doc_cli"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; + hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg="; }; buildAndTestSubdir = "crates/emmylua_doc_cli"; - cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; + cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8="; nativeInstallCheckInputs = [ versionCheckHook From 5a3298f644d7fd3c72be78f1ce206db42e76d85d Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 15:46:07 +0100 Subject: [PATCH 1508/2279] jql: cleanup --- pkgs/by-name/jq/jql/package.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index 63c062a4ae02..bddd524cf6e0 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -2,32 +2,44 @@ lib, fetchFromGitHub, rustPlatform, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jql"; version = "8.0.9"; src = fetchFromGitHub { owner = "yamafaktory"; repo = "jql"; - rev = "jql-v${version}"; + tag = "jql-v${finalAttrs.version}"; hash = "sha256-1gkKOOR2mIUKrbVb1BlFxVuskL6y7s6mrI99xTfjjTI="; }; cargoHash = "sha256-7pSvHZqvPW9SXwU0AtQHIjgHQCSKPzrBhNxLY5ZAcMw="; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "JSON Query Language CLI tool built with Rust"; homepage = "https://github.com/yamafaktory/jql"; - changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; - license = with licenses; [ + changelog = "https://github.com/yamafaktory/jql/releases/tag/${finalAttrs.src.tag}"; + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ akshgpt7 ]; mainProgram = "jql"; }; -} +}) From 651467f688ffa4946116fa3e4d68fe266681bf1a Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 15:55:43 +0100 Subject: [PATCH 1509/2279] catnip: cleanup --- pkgs/by-name/ca/catnip/package.nix | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix index 13275ec04617..9caff3b40356 100644 --- a/pkgs/by-name/ca/catnip/package.nix +++ b/pkgs/by-name/ca/catnip/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, pkg-config, portaudio, - testers, - catnip, + versionCheckHook, + nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "catnip"; version = "1.8.7"; src = fetchFromGitHub { owner = "noriah"; repo = "catnip"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M9VGpDsBambe9kXyEgDg53pKOSL2zH1ugfSbRgAiaCo="; }; @@ -31,22 +31,25 @@ buildGoModule rec { ldflags = [ "-s" - "-w" - "-X=main.version=${version}" + "-X=main.version=${finalAttrs.version}" ]; - passthru.tests = { - version = testers.testVersion { - package = catnip; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Terminal audio visualizer for linux/unix/macOS/windows"; homepage = "https://github.com/noriah/catnip"; - changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}"; - license = licenses.mit; + changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "catnip"; }; -} +}) From 30cb9857d8cd95384961761a8a887171f08f3fea Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 15:57:04 +0100 Subject: [PATCH 1510/2279] catnip: add liberodark to maintainers --- pkgs/by-name/ca/catnip/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix index 9caff3b40356..84033d22dfe9 100644 --- a/pkgs/by-name/ca/catnip/package.nix +++ b/pkgs/by-name/ca/catnip/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/noriah/catnip"; changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; mainProgram = "catnip"; }; }) From c837886460dc4d044e98427a1807eb07b21b9feb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 14:58:53 +0000 Subject: [PATCH 1511/2279] python3Packages.dashscope: 1.24.9 -> 1.25.0 --- pkgs/development/python-modules/dashscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dashscope/default.nix b/pkgs/development/python-modules/dashscope/default.nix index eafc7554d17f..bf69f2b71471 100644 --- a/pkgs/development/python-modules/dashscope/default.nix +++ b/pkgs/development/python-modules/dashscope/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "dashscope"; - version = "1.24.9"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "dashscope"; repo = "dashscope-sdk-python"; tag = "v${version}"; - hash = "sha256-Mb36V0yGYPblNXnAYa24yd7YJXsjWTErl+VVvBTZ1j8="; + hash = "sha256-l7y7JakSc9tljuL7l5Azcw+hzXjbvivxPNtGMAqQOw4="; }; build-system = [ setuptools ]; From 7f99df7e2a9f9e6d69567873366394c4135e51a4 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:08:55 +0100 Subject: [PATCH 1512/2279] jen: cleanup --- pkgs/by-name/je/jen/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index f59d6dbee404..e6cd9e41b2cb 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -5,12 +5,12 @@ fetchpatch, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "jen"; version = "1.7.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; }; @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; - meta = with lib; { + meta = { description = "Simple CLI generation tool for creating large datasets"; mainProgram = "jen"; homepage = "https://github.com/whitfin/jen"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From fd3afb40bd4f60cacc1c0090a8bfad9838806b17 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:13:44 +0100 Subject: [PATCH 1513/2279] jen: 1.7.0 -> 1.7.1 --- pkgs/by-name/je/jen/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index e6cd9e41b2cb..717fc077e55a 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -2,27 +2,30 @@ lib, rustPlatform, fetchCrate, - fetchpatch, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jen"; - version = "1.7.0"; + version = "1.7.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA="; + hash = "sha256-dRUIyy4aQRwofZ/zWOHThclfxxrpXGWHruqg2Pp2BtQ="; }; - cargoPatches = [ - (fetchpatch { - name = "fix-rust-1.80-build.patch"; - url = "https://github.com/whitfin/jen/commit/a6b5239593cecfd803a111ff317afa88c94c3640.patch"; - hash = "sha256-ikfmEj6Xm0nT9dxpx6xdm/mQbw0b3gh2PT6Zo69Zg0E="; - }) - ]; + cargoHash = "sha256-2c4XHA8fl2BA/Qtz+Hp29SjiWqPEJEj4WQiIFG/O4fE="; - cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "Simple CLI generation tool for creating large datasets"; From 10981b0a872e11ccdd2faaa4686c71dc0ae0dff9 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:17:30 +0100 Subject: [PATCH 1514/2279] jen: add liberodark to maintainers --- pkgs/by-name/je/jen/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index 717fc077e55a..dbcfb71f6c39 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "jen"; homepage = "https://github.com/whitfin/jen"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ liberodark ]; }; }) From 4a152c8c0fa477d22a911841b4ccc1b4a0d6cab8 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 7 Nov 2025 16:22:08 +0100 Subject: [PATCH 1515/2279] glitter: cleanup --- pkgs/by-name/gl/glitter/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix index 1e22d686effe..c890a42e0ca3 100644 --- a/pkgs/by-name/gl/glitter/package.nix +++ b/pkgs/by-name/gl/glitter/package.nix @@ -5,14 +5,14 @@ gitMinimal, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "glitter"; version = "1.6.6"; src = fetchFromGitHub { owner = "milo123459"; repo = "glitter"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4="; }; @@ -36,9 +36,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Git wrapper that allows you to compress multiple commands into one"; homepage = "https://github.com/milo123459/glitter"; - changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}"; + changelog = "https://github.com/Milo123459/glitter/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "glitter"; }; -} +}) From 7da0a50a02472ef2404916792c99c4cc99ada4c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 15:33:17 +0000 Subject: [PATCH 1516/2279] go-ecoflow-exporter: 1.4.0 -> 1.5.0 --- pkgs/by-name/go/go-ecoflow-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/go-ecoflow-exporter/package.nix b/pkgs/by-name/go/go-ecoflow-exporter/package.nix index 6ba9adfd6de1..06928a31c3be 100644 --- a/pkgs/by-name/go/go-ecoflow-exporter/package.nix +++ b/pkgs/by-name/go/go-ecoflow-exporter/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "go-ecoflow-exporter"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tess1o"; repo = "go-ecoflow-exporter"; tag = finalAttrs.version; - hash = "sha256-VCzMItYgnuDXDYdrk/ojzqUE2Fjr7KWGNnLhoQ+ZPYs="; + hash = "sha256-oh/i4LToGnI2TuforL36tIYrhq4VUNNYVtYgaU2sf8w="; }; vendorHash = "sha256-UbV6V06zxXMTd0v+rDPGoMFn9X5mMCiX41g49IGnoT8="; From 12630d1be80f6ea0033d799d4cb3ef26394cee62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 15:33:47 +0000 Subject: [PATCH 1517/2279] redocly: 2.2.0 -> 2.8.0 --- pkgs/by-name/re/redocly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index fd8d91605601..45983e734bdf 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "2.2.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-e25pjXopmWqoLV16DC+w57YZzH6bbwITsRhKI9IBr+0="; + hash = "sha256-QrCQ050fX7rkY/oIzBip6r69JVEx36D3+TEsZCk33EQ="; }; - npmDepsHash = "sha256-/Gi0hNuG6fkgOCcjD1jDNyUT1ke3oipqmzAHDpdbiJg="; + npmDepsHash = "sha256-kWuaUSBF3ZAoRkDXkA4XMMyu71X7hQ0+CurWgt7Hfm4="; npmBuildScript = "prepare"; From 555f7c9c65aed596840bc4a1b0f064a1fe101a1e Mon Sep 17 00:00:00 2001 From: Jasi Date: Fri, 7 Nov 2025 10:10:40 -0500 Subject: [PATCH 1518/2279] duckstation: 0.1-9787-unstable-2025-10-13 -> 0.1-9903 --- pkgs/by-name/du/duckstation/package.nix | 6 +++--- pkgs/by-name/du/duckstation/sources.json | 6 +++--- pkgs/by-name/du/duckstation/update.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index e84c5306363f..6ddc323cfa0c 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -64,13 +64,13 @@ let linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "duckstation"; - version = "0.1-9787-unstable-2025-10-13"; + version = pkgSources.duckstation.version; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "8f0c9dd171210dfd7f06223a393e2565abbaabf3"; - hash = "sha256-CzHWdY0RaGBB6CY3PzHHHbq3/Mbf6WtUm6Dizr0IW6I="; + tag = "v${finalAttrs.version}"; + hash = pkgSources.duckstation.hash_linux; }; # TODO: Remove once this is fixed upstream. diff --git a/pkgs/by-name/du/duckstation/sources.json b/pkgs/by-name/du/duckstation/sources.json index a4db277a14d0..2e258e9e0068 100644 --- a/pkgs/by-name/du/duckstation/sources.json +++ b/pkgs/by-name/du/duckstation/sources.json @@ -1,8 +1,8 @@ { "duckstation": { - "version": "0.1-9669", - "hash_linux": "sha256-Q3vU4PaHMHzA8MTxLQbR++ND4L0iRMw6M7J74jyWBKI=", - "hash_darwin": "sha256-qbY1xKqjYAoxU5EWSFRq8Quu3bZBHHsS8nqnLW3xT+k=" + "version": "0.1-9903", + "hash_linux": "sha256-CzHWdY0RaGBB6CY3PzHHHbq3/Mbf6WtUm6Dizr0IW6I=", + "hash_darwin": "sha256-7gVpINajfRRDLYBQMQBQtBELosvROiQzTEa2zZbtK44=" }, "discord_rpc": { "rev": "cc59d26d1d628fbd6527aac0ac1d6301f4978b92", diff --git a/pkgs/by-name/du/duckstation/update.sh b/pkgs/by-name/du/duckstation/update.sh index 2e82fa5347e4..0e02fba855bb 100755 --- a/pkgs/by-name/du/duckstation/update.sh +++ b/pkgs/by-name/du/duckstation/update.sh @@ -23,13 +23,13 @@ duckstation_storepath=$(nix --extra-experimental-features "nix-command flakes" f pinned_versions=$duckstation_storepath/scripts/deps/versions echo "Using pinned discord_rpc..." -discord_rpc_rev=$(grep "DISCORD_RPC=" "$pinned_versions" | sed 's|.*=||g') +discord_rpc_rev=$(grep "DISCORD_RPC_COMMIT=" "$pinned_versions" | sed 's|.*=||g') discord_rpc_hash=$(nix --extra-experimental-features "nix-command flakes" \ flake prefetch github:stenzek/discord-rpc/"$discord_rpc_rev" --json | jq -r '.hash') echo "Using pinned shaderc..." -shaderc_rev=$(grep "SHADERC=" "$pinned_versions" | sed 's|.*=||g') +shaderc_rev=$(grep "SHADERC_COMMIT=" "$pinned_versions" | sed 's|.*=||g') shaderc_hash=$(nix --extra-experimental-features "nix-command flakes" flake prefetch github:stenzek/shaderc/"$shaderc_rev" --json | jq -r '.hash') echo "Fetching latest chtdb commit..." From b93a33146d1fadc53a77304fdab78d2a05e1f6d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 15:49:43 +0000 Subject: [PATCH 1519/2279] keychain: 2.9.7 -> 2.9.8 --- pkgs/by-name/ke/keychain/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix index 35523f15ab94..ee1200809fb4 100644 --- a/pkgs/by-name/ke/keychain/package.nix +++ b/pkgs/by-name/ke/keychain/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "keychain"; - version = "2.9.7"; + version = "2.9.8"; src = fetchFromGitHub { owner = "funtoo"; repo = "keychain"; rev = version; - sha256 = "sha256-/8OY/URIhVl8bTlJPRGidExHzkwzckm/v3QUq7Fxe04="; + sha256 = "sha256-xk3ooFhBkgv93Po5oC4TZRmMhJJXDv7yekoE102FQd8="; }; nativeBuildInputs = [ From 7f0d58127f97aa9c69b903ddab2452ebbddbb8a2 Mon Sep 17 00:00:00 2001 From: Pui Yong Qing Date: Fri, 7 Nov 2025 23:52:50 +0800 Subject: [PATCH 1520/2279] manim: disable failing test --- .../python-modules/manim/failing_tests.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/manim/failing_tests.nix b/pkgs/development/python-modules/manim/failing_tests.nix index 279950f6cb4f..987b64db26de 100644 --- a/pkgs/development/python-modules/manim/failing_tests.nix +++ b/pkgs/development/python-modules/manim/failing_tests.nix @@ -89,4 +89,17 @@ # This tests checks if the manim executable is a python script. In our case it is not. # It is a wrapper shell script instead. "test_manim_checkhealth_subcommand" + + # failing with: + # E AssertionError: assert 'Manim Commun...developers.\n' == 'Manim Community v0.19.0\n\n' + # E + # E Manim Community v0.19.0 + # E + # E + Usage: manim cfg [OPTIONS] COMMAND [ARGS]... + # E + + # E + Manages Manim configuration files. + # E + ... + # E + # E ...Full output truncated (9 lines hidden), use '-vv' to show + "test_manim_cfg_subcommand" ] From df564736b4cd8508d30cadcb654895a1ccc01c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 16:13:31 +0000 Subject: [PATCH 1521/2279] mpls: 0.15.4 -> 0.16.0 --- pkgs/by-name/mp/mpls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix index 26bd3d5687f8..3cab390e3e83 100644 --- a/pkgs/by-name/mp/mpls/package.nix +++ b/pkgs/by-name/mp/mpls/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "mpls"; - version = "0.15.4"; + version = "0.16.0"; src = fetchFromGitHub { owner = "mhersson"; repo = "mpls"; tag = "v${version}"; - hash = "sha256-ChEZigLKzU/SILcJoyjKZI1qqrAi9qA6ugUeg5AL2Mw="; + hash = "sha256-xNgbtVyjhimvhZ1ua8NoTS3bV7ZSbX5j9VnFSYXuGpI="; }; - vendorHash = "sha256-n3DG3sR7HOQPQJW1t1qC94EKkDBgXpdmjUWtLzAE7kY="; + vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark="; ldflags = [ "-s" From c1a739cf2386e7e0f7f990c35216fbff99add3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Neumann?= Date: Fri, 7 Nov 2025 17:20:24 +0100 Subject: [PATCH 1522/2279] feed2imap-go: Add myself as additional maintainer --- pkgs/by-name/fe/feed2imap-go/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fe/feed2imap-go/package.nix b/pkgs/by-name/fe/feed2imap-go/package.nix index 1a889265cbfb..c8df95e713ac 100644 --- a/pkgs/by-name/fe/feed2imap-go/package.nix +++ b/pkgs/by-name/fe/feed2imap-go/package.nix @@ -34,6 +34,9 @@ buildGoModule rec { mainProgram = "feed2imap-go"; homepage = "https://github.com/Necoro/feed2imap-go"; license = licenses.gpl2; - maintainers = with maintainers; [ nomeata ]; + maintainers = with maintainers; [ + nomeata + Necoro + ]; }; } From 561052419406d86a58ef61200c283573a240141a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 16:55:41 +0100 Subject: [PATCH 1523/2279] nixos/quorum: drop The quorum package has been broken since October 2024 [1], upstream's most recent code change was in June 2024 [2], and the project website [3] returns an error. [1] https://hydra.nixos.org/build/311786489 [2] https://github.com/Consensys/quorum/commits/master/ [3] https://www.goquorum.com/ --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 3 + nixos/modules/services/networking/quorum.nix | 250 ------------------ nixos/tests/all-tests.nix | 1 - nixos/tests/quorum.nix | 103 -------- 6 files changed, 5 insertions(+), 355 deletions(-) delete mode 100644 nixos/modules/services/networking/quorum.nix delete mode 100644 nixos/tests/quorum.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 0b53ba5cd2a2..d9b2a8c3f8c8 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -277,6 +277,8 @@ - `services.gateone` has been removed as the package was removed such that it does not work. +- `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream. + - `teleport` has been upgraded from major version 17 to major version 18. Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/) and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b7c5b0d507f9..d0937a501807 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1320,7 +1320,6 @@ ./services/networking/pyload.nix ./services/networking/quassel.nix ./services/networking/quicktun.nix - ./services/networking/quorum.nix ./services/networking/r53-ddns.nix ./services/networking/radicale.nix ./services/networking/radvd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d500d5df8963..66e58ce59803 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -244,6 +244,9 @@ in "services" "quagga" ] "the corresponding package has been removed from nixpkgs") + (mkRemovedOptionModule [ "services" "quorum" ] '' + The corresponding package was broken, abandoned upstream and thus removed from nixpkgs. + '') (mkRemovedOptionModule [ "services" "railcar" diff --git a/nixos/modules/services/networking/quorum.nix b/nixos/modules/services/networking/quorum.nix deleted file mode 100644 index d86d32bc2de4..000000000000 --- a/nixos/modules/services/networking/quorum.nix +++ /dev/null @@ -1,250 +0,0 @@ -{ - config, - options, - pkgs, - lib, - ... -}: -let - - inherit (lib) - mkEnableOption - mkIf - mkOption - literalExpression - types - optionalString - ; - - cfg = config.services.quorum; - opt = options.services.quorum; - dataDir = "/var/lib/quorum"; - genesisFile = pkgs.writeText "genesis.json" (builtins.toJSON cfg.genesis); - staticNodesFile = pkgs.writeText "static-nodes.json" (builtins.toJSON cfg.staticNodes); - -in -{ - options = { - - services.quorum = { - enable = mkEnableOption "Quorum blockchain daemon"; - - user = mkOption { - type = types.str; - default = "quorum"; - description = "The user as which to run quorum."; - }; - - group = mkOption { - type = types.str; - default = cfg.user; - defaultText = literalExpression "config.${opt.user}"; - description = "The group as which to run quorum."; - }; - - port = mkOption { - type = types.port; - default = 21000; - description = "Override the default port on which to listen for connections."; - }; - - nodekeyFile = mkOption { - type = types.path; - default = "${dataDir}/nodekey"; - description = "Path to the nodekey."; - }; - - staticNodes = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ - "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" - ]; - description = "List of validator nodes."; - }; - - privateconfig = mkOption { - type = types.str; - default = "ignore"; - description = "Configuration of privacy transaction manager."; - }; - - syncmode = mkOption { - type = types.enum [ - "fast" - "full" - "light" - ]; - default = "full"; - description = "Blockchain sync mode."; - }; - - blockperiod = mkOption { - type = types.int; - default = 5; - description = "Default minimum difference between two consecutive block's timestamps in seconds."; - }; - - permissioned = mkOption { - type = types.bool; - default = true; - description = "Allow only a defined list of nodes to connect."; - }; - - rpc = { - enable = mkOption { - type = types.bool; - default = true; - description = "Enable RPC interface."; - }; - - address = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "Listening address for RPC connections."; - }; - - port = mkOption { - type = types.port; - default = 22004; - description = "Override the default port on which to listen for RPC connections."; - }; - - api = mkOption { - type = types.str; - default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"; - description = "API's offered over the HTTP-RPC interface."; - }; - }; - - ws = { - enable = mkOption { - type = types.bool; - default = true; - description = "Enable WS-RPC interface."; - }; - - address = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "Listening address for WS-RPC connections."; - }; - - port = mkOption { - type = types.port; - default = 8546; - description = "Override the default port on which to listen for WS-RPC connections."; - }; - - api = mkOption { - type = types.str; - default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"; - description = "API's offered over the WS-RPC interface."; - }; - - origins = mkOption { - type = types.str; - default = "*"; - description = "Origins from which to accept websockets requests"; - }; - }; - - genesis = mkOption { - type = types.nullOr types.attrs; - default = null; - example = literalExpression '' - { - alloc = { - a47385db68718bdcbddc2d2bb7c54018066ec111 = { - balance = "1000000000000000000000000000"; - }; - }; - coinbase = "0x0000000000000000000000000000000000000000"; - config = { - byzantiumBlock = 4; - chainId = 494702925; - eip150Block = 2; - eip155Block = 3; - eip158Block = 3; - homesteadBlock = 1; - isQuorum = true; - istanbul = { - epoch = 30000; - policy = 0; - }; - }; - difficulty = "0x1"; - extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f85ad59438f0508111273d8e482f49410ca4078afc86a961b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"; - gasLimit = "0x2FEFD800"; - mixHash = "0x63746963616c2062797a616e74696e65201111756c7420746f6c6572616e6365"; - nonce = "0x0"; - parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; - timestamp = "0x00"; - }''; - description = "Blockchain genesis settings."; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.quorum ]; - systemd.tmpfiles.rules = [ - "d '${dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" - ]; - systemd.services.quorum = { - description = "Quorum daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment = { - PRIVATE_CONFIG = "${cfg.privateconfig}"; - }; - preStart = '' - if [ ! -d ${dataDir}/geth ]; then - if [ ! -d ${dataDir}/keystore ]; then - echo ERROR: You need to create a wallet before initializing your genesis file, run: - echo # su -s /bin/sh - quorum - echo $ geth --datadir ${dataDir} account new - echo and configure your genesis file accordingly. - exit 1; - fi - ln -s ${staticNodesFile} ${dataDir}/static-nodes.json - ${pkgs.quorum}/bin/geth --datadir ${dataDir} init ${genesisFile} - fi - ''; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = '' - ${pkgs.quorum}/bin/geth \ - --nodiscover \ - --verbosity 5 \ - --nodekey ${cfg.nodekeyFile} \ - --istanbul.blockperiod ${toString cfg.blockperiod} \ - --syncmode ${cfg.syncmode} \ - ${optionalString (cfg.permissioned) "--permissioned"} \ - --mine --miner.threads 1 \ - ${optionalString (cfg.rpc.enable) "--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \ - ${optionalString (cfg.ws.enable) "--ws --ws.addr ${cfg.ws.address} --ws.port ${toString cfg.ws.port} --ws.api ${cfg.ws.api} --ws.origins ${cfg.ws.origins}"} \ - --emitcheckpoints \ - --datadir ${dataDir} \ - --port ${toString cfg.port}''; - Restart = "on-failure"; - - # Hardening measures - PrivateTmp = "true"; - ProtectSystem = "full"; - NoNewPrivileges = "true"; - PrivateDevices = "true"; - MemoryDenyWriteExecute = "true"; - }; - }; - users.users.${cfg.user} = { - name = cfg.user; - group = cfg.group; - description = "Quorum daemon user"; - home = dataDir; - isSystemUser = true; - }; - users.groups.${cfg.group} = { }; - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 511e2101fa7b..16713f34203d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1294,7 +1294,6 @@ in quake3 = runTest ./quake3.nix; quicktun = runTest ./quicktun.nix; quickwit = runTest ./quickwit.nix; - quorum = runTest ./quorum.nix; rabbitmq = runTest ./rabbitmq.nix; radarr = runTest ./radarr.nix; radicale = runTest ./radicale.nix; diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix deleted file mode 100644 index 0e67f3564070..000000000000 --- a/nixos/tests/quorum.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ pkgs, ... }: -let - keystore = { - address = "9377bc3936de934c497e22917b81aa8774ac3bb0"; - crypto = { - cipher = "aes-128-ctr"; - ciphertext = "ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c"; - cipherparams = { - iv = "2a09f7a72fd6dff7c43150ff437e6ac2"; - }; - kdf = "scrypt"; - kdfparams = { - dklen = 32; - n = 262144; - p = 1; - r = 8; - salt = "d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027"; - }; - mac = "a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3"; - }; - id = "89e847a3-1527-42f6-a321-77de0a14ce02"; - version = 3; - }; - keystore-file = pkgs.writeText "keystore-file" (builtins.toJSON keystore); -in -{ - name = "quorum"; - meta = with pkgs.lib.maintainers; { - maintainers = [ mmahut ]; - }; - - nodes = { - machine = - { ... }: - { - services.quorum = { - enable = true; - permissioned = false; - staticNodes = [ - "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" - ]; - genesis = { - alloc = { - "189d23d201b03ae1cf9113672df29a5d672aefa3" = { - balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; - }; - "44b07d2c28b8ed8f02b45bd84ac7d9051b3349e6" = { - balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; - }; - "4c1ccd426833b9782729a212c857f2f03b7b4c0d" = { - balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; - }; - "7ae555d0f6faad7930434abdaac2274fd86ab516" = { - balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; - }; - c1056df7c02b6f1a353052eaf0533cc7cb743b52 = { - balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; - }; - }; - coinbase = "0x0000000000000000000000000000000000000000"; - config = { - byzantiumBlock = 1; - chainId = 10; - eip150Block = 1; - eip150Hash = "0x0000000000000000000000000000000000000000000000000000000000000000"; - eip155Block = 1; - eip158Block = 1; - homesteadBlock = 1; - isQuorum = true; - istanbul = { - epoch = 30000; - policy = 0; - }; - }; - difficulty = "0x1"; - extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f8aff869944c1ccd426833b9782729a212c857f2f03b7b4c0d94189d23d201b03ae1cf9113672df29a5d672aefa39444b07d2c28b8ed8f02b45bd84ac7d9051b3349e694c1056df7c02b6f1a353052eaf0533cc7cb743b52947ae555d0f6faad7930434abdaac2274fd86ab516b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"; - gasLimit = "0xe0000000"; - gasUsed = "0x0"; - mixHash = "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"; - nonce = "0x0"; - number = "0x0"; - parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; - timestamp = "0x5cffc201"; - }; - }; - }; - }; - - testScript = '' - start_all() - machine.succeed("mkdir -p /var/lib/quorum/keystore") - machine.succeed( - 'cp ${keystore-file} /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--${keystore.address}' - ) - machine.succeed( - "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey" - ) - machine.succeed("systemctl restart quorum") - machine.wait_for_unit("quorum.service") - machine.sleep(15) - machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep ${keystore.address}') - ''; -} From 37fecf866dcb1770182e5126651002ea8fc8dd93 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 17:07:08 +0100 Subject: [PATCH 1524/2279] quorum: drop The quorum package has been broken since October 2024 [1], upstream's most recent code change was in June 2024 [2], and the project website [3] returns an error. [1] https://hydra.nixos.org/build/311786489 [2] https://github.com/Consensys/quorum/commits/master/ [3] https://www.goquorum.com/ --- pkgs/by-name/qu/quorum/package.nix | 40 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/by-name/qu/quorum/package.nix diff --git a/pkgs/by-name/qu/quorum/package.nix b/pkgs/by-name/qu/quorum/package.nix deleted file mode 100644 index bf90365276b1..000000000000 --- a/pkgs/by-name/qu/quorum/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - nixosTests, -}: - -buildGoModule rec { - pname = "quorum"; - version = "24.4.1"; - - src = fetchFromGitHub { - owner = "Consensys"; - repo = "quorum"; - rev = "v${version}"; - hash = "sha256-pW8I4ivcKo6dsa8rQVKU6nUZuKxaki/7cMDKwEsSzNw="; - }; - - vendorHash = "sha256-YK2zpQz4pAFyA+aHOn6Nx0htl5SJ2HNC+TDV1RdLQJk="; - - subPackages = [ - "cmd/geth" - "cmd/bootnode" - ]; - - ldflags = [ - "-s" - "-w" - ]; - - passthru.tests = { inherit (nixosTests) quorum; }; - - meta = with lib; { - description = "Permissioned implementation of Ethereum supporting data privacy"; - homepage = "https://consensys.net/quorum/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ mmahut ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8cf4433b21b4..53a26559f637 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1308,6 +1308,7 @@ mapAliases { quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24 qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18 + quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07 qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03 radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27 railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 From b053d853fa998335c9489c9b7d7bb6d4ed31a696 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Fri, 7 Nov 2025 11:23:50 -0500 Subject: [PATCH 1525/2279] libevdevplus: drop --- .../0001-Add-cmake-install-directives.patch | 41 ------------------- pkgs/by-name/li/libevdevplus/package.nix | 36 ---------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch delete mode 100644 pkgs/by-name/li/libevdevplus/package.nix diff --git a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch deleted file mode 100644 index 2635d6ab829e..000000000000 --- a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001 -From: Jappie Klooster -Date: Fri, 2 Apr 2021 16:01:05 -0400 -Subject: [PATCH] Add cmake install directives - -To make nix builds work, it expect a make install command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please add them. ---- - CMakeLists.txt | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9db618..425d391 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,10 +4,17 @@ project(libevdevPlus) - set(SOURCE_FILES - evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp) - -+include(GNUInstallDirs) -+ - add_library(evdevPlus ${SOURCE_FILES}) - target_include_directories(evdevPlus PUBLIC .) - - add_executable(evdevPlus_test test.cpp) - target_link_libraries(evdevPlus_test evdevPlus) - --configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) -\ No newline at end of file -+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) -+ -+install(TARGETS evdevPlus -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp -+ DESTINATION include/) --- -2.29.2 - diff --git a/pkgs/by-name/li/libevdevplus/package.nix b/pkgs/by-name/li/libevdevplus/package.nix deleted file mode 100644 index c89d7faa7865..000000000000 --- a/pkgs/by-name/li/libevdevplus/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, -}: - -stdenv.mkDerivation rec { - pname = "libevdevplus"; - version = "unstable-2021-04-02"; - - # adds missing cmake install directives - # https://github.com/YukiWorkshop/libevdevPlus/pull/10 - patches = [ ./0001-Add-cmake-install-directives.patch ]; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "libevdevPlus"; - rev = "b4d4b3143056424a3da9f0516ca02a47209ef757"; - sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Easy-to-use event device library in C++"; - license = licenses.mit; - maintainers = [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7f758a78104..11fa2596113d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases { libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 + libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04 libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20 libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17 From 45bcb14f4b45ca94b6cde071186c5b5b2a0d5587 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 2 Nov 2025 20:46:59 -0600 Subject: [PATCH 1526/2279] libuinputplus: drop --- .../0001-Add-cmake-install-directives.patch | 40 ------------------- pkgs/by-name/li/libuinputplus/package.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch delete mode 100644 pkgs/by-name/li/libuinputplus/package.nix diff --git a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch deleted file mode 100644 index cd6f43d37705..000000000000 --- a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001 -From: Jappie Klooster -Date: Fri, 2 Apr 2021 16:33:18 -0400 -Subject: [PATCH] Add cmake install directives - -To make nix builds work, it expect a make install command to -be available. -Adding these directives seems to fix the build. - -If it's no trouble to you, please consider adding them. ---- - CMakeLists.txt | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbfc9c1..948c432 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(SOURCE_FILES - uInput.cpp uInputSetup.cpp uInputResource.cpp - uInput.hpp CommonIncludes.hpp uInputSetup.hpp) - -+include(GNUInstallDirs) -+ - add_library(uInputPlus ${SOURCE_FILES}) - target_include_directories(uInputPlus PUBLIC .) - -@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus) - - configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY) - -+ -+install(TARGETS uInputPlus -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp -+ DESTINATION include/) -+ --- -2.29.2 - diff --git a/pkgs/by-name/li/libuinputplus/package.nix b/pkgs/by-name/li/libuinputplus/package.nix deleted file mode 100644 index 1541a52b32a7..000000000000 --- a/pkgs/by-name/li/libuinputplus/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, -}: -stdenv.mkDerivation rec { - pname = "libuinputplus"; - version = "2021-04-02"; - - # adds missing cmake install directives - # https://github.com/YukiWorkshop/libuInputPlus/pull/7 - patches = [ ./0001-Add-cmake-install-directives.patch ]; - - src = fetchFromGitHub { - owner = "YukiWorkshop"; - repo = "libuInputPlus"; - rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957"; - sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp"; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Easy-to-use uinput library in C++"; - license = licenses.mit; - maintainers = [ ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 11fa2596113d..530ab4fe1483 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -827,6 +827,7 @@ mapAliases { libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10 libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26 libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26 + libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27 lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27 From c8c2d706a538cfdec2d6793d7a75bd400a4a01a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 7 Nov 2025 16:23:18 +0000 Subject: [PATCH 1527/2279] moonfire-nvr: Fix unstable UI path. See https://github.com/NixOS/nixpkgs/pull/243261#pullrequestreview-1793813904 Fixes the symlink from being e.g. /nix/store/c0v8rfg69c042ck81vbmfhqgmlsbp2jd-moonfire-nvr-0.7.7/lib/ui/n9c8ijzh0ndgp6s5h88ix41wfhfxycpz-moonfire-nvr-ui-0.7.7 -> /nix/store/n9c8ijzh0ndgp6s5h88ix41wfhfxycpz-moonfire-nvr-ui-0.7.7/ to being /nix/store/c0v8rfg69c042ck81vbmfhqgmlsbp2jd-moonfire-nvr-0.7.7/lib/ui -> /nix/store/n9c8ijzh0ndgp6s5h88ix41wfhfxycpz-moonfire-nvr-ui-0.7.7/ Most likely this was caused by a misunderstanding of how `ln -s target linkname` works: If the `linkname` already exists and is a directory, it creates the link _inside_ it, with the link's filename being the basename of `target`. --- pkgs/by-name/mo/moonfire-nvr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index 6ea4fd50c06d..f01c61d8cbd8 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { ]; postInstall = '' - mkdir -p $out/lib/ui + mkdir -p $out/lib ln -s ${ui} $out/lib/ui ''; From 8113ae6d734910e12cfa21ae491b529773293ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 7 Nov 2025 16:34:05 +0000 Subject: [PATCH 1528/2279] moonnfire-nvr: Fix incorrect testVersion invocation --- pkgs/by-name/mo/moonfire-nvr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index f01c61d8cbd8..ee6f608a6493 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -72,9 +72,9 @@ rustPlatform.buildRustPackage { passthru = { inherit ui; tests.version = testers.testVersion { - inherit version; package = moonfire-nvr; command = "moonfire-nvr --version"; + version = "Version: v${version}"; }; }; From 3482b8410da6e9775b402c7b97a1707a5779da26 Mon Sep 17 00:00:00 2001 From: Jiatao Liang Date: Fri, 7 Nov 2025 11:35:01 -0500 Subject: [PATCH 1529/2279] artix-games-launcher: fix .desktop file to align with pname .desktop file now uses pname properly --- pkgs/by-name/ar/artix-games-launcher/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix index 35fc2f7218a4..9ee50a47a602 100644 --- a/pkgs/by-name/ar/artix-games-launcher/package.nix +++ b/pkgs/by-name/ar/artix-games-launcher/package.nix @@ -22,6 +22,7 @@ appimageTools.wrapType2 { mkdir -p $out/share/applications install -m 444 -D ${appimageContents}/ArtixGamesLauncher.desktop $out/share/applications/ArtixGamesLauncher.desktop install -m 444 -D ${appimageContents}/ArtixLogo.png $out/share/icons/ArtixLogo.png + substituteInPlace $out/share/applications/ArtixGamesLauncher.desktop --replace-fail 'Exec=ArtixGameLauncher %u' 'Exec=artix-games-launcher %u' ''; meta = { From 1ad365df9d3cc865361777f38089d1bfefc129ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 16:36:23 +0000 Subject: [PATCH 1530/2279] melonDS: 1.0-unstable-2025-10-30 -> 1.0-unstable-2025-11-06 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 987d7c0b9f53..794f0ba0bab4 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0-unstable-2025-10-30"; + version = "1.0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "8a1ef8e30d6c1c2f2b0c9151b74e427dcf112a7a"; - hash = "sha256-yf5xSXxWeIBDJ1UHJSY2grAQr6by/KU6Lj61nFR9E9Y="; + rev = "220b238ec06692ee144bb1f50867a2edb8795de1"; + hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw="; }; patches = [ ./fix-build-qt-6.10.patch ]; From 6eebc476094cc72b816fb7b5ecae3796df88900b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 16:40:27 +0000 Subject: [PATCH 1531/2279] python3Packages.python-toolbox: 1.2.9 -> 1.2.10 --- pkgs/development/python-modules/python-toolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix index af5ffe828be8..d9c9f9ec2b66 100644 --- a/pkgs/development/python-modules/python-toolbox/default.nix +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-toolbox"; - version = "1.2.9"; + version = "1.2.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cool-RR"; repo = "python_toolbox"; tag = version; - hash = "sha256-qzzFgP5dTw4qSxovnmrSgGkW0AQw/tNOy2TbE/7wqxI="; + hash = "sha256-+Q7r4nbubp2xzkBgEyTuA0EeIvpT4bW+2NnckVkEKcY="; }; build-system = [ setuptools ]; From 733271c086ccdb4b0970813bcea69ce604baef83 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 28 Oct 2025 21:59:42 +0000 Subject: [PATCH 1532/2279] {python3Packages.,}tiny-cuda-nn: 1.6 -> 2.0 Diff: https://github.com/NVlabs/tiny-cuda-nn/compare/v1.6...v2.0 --- pkgs/by-name/ti/tiny-cuda-nn/package.nix | 40 ++++++++++-------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ti/tiny-cuda-nn/package.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix index ebeea75fa20b..0d0caffe578e 100644 --- a/pkgs/by-name/ti/tiny-cuda-nn/package.nix +++ b/pkgs/by-name/ti/tiny-cuda-nn/package.nix @@ -13,18 +13,18 @@ }: let inherit (lib) lists strings; - inherit (cudaPackages) backendStdenv cudaAtLeast flags; + inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ (lib.getDev cuda_cudart) # cuda_runtime.h (lib.getLib cuda_cudart) (lib.getDev cuda_cccl) # - (lib.getDev libcublas) # cublas_v2.h - (lib.getLib libcublas) - (lib.getDev libcusolver) # cusolverDn.h - (lib.getLib libcusolver) - (lib.getDev libcusparse) # cusparse.h - (lib.getLib libcusparse) + (lib.getInclude cuda_nvrtc) # nvrtc.h + (lib.getLib cuda_nvrtc) + (lib.getInclude libcublas) # cublas_v2.h + (lib.getLib libcublas) # cublas_v2.h + (lib.getInclude libcusolver) # cusolverDn.h + (lib.getInclude libcusparse) # cusparse.h ]; cuda-native-redist = symlinkJoin { @@ -38,7 +38,6 @@ let }; unsupportedCudaCapabilities = [ - "9.0a" ]; cudaCapabilities = lists.subtractLists unsupportedCudaCapabilities flags.cudaCapabilities; @@ -47,7 +46,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "tiny-cuda-nn"; - version = "1.6"; + version = "2.0"; strictDeps = true; format = strings.optionalString pythonSupport "setuptools"; @@ -55,18 +54,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "NVlabs"; repo = "tiny-cuda-nn"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; + hash = "sha256-m73lnXufFQOoYHko8x/gIT2UAuHADAGRxVqDSbW+KlY="; }; - # Remove this once a release is made with - # https://github.com/NVlabs/tiny-cuda-nn/commit/78a14fe8c292a69f54e6d0d47a09f52b777127e1 - postPatch = '' - substituteInPlace bindings/torch/setup.py --replace-fail \ - "-std=c++14" "-std=c++17" - ''; - nativeBuildInputs = [ cmake cuda-native-redist @@ -78,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { [ pip setuptools - wheel ] ); @@ -164,16 +155,19 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + pythonImportsCheck = lib.optionals pythonSupport [ "tinycudann" ]; + passthru = { inherit cudaPackages; }; - meta = with lib; { + meta = { description = "Lightning fast C++/CUDA neural network framework"; homepage = "https://github.com/NVlabs/tiny-cuda-nn"; - license = licenses.bsd3; - maintainers = with maintainers; [ connorbaker ]; - platforms = platforms.linux; + changelog = "https://github.com/NVlabs/tiny-cuda-nn/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ connorbaker ]; + platforms = lib.platforms.linux; badPlatforms = [ # g++: error: unrecognized command-line option '-mf16c' lib.systems.inspect.patterns.isAarch64 From a5e50875ca62379a5c2b0c1d868008afdbe55830 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 5 Nov 2025 11:41:34 -0800 Subject: [PATCH 1533/2279] python3Packages.slack-sdk: disable tests that require network access --- pkgs/development/python-modules/slack-sdk/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 60809522f772..e9b4f14bfbe2 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -13,7 +13,6 @@ sqlalchemy, websocket-client, websockets, - writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -54,6 +53,14 @@ buildPythonPackage rec { "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" # Requires network access: [Errno 111] Connection refused "test_send_message_while_disconnection" + # [Errno 61] Connection refused + "TestWebClient_HttpRetry" + # ConnectionResetError: [Errno 54] Connection reset by peer + "test_issue_690_oauth_access" + "test_issue_690_oauth_v2_access" + "test_error_response" + # Assertion Error: unexpectedly None (while accessing instance of slack store) + "test_issue_1441_mixing_user_and_bot_installations" ]; disabledTestPaths = [ From 27fb6cc34957b6c4d033a773fe6cc77d85c03321 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 15:45:52 -0800 Subject: [PATCH 1534/2279] python3Packages.func-timeout: remove 'with lib;' --- pkgs/development/python-modules/func-timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix index 33446197f52d..836ac9b6718d 100644 --- a/pkgs/development/python-modules/func-timeout/default.nix +++ b/pkgs/development/python-modules/func-timeout/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "func_timeout" ]; - meta = with lib; { + meta = { description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads"; homepage = "https://github.com/kata198/func_timeout"; - license = licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; maintainers = [ ]; }; } From 3914320ec01900e4fa616f1a352d3a5eca77e372 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 15:50:53 -0800 Subject: [PATCH 1535/2279] python3Packages.func-timeout: disable timing-sensitive tests that fail under load --- pkgs/development/python-modules/func-timeout/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix index 836ac9b6718d..8b6a09149f30 100644 --- a/pkgs/development/python-modules/func-timeout/default.nix +++ b/pkgs/development/python-modules/func-timeout/default.nix @@ -18,6 +18,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # Calculates the amount of time the machine slept but doesn't account for heavy loads + "test_retry" + "test_funcSetTimeout" + "test_funcSetTimeCalculate" + "test_funcSetTimeCalculateWithOverride" + "test_setFuncTimeoutetry" + ]; + pythonImportsCheck = [ "func_timeout" ]; meta = { From 3cacec1157dbdf5c11428f9203572e2407f07a7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 16:45:27 +0000 Subject: [PATCH 1536/2279] ipxe: 1.21.1-unstable-2025-10-29 -> 1.21.1-unstable-2025-11-05 --- pkgs/by-name/ip/ipxe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 106b0c87069e..49632d398755 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-10-29"; + version = "1.21.1-unstable-2025-11-05"; nativeBuildInputs = [ mtools @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "fde35ff003a610eca04db0e11fb81e8dfee8a681"; - hash = "sha256-wDdqP+EgZqAx+44oy/2x36ZuDJPbTSiiztAISbaVi3o="; + rev = "b41bda4413bf286d7b7a449bc05e1531da1eec2e"; + hash = "sha256-uJzvmTzGg1gzquo09IyufwK77Kq6iQt+bhJecaTy6ts="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. From 37848f404ba5ce0c17ff3c5b12ebe4f76573477b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 7 Nov 2025 16:46:43 +0000 Subject: [PATCH 1537/2279] nixos/frigate: Add comment to nginx general config referring to frigate This way one can see which package/config it is that e.g. opens port 1935. --- nixos/modules/services/video/frigate.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index 5d8d92b5cae8..efe9abd37a01 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -637,6 +637,7 @@ in ''; }; appendConfig = '' + # frigate rtmp { server { listen 1935; @@ -653,6 +654,7 @@ in } ''; appendHttpConfig = '' + # frigate map $sent_http_content_type $should_not_cache { 'application/json' 0; default 1; From 88e4f87dbd5b0789000af0c0d310f8e8d39e4f1f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 16:48:36 -0800 Subject: [PATCH 1538/2279] python3Packages.redshift-connector: cleanup --- .../redshift-connector/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 46aa57ca12da..63621cb51e97 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -1,25 +1,30 @@ { - beautifulsoup4, - boto3, + lib, buildPythonPackage, fetchFromGitHub, - lib, + + # build-system + setuptools, + + # dependencies + beautifulsoup4, + boto3, + botocore, lxml, packaging, - pytest-mock, - pytestCheckHook, - pythonOlder, pytz, requests, scramp, + + # test + pytest-mock, + pytestCheckHook, }: buildPythonPackage rec { pname = "redshift-connector"; version = "2.1.8"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "aws"; @@ -33,7 +38,9 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace 'addopts =' 'no-opts =' ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 boto3 lxml @@ -43,6 +50,8 @@ buildPythonPackage rec { scramp ]; + pythonRelaxDeps = [ "lxml" ]; + nativeCheckInputs = [ pytest-mock pytestCheckHook From 02bb6d6d22dff3ff754ebbaad803cba9b3bcbb68 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 10:48:52 -0800 Subject: [PATCH 1539/2279] python3Packages.yamlloader: cleanup --- pkgs/development/python-modules/yamlloader/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 0add590d5bfb..2836ab6c78e8 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -7,7 +7,6 @@ pytestCheckHook, pyyaml, hypothesis, - pythonOlder, }: buildPythonPackage rec { @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "1.5.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs="; @@ -39,11 +36,11 @@ buildPythonPackage rec { "yamlloader" ]; - meta = with lib; { + meta = { description = "Case-insensitive list for Python"; homepage = "https://github.com/Phynix/yamlloader"; changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ freezeboy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ freezeboy ]; }; } From 195b457d0017758b93cb313cfc8d7bc6884f6942 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 10:52:23 -0800 Subject: [PATCH 1540/2279] python3Packages.yamlloader: build from GitHub source --- pkgs/development/python-modules/yamlloader/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 2836ab6c78e8..354c735461d3 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, hatch-vcs, hatchling, pytestCheckHook, @@ -14,9 +14,11 @@ buildPythonPackage rec { version = "1.5.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs="; + src = fetchFromGitHub { + owner = "Phynix"; + repo = "yamlloader"; + tag = version; + hash = "sha256-SNb1iXao+TNW872qDtEldZj6S+yJxRlsnw6ye92RFSk="; }; build-system = [ From a508472eb413ed9b5a2c0ec28c24f6e9d0803e4d Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 10:55:03 -0800 Subject: [PATCH 1541/2279] python3Packages.yamlloader: disable broken test file due to pickling error --- pkgs/development/python-modules/yamlloader/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 354c735461d3..207e3dd7151e 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -33,6 +33,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # TypeError: cannot pickle '_thread.RLock' object + # https://github.com/Phynix/yamlloader/issues/64 + "tests/test_ordereddict.py" + ]; + pythonImportsCheck = [ "yaml" "yamlloader" From fd1431e8d70e3fd69c8edbe6e2d7cbc0306f70c1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 11:10:57 -0800 Subject: [PATCH 1542/2279] python3Packages.yamlloader: add sarahec as maintainer --- pkgs/development/python-modules/yamlloader/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 207e3dd7151e..d2e79d4d1bf0 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -49,6 +49,9 @@ buildPythonPackage rec { homepage = "https://github.com/Phynix/yamlloader"; changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ freezeboy ]; + maintainers = with lib.maintainers; [ + freezeboy + sarahec + ]; }; } From 3ba6ba1b354e65ceaa99e25809fe80e26524fee5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 16:59:16 +0000 Subject: [PATCH 1543/2279] enzyme: 0.0.206 -> 0.0.208 --- pkgs/by-name/en/enzyme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index bf9d31ce1c5e..64bbf9b095c0 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.206"; + version = "0.0.208"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-eTRdigqNxCI9HvmKpFZUOWq6tHfldJoeNdmtd+i3aZU="; + hash = "sha256-/WNiGeKoEvKYlXIK4cU6z5gFGujQbAE13qyvnhMniXc="; }; postPatch = '' From b6222779475950b9b013fc6f4840dd7429decc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 7 Nov 2025 17:06:49 +0000 Subject: [PATCH 1544/2279] hyprland: 0.51.1 -> 0.52.0 --- pkgs/by-name/hy/hyprland/info.json | 10 +++++----- pkgs/by-name/hy/hyprland/package.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index c4fefeb7a047..4b6bf834beda 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.51.1-b", - "commit_hash": "71a1216abcc7031776630a6d88f105605c4dc1c9", - "commit_message": "[gha] Nix: update inputs", - "date": "2025-09-22", - "tag": "v0.51.1" + "branch": "main", + "commit_hash": "f56ec180d3a03a5aa978391249ff8f40f949fb73", + "commit_message": "version: bump to 0.52.0", + "date": "2025-11-07", + "tag": "v0.52.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 2797a95b9e4e..21cf792817bd 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -91,14 +91,14 @@ assert assertMsg ( customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-TPlZf0urtvDH4Cb4By06szJmzR4sBlgQATuGQy8bH6U="; + hash = "sha256-5jYD01l95U/HTfZMAccAvhSnrWgHIRWEjLi9R4wPIVI="; }; postPatch = '' From ffe7af76eb61e0fc187b00f323bfa5f3cecec7ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 17:12:55 +0000 Subject: [PATCH 1545/2279] python3Packages.plugwise: 1.8.3 -> 1.9.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index f12df2f1e998..39a7af210c85 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.8.3"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; tag = "v${version}"; - hash = "sha256-E5SJhhvT6KdkMvGo1mxrsSVRixdMjCl0ED/A6ozqn9o="; + hash = "sha256-OKbzN4IWrXCrn0qUd7hL6Oh2dvO9udxymo7pZXPmqA4="; }; postPatch = '' From e9250f684000ca09771521e018f119513cba89f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 17:13:12 +0000 Subject: [PATCH 1546/2279] badkeys: 0.0.14 -> 0.0.15 --- pkgs/by-name/ba/badkeys/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix index 9e48ffbf4064..8192fb1dda7f 100644 --- a/pkgs/by-name/ba/badkeys/package.nix +++ b/pkgs/by-name/ba/badkeys/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "badkeys"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; src = fetchFromGitHub { owner = "badkeys"; repo = "badkeys"; tag = "v${version}"; - hash = "sha256-+vG0/RO36JPJQ6PB7y6PBAqs4KkMRR21GdTdx/UHHKE="; + hash = "sha256-unBPdNrXwWh1EkbTZKAy4E0aASpeyT+mz3liASTzj4o="; }; build-system = with python3Packages; [ From d0cfb3936606954c3c352ba08846f127e8570de7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 17:28:40 +0000 Subject: [PATCH 1547/2279] cnquery: 12.7.1 -> 12.8.0 --- pkgs/by-name/cn/cnquery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index ad7293fc72c1..e23ad8c6bebd 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "12.7.1"; + version = "12.8.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-LYEMJ1G+zr0LIeLGlWkoAEu+nwVrDrREBSwVH3BlIsE="; + hash = "sha256-tgussiogV9w7HR7QJ+XAq/kaMq0igFt+FhgfHLobG18="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-ZpyLln4YLPfZy/EXWMDAKy/jr7/wZqkvVclD8F4tEw4="; + vendorHash = "sha256-V2h+n6JVi3vPcNFVvnBTIq9+gorbTFi30mdBuraH/LU="; ldflags = [ "-w" From 83ad49b7a58711673c0bb2c74f13cd3358f7b0f8 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 7 Nov 2025 18:30:01 +0100 Subject: [PATCH 1548/2279] python3Packages.slack-sdk: remove error message variations for "no internet connection" --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index e9b4f14bfbe2..ca5e3d9402f1 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -51,15 +51,11 @@ buildPythonPackage rec { disabledTests = [ # Requires internet access (to slack API) "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" - # Requires network access: [Errno 111] Connection refused "test_send_message_while_disconnection" - # [Errno 61] Connection refused "TestWebClient_HttpRetry" - # ConnectionResetError: [Errno 54] Connection reset by peer "test_issue_690_oauth_access" "test_issue_690_oauth_v2_access" "test_error_response" - # Assertion Error: unexpectedly None (while accessing instance of slack store) "test_issue_1441_mixing_user_and_bot_installations" ]; From bd9a0a8f5fb4fad24b58c9fdd5ec005116df39f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 18:05:14 +0000 Subject: [PATCH 1549/2279] python3Packages.rendercanvas: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/rendercanvas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rendercanvas/default.nix b/pkgs/development/python-modules/rendercanvas/default.nix index 336bac33a7d8..bea026401316 100644 --- a/pkgs/development/python-modules/rendercanvas/default.nix +++ b/pkgs/development/python-modules/rendercanvas/default.nix @@ -22,14 +22,14 @@ }: buildPythonPackage rec { pname = "rendercanvas"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pygfx"; repo = "rendercanvas"; tag = "v${version}"; - hash = "sha256-6vvPIu+Zi+9ndcWHP43X0Qd+XCO7+tr8XCFm+bwCazE="; + hash = "sha256-Zk27gcUf4qHsIaL0TJJyB3dCej5xQnlKvHP9AfBPPiI="; }; postPatch = '' From a313b6c22c1e90a0d2f162cc4bb2324757a884ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 18:21:48 +0000 Subject: [PATCH 1550/2279] xlights: 2025.11 -> 2025.12 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 98d31d1a47c1..7148d30d8373 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2025.11"; + version = "2025.12"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-k5HGk5t/ujPuOU/GlxhA+yKKXy0lq8YkxcQkTUVBYXM="; + hash = "sha256-INB4x2iCzjpURL7VhugCcYo+X6p6aKIY5Dx5dy1ZjJ8="; }; meta = { From 3061dfc88bed66f79a11f99fb73e4e14a00dfa32 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Fri, 7 Nov 2025 12:45:09 -0500 Subject: [PATCH 1551/2279] nixos/wireguard-networkd: refresh peer endpoint without deleting link As of systemd v257, netdevs can be reconfigured by modifying the netdev config file and reloading (not restarting) networkd. This leaves the interface index unchanged and should generally be less disruptive. --- .../services/networking/wireguard-networkd.nix | 14 +++++++++++--- nixos/modules/services/networking/wireguard.nix | 9 --------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix index 0dc9f5b8d91c..08a5f635e331 100644 --- a/nixos/modules/services/networking/wireguard-networkd.nix +++ b/nixos/modules/services/networking/wireguard-networkd.nix @@ -101,15 +101,22 @@ let iproute2 systemd ]; - # networkd doesn't provide a mechanism for refreshing endpoints. + # networkd doesn't automatically refresh peer endpoints. # See: https://github.com/systemd/systemd/issues/9911 - # This hack does the job but takes down the whole interface to do it. script = '' - ip link delete ${name} || : + touch /etc/systemd/network/40-${name}.netdev networkctl reload ''; }; + # netdev config must be a real file (not a symlink to a store file) + # so the refresh service can 'touch' it. + generateRefreshNetdevMode = + name: interface: + nameValuePair "systemd/network/40-${name}.netdev" { + mode = "0444"; + }; + in { meta.maintainers = [ lib.maintainers.majiir ]; @@ -225,6 +232,7 @@ in networks = mapAttrs generateNetwork cfg.interfaces; }; + environment.etc = mapAttrs' generateRefreshNetdevMode refreshEnabledInterfaces; systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces; systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // { systemd-networkd.serviceConfig.LoadCredential = flatten ( diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 7d266d483fb1..771301852745 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -215,15 +215,6 @@ let This option can be set or overridden for individual peers. Setting this to `0` disables periodic refresh. - - ::: {.warning} - When {option}`networking.wireguard.useNetworkd` is enabled, this - option deletes the Wireguard interface and brings it back up by - reconfiguring the network with `networkctl reload` on every refresh. - This could have adverse effects on your network and cause brief - connectivity blips. See [systemd/systemd#9911](https://github.com/systemd/systemd/issues/9911) - for an upstream feature request that can make this less hacky. - ::: ''; }; From 96b08f16be8f5ddbf21134d651c02ae66fcba383 Mon Sep 17 00:00:00 2001 From: 0xda157 Date: Fri, 7 Nov 2025 10:33:49 -0800 Subject: [PATCH 1552/2279] maintainers: update da157 matrix --- 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 b02e5baababd..76cde1dde704 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5563,7 +5563,7 @@ }; da157 = { email = "da157@voidq.com"; - matrix = "@awwpotato:envs.net"; + matrix = "@da157:catgirl.cloud"; github = "0xda157"; githubId = 153149335; name = "0xda157"; From ad624a924db33c66ea472c20403a94e6cd13c8a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 18:35:46 +0000 Subject: [PATCH 1553/2279] opentrack: 2024.1.1-unstable-2025-10-29 -> 2024.1.1-unstable-2025-11-06 --- pkgs/by-name/op/opentrack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix index 13e21edba534..3390f0d6d9d3 100644 --- a/pkgs/by-name/op/opentrack/package.nix +++ b/pkgs/by-name/op/opentrack/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opentrack"; - version = "2024.1.1-unstable-2025-10-29"; + version = "2024.1.1-unstable-2025-11-06"; src = fetchFromGitHub { owner = "opentrack"; repo = "opentrack"; - rev = "766808196cf63ddf9ceb102fba193582daceb9de"; - hash = "sha256-xS87LFAbnRg7uBbN7ARoGts3bNYkcpOm3xhojBepgIo="; + rev = "f7696e0b8515d53f0d0a7515cc27d3f80b3a5c28"; + hash = "sha256-FhI6lem83STBWjFMlChy/hhletyBkVM3iUmJfAU91UE="; }; aruco = callPackage ./aruco.nix { }; From dafad7fd83637218787e17f7aebef6dd17744511 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 18:47:07 +0000 Subject: [PATCH 1554/2279] texstudio: 4.8.9 -> 4.9.0 --- pkgs/by-name/te/texstudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix index a1718d619f44..73214d143c3f 100644 --- a/pkgs/by-name/te/texstudio/package.nix +++ b/pkgs/by-name/te/texstudio/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.9"; + version = "4.9.0"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-nI7aNZ7/IAjgjmHRO78uwkah8l+3m+w1ZQ096177eAU="; + hash = "sha256-LHG+QFtUYf6gqF8WGUlAYd5LWNt2YlyXmQH2nwPV5MQ="; }; nativeBuildInputs = [ From 2db5d487f15c28528f23d4004e98fa88efdf588f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 7 Nov 2025 13:49:25 -0500 Subject: [PATCH 1555/2279] root: allow overriding clang and clad_src via finalAttrs --- pkgs/by-name/ro/root/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index c432784847e3..4d681421a1fc 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -50,7 +50,7 @@ xrootd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "root"; version = "6.36.04"; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; + url = "https://root.cern.ch/download/root_v${finalAttrs.version}.source.tar.gz"; hash = "sha256-zGNn2PVjxtSco0wJ0LU8sPQaUo22+GrxEf12dEzaRZY="; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { nlohmann_json # link interface of target "ROOT::ROOTEve" ]; buildInputs = [ - clang + finalAttrs.clang davix fftw ftgl @@ -161,8 +161,8 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCLAD_SOURCE_DIR=${clad_src}" - "-DClang_DIR=${clang}/lib/cmake/clang" + "-DCLAD_SOURCE_DIR=${finalAttrs.clad_src}" + "-DClang_DIR=${finalAttrs.clang}/lib/cmake/clang" "-Dbuiltin_clang=OFF" "-Dbuiltin_llvm=OFF" "-Dfail-on-missing=ON" @@ -258,4 +258,4 @@ stdenv.mkDerivation rec { ]; license = licenses.lgpl21; }; -} +}) From bc3fc7e77b40d23149da655ee2bd691243e62d60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 18:58:40 +0000 Subject: [PATCH 1556/2279] bilibili: 1.17.2-2 -> 1.17.3-1 --- pkgs/by-name/bi/bilibili/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 9231a87d3df7..0a55cfc7081c 100644 --- a/pkgs/by-name/bi/bilibili/sources.nix +++ b/pkgs/by-name/bi/bilibili/sources.nix @@ -1,6 +1,6 @@ # Generated by ./update.sh - do not update manually! { - version = "1.17.2-2"; - arm64-hash = "sha256-wKjbsuXDq9gsa6d0QgrOm2aBHcqDR23ZhH5Hl9cx0wM="; - x86_64-hash = "sha256-pVg1bXBD+tXbDEoKpd2KnL5jNE0Pi6SI+DIJE8Z5cHc="; + version = "1.17.3-1"; + arm64-hash = "sha256-BzWByQ9ConOHZvyTRp5ogWo9esRiD5Ub/TOeuYJTggA="; + x86_64-hash = "sha256-FCc1NO8Law7fMBqyBxQB4NJR0ZN/ZYZ0wakGrnNw4DU="; } From 68f6c8767473116285cc5d8b58382594e347f61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 19:09:04 +0000 Subject: [PATCH 1557/2279] vacuum-go: 0.19.4 -> 0.20.1 --- pkgs/by-name/va/vacuum-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 30edc97de040..5a37135f7841 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,17 +7,17 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${finalAttrs.version}"; - hash = "sha256-TAnzsTa0143K5qHPBd00Plt6mmABIsbRmDf/k4dLU0M="; + hash = "sha256-BNm4daNfbVNFXFdeeJ6v+RqYOXidajS+kMURearUoOE="; }; - vendorHash = "sha256-udFygHjA8Ygqs8YD97wwoUZqozVSs87Q1ss52Udq+nw="; + vendorHash = "sha256-smzYCcAlQnit4fdFIXHcJSbpf4CMcE5hkBXxYdVo4r0="; env.CGO_ENABLED = 0; ldflags = [ From c11cdba7200e64f458f95b2080409cd0c15fee54 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Fri, 7 Nov 2025 22:14:05 +0300 Subject: [PATCH 1558/2279] nixVersions.nix_2_32: 2.32.2 -> 2.32.3 Diff: https://github.com/NixOS/nix/compare/2.32.2...2.32.3 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index edcc45090f72..77b33e68a3d6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -180,14 +180,14 @@ lib.makeExtensible ( nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.32.2"; + version = "2.32.3"; inherit (self.nix_2_31.meta) maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; tag = version; - hash = "sha256-zO5A57NT5WtSJ73O3uIQdkPoxW+qQfMPhMMPI1UHRjA="; + hash = "sha256-DrYVpBbff2zwtyrhll3fAHUYplJ8AEnd0aZa2VAY88I="; }; }; From 68fcbb0fe89a9129a2e943089c03e76acc2cc3b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 7 Nov 2025 20:12:42 +0100 Subject: [PATCH 1559/2279] ctranslate2: 4.6.0 -> 4.6.1 https://github.com/OpenNMT/CTranslate2/blob/v4.6.1/CHANGELOG.md --- pkgs/by-name/ct/ctranslate2/package.nix | 4 ++-- pkgs/development/python-modules/ctranslate2/default.nix | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index aaa3cbb13e27..f97a6e1e4658 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -28,14 +28,14 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "ctranslate2"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-EM2kunqtxo0BTIzrEomfaRsdav7sx6QEOhjDtjjSoYY="; + hash = "sha256-nnbBK1dIHwhq8n1mJe2wOLcDkIuScFbQwZvJ8x+knCk="; }; # Fix CMake 4 compatibility diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index 018490ff8dac..26de059fba7b 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { # https://github.com/OpenNMT/CTranslate2/tree/master/python sourceRoot = "${src.name}/python"; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "pybind11==" "pybind11>=" + ''; + build-system = [ pybind11 setuptools From ea92357c209c6667524f33854cf376ad2549f8de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 19:22:42 +0000 Subject: [PATCH 1560/2279] pkgsite: 0-unstable-2025-10-29 -> 0-unstable-2025-11-06 --- pkgs/by-name/pk/pkgsite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index c185c8cf82d2..a8264699fc7c 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-10-29"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "950d5ec0f5e9dbe92b2d1b1301322ea7f75ca1de"; - hash = "sha256-wclB22O0YEWwWA6zC7VByntmLeP9X5QLOb+hcFermko="; + rev = "0d7e29046a911358f7f5a5c4028a9db875187281"; + hash = "sha256-2dHT/p0cImvaJGxf50SSebgq3eSkbX1A0kdi93rCJCE="; }; vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c="; From 0485e0897ce4b9306b6aed22b4c5cf717675e20e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 19:22:43 +0000 Subject: [PATCH 1561/2279] simplex-chat-desktop: 6.4.6 -> 6.4.7 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index ff0951bf5e84..ebdb1c3d3088 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.4.6"; + version = "6.4.7"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-Z36jWYiWP5PdiDHazXnZw9PbFC7sB2DV9c29YEjNDEc="; + hash = "sha256-zCkbQS99FNZS9Q6MgQuINcgWn+/JdfrLraEKWAGqguY="; }; appimageContents = appimageTools.extract { From 3a06c27603835d31f9b71f061f89a749412318e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 19:23:26 +0000 Subject: [PATCH 1562/2279] vscode-extensions.shd101wyy.markdown-preview-enhanced: 0.8.19 -> 0.8.20 --- 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 b04d7fe3466f..4e9d657bdcbd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4170,8 +4170,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.19"; - hash = "sha256-F87YInLUkPUpB2oifCCq1xWD41LUdqg8cusGw2wEYg0="; + version = "0.8.20"; + hash = "sha256-+dwLuqtEYirQaw/tuG5m5Ugk0crKQQZM43TmslJsBBc="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; From 4593db6e41aefef51674a2737b6b8ec1aec501bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 19:24:14 +0000 Subject: [PATCH 1563/2279] python3Packages.neo4j: 6.0.2 -> 6.0.3 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 48ea82a7a9d6..82ff3aee6f8c 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "neo4j"; - version = "6.0.2"; + version = "6.0.3"; pyproject = true; src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; tag = version; - hash = "sha256-0Idfa7hFrLSD26PpA/lJcVtYpAPcX+AF3wab092Sbzw="; + hash = "sha256-KhPxwj5MmhNpd4d64dN0d1wOP6nAac/DsRQ8zoT03/A="; }; postPatch = '' From 77cbbd05c20cf3e71b89e309a6ea7087aff5a9a0 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 7 Nov 2025 20:33:22 +0100 Subject: [PATCH 1564/2279] apko: 0.30.18 -> 0.30.20 https://github.com/chainguard-dev/apko/releases/tag/v0.30.20 https://github.com/chainguard-dev/apko/releases/tag/v0.30.19 diff: https://github.com/chainguard-dev/apko/compare/v0.30.18...v0.30.20 --- pkgs/by-name/ap/apko/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index b0977f024449..30c3b94bbda8 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.18"; + version = "0.30.20"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-pOG2dDo1iHtS+ez7Crj78IpI2vuBkjpfI+W4MxJrPOI="; + hash = "sha256-ZmvEBWCtJ2GQO8sqjeSYMclMkVxjSiLBdrRf8N9zXiQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-F3b0mTSdPig8mDoqsusLTutfeMXM3Qfm5aosvHRO35k="; + vendorHash = "sha256-JFDwztOEupORbkhOm/Vl5SuTaLbdp8YXXRO0jVJI/Uk="; nativeBuildInputs = [ installShellFiles ]; From bd031d4ab93419a6459e6d4d731c031643a5adcc Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 7 Nov 2025 20:48:36 +0100 Subject: [PATCH 1565/2279] forgejo-runner: 11.3.0 -> 11.3.1 https://code.forgejo.org/forgejo/runner/releases/tag/v11.3.1 diff: https://code.forgejo.org/forgejo/runner/compare/v11.3.0...v11.3.1 --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index ac198f9ccb1f..121c3ece070d 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -42,17 +42,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "11.3.0"; + version = "11.3.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-tbP6S4suHT8eEIg+Gd2d7Su2cgwWNALcHnue9UpDnKU="; + hash = "sha256-jvHnTCkRvYaejeCiPpr18ldEmxcAkrEIaOLVVBY11eg="; }; - vendorHash = "sha256-QokVTTfMGAJG4Jqfs7mfGXrC4QSZfOXesfF2OeN0L9M="; + vendorHash = "sha256-7Ybh5qzkqT3CvGtRXiPkc5ShTYGlyvckTxg4EFagM/c="; # See upstream Makefile # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile From 5f72ce04cc101d080c0161e42f3263c00900e544 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 16 Oct 2025 14:56:55 -0300 Subject: [PATCH 1566/2279] lightning-loop: 0.31.2 -> 0.31.5 --- pkgs/by-name/li/lightning-loop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index df3ad835f178..2a60bd978894 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.31.2-beta"; + version = "0.31.5-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - hash = "sha256-xhvGsAvcJqjSyf32Zo9jJUoHCN/5mWliLqcyN3GEjD0="; + hash = "sha256-pmZturc7b3wd+qgSQPNzeY0LoMTF82dqUgOe8NfPeZw="; }; - vendorHash = "sha256-Rb0P2mPrvOII5Ck4rtB4/gpymVmwuM1rH8sxLt0zDhs="; + vendorHash = "sha256-X/+yi04FkN8hauqeFytagIdfigb6EGTvv8tVrlm7MGw="; subPackages = [ "cmd/loop" From c78c7782b14e006439513f42da6bf4684d7120cc Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 16 Oct 2025 16:44:10 -0300 Subject: [PATCH 1567/2279] lightning-loop: add man page --- pkgs/by-name/li/lightning-loop/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index 2a60bd978894..0e93b49c503c 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -1,6 +1,7 @@ { buildGoModule, fetchFromGitHub, + installShellFiles, lib, }: @@ -22,11 +23,17 @@ buildGoModule rec { "cmd/loopd" ]; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' + installManPage docs/loop.1 + ''; + meta = with lib; { description = "Lightning Loop Client"; homepage = "https://github.com/lightninglabs/loop"; From 708908c810c0d6b26df3876b1b38104a1e75c640 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 16 Oct 2025 16:46:59 -0300 Subject: [PATCH 1568/2279] lightning-loop: add starius to maintainers --- pkgs/by-name/li/lightning-loop/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index 0e93b49c503c..0930b8025f1d 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -38,6 +38,9 @@ buildGoModule rec { description = "Lightning Loop Client"; homepage = "https://github.com/lightninglabs/loop"; license = licenses.mit; - maintainers = with maintainers; [ proofofkeags ]; + maintainers = with maintainers; [ + proofofkeags + starius + ]; }; } From d956eef3fde8f9dcf9cee21527353d38ea272528 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 19 Oct 2025 19:31:45 -0300 Subject: [PATCH 1569/2279] lightning-loop: set CGO_ENABLED=0 Sync it with how upstream is built for release: https://github.com/lightninglabs/loop/blob/v0.31.4-beta/release.sh#L270 --- pkgs/by-name/li/lightning-loop/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index 0930b8025f1d..8db5d3ba5dfd 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -23,6 +23,8 @@ buildGoModule rec { "cmd/loopd" ]; + env.CGO_ENABLED = 0; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ From 225ceabe5470ed9d589d28e577f4108d4f010e6e Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Fri, 7 Nov 2025 20:03:25 +0000 Subject: [PATCH 1570/2279] prusa-slicer: 2.9.3 -> 2.9.4 Changelog: https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.9.4 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index da9d218a932b..947500522390 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -62,12 +62,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-B2uHrh09xKehmxnk3I4MHIjBfB/pGgFXC6R5k10JoJY="; + hash = "sha256-1ilgr9RaIoWvj0TDVc20XjjUUcNtnicR7KlE0ii3GQE="; rev = "version_${finalAttrs.version}"; }; From aed0d01b3e924f1d4bf9918a7b47af9ed5cec26d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 20:04:50 +0000 Subject: [PATCH 1571/2279] python3Packages.fastcore: 1.8.14 -> 1.8.15 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 4a118b65acbc..11c6893092ae 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.8.14"; + version = "1.8.15"; pyproject = true; src = fetchFromGitHub { owner = "fastai"; repo = "fastcore"; tag = version; - hash = "sha256-75HeMXzOYECh09ah+mvazQeEQOgcFuy8Cw9AYgu6Sz8="; + hash = "sha256-qMF0PWKtP2EKEUw/9FAOTo3scMYqyNWfydn2yble1jc="; }; build-system = [ setuptools ]; From 5f38240a8edf6769f54f9f9881b932260e860eb8 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Thu, 6 Nov 2025 12:00:51 +0100 Subject: [PATCH 1572/2279] matrix-alertmanager-receiver: 2025.10.22 -> 2025.11.5 Release notes: https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.11.5 Full changelog: https://github.com/metio/matrix-alertmanager-receiver/compare/2025.10.22...2025.11.5 --- pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 86ca596569df..e3d29b7ee553 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2025.10.22"; + version = "2025.11.5"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-TJDh1taboIRSBDyF1RV/NXKVvuT884+aU6wg6tC+YqI="; + hash = "sha256-vSnsPtUzoxpuV9/pZFhXwlRP6lGZPBzkdTbR1ASkdQA="; }; - vendorHash = "sha256-8Ag/Xd4+TQBBNVJpYQfuelhaCy+3hatTZFIo2VMjXOs="; + vendorHash = "sha256-EcHocZhrYgh+cIg5Y+9rHf30aVkTK4BVk0NI3PzL3X4="; env.CGO_ENABLED = "0"; From 2bb20ead102f5074f56b92e7ce7de8711f9f14b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 20:08:38 +0000 Subject: [PATCH 1573/2279] ytdl-sub: 2025.10.23 -> 2025.11.07.post1 --- pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 2bb128d8c9b2..2578b4b3fcd3 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2025.10.23"; + version = "2025.11.07.post1"; pyproject = true; src = fetchFromGitHub { owner = "jmbannon"; repo = "ytdl-sub"; tag = version; - hash = "sha256-8BU0kTKPwCx/SFSONxGC3vXoBbcdX4ac+dlzoVpnkt0="; + hash = "sha256-gg4KcYLnHKpIJKhL8x1xUDf38LvmTIc/mgd0Py6Uoe4="; }; postPatch = '' From 5fcb55581f4c8c90819ac38e8454d4a18ecc1cc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 20:09:10 +0000 Subject: [PATCH 1574/2279] flip-link: 0.1.10 -> 0.1.11 --- pkgs/by-name/fl/flip-link/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index c3799a709f13..05d2854bf437 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "flip-link"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "knurling-rs"; repo = "flip-link"; rev = "v${version}"; - hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g="; + hash = "sha256-scAENBaZMWR6HgEnXDQPCVsZPo0m9khd3C+05hJhje8="; }; - cargoHash = "sha256-LYIgMKXaXN5gh+MvHf03za7qPJ8N8Ww7ykWB5TYOqkw="; + cargoHash = "sha256-nyOLRBlC9tgEr4p8XEF4G4T3xhjQVgIx+D5Uwn/GENY="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; From 5abcdf7404b9ca67a1078d23b2deeb73313550ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 7 Nov 2025 20:16:03 +0000 Subject: [PATCH 1575/2279] hyprland: add patch to fix plugins compilation --- pkgs/by-name/hy/hyprland/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 21cf792817bd..f9193601996b 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -3,6 +3,7 @@ stdenv, stdenvAdapters, fetchFromGitHub, + fetchpatch, pkg-config, makeWrapper, cmake, @@ -101,6 +102,14 @@ customStdenv.mkDerivation (finalAttrs: { hash = "sha256-5jYD01l95U/HTfZMAccAvhSnrWgHIRWEjLi9R4wPIVI="; }; + patches = [ + # NOTE: this is required to make plugins compile. should be removed with the next release. + (fetchpatch { + url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch"; + hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s="; + }) + ]; + postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp From 4be99fb06b7f618a256fe811a1271d7e287d980a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 7 Nov 2025 20:16:18 +0000 Subject: [PATCH 1576/2279] hyprlandPlugins/hyprland-plugins: 0.51.0 -> 0.52.0 --- .../hyprwm/hyprland-plugins/hyprland-plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 1497950a082e..3bc837a2319d 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -13,13 +13,13 @@ let mkHyprlandPlugin, }: let - version = "0.51.0"; + version = "0.52.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; tag = "v${version}"; - hash = "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo="; + hash = "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY="; }; in mkHyprlandPlugin { From f4a361090874d0c57dbda0fe2f1fa9c347085b34 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Fri, 7 Nov 2025 21:18:24 +0100 Subject: [PATCH 1577/2279] keycloak: 26.4.2 -> 26.4.4 Release notes: https://github.com/keycloak/keycloak/releases/tag/26.4.4 Full changelog: https://github.com/keycloak/keycloak/compare/26.4.2...26.4.4 --- pkgs/by-name/ke/keycloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index c0e4d6f5665d..7858dcd3afef 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.4.2"; + version = "26.4.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-Gq4nfr3rzd58TpAM1EYoj3R856IWcR3sz63Au3UanwQ="; + hash = "sha256-nzwkrwMHKBZWzyB5Csl6htnVAcIgtpDC6YDl3MNg+eM="; }; nativeBuildInputs = [ From 380048adfc0bea0f700b25a554ad3bd257d88e9f Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Fri, 7 Nov 2025 22:23:32 +0200 Subject: [PATCH 1578/2279] roboto-mono: 2.002-20190125 -> 3.001 - updated src to a googlefonts repo - cleaned up old attrs - Roboto Mono v3 was relicensed with SIL OFL --- pkgs/by-name/ro/roboto-mono/package.nix | 84 +++++-------------------- 1 file changed, 17 insertions(+), 67 deletions(-) diff --git a/pkgs/by-name/ro/roboto-mono/package.nix b/pkgs/by-name/ro/roboto-mono/package.nix index 3c71e0f21714..0e251e149478 100644 --- a/pkgs/by-name/ro/roboto-mono/package.nix +++ b/pkgs/by-name/ro/roboto-mono/package.nix @@ -1,77 +1,27 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, }: -let - # Latest commit touching the robotomono tree - commit = "5338537ef835a3d9ccf8faf386399f13a30605e2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "roboto-mono"; - version = "2.002-20190125"; + version = "3.001"; - srcs = [ - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Regular.ttf"; - sha256 = "1f96r4by67hzqpr4p2wkrfnpj9b7x9qrmwns0312w2l2rnp2qajx"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Bold.ttf"; - sha256 = "10wg4dchdq4s89r9pd4h8y5l1bf8mix32pksph2wafyr3815kfnm"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Italic.ttf"; - sha256 = "1cayhm3wj36q748xd0zdgrhm4pz7wnrskrlf7khxx2s41m3win5b"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-BoldItalic.ttf"; - sha256 = "04238dxizdlhnnnyzhnqckxf8ciwlnwyzxby6qgpyg232abx0n2z"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Medium.ttf"; - sha256 = "00rh49d0dbycbkjgd2883w7iqzd6hcry08ycjipsvk091p5nq6qy"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-MediumItalic.ttf"; - sha256 = "0fxl6lblj7anhqmhplnpvjwckjh4g8m6r9jykxdrvpl5hk8mr65b"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Light.ttf"; - sha256 = "1h8rbc2p70fabkplsafzah1wcwy92qc1wzkmc1cnb4yq28gxah4a"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-LightItalic.ttf"; - sha256 = "08y2qngwy61mc22f8i00gshgmcf7hwmfxh1f4j824svy4n16zhsc"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Thin.ttf"; - sha256 = "0fmij9zlfjiyf0vb8n8gvrwi35l830zpmkbhcy1xgx0m8za6mmmy"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-ThinItalic.ttf"; - sha256 = "0mpwdhjnsk8311nw8fqzy1b7v0wzb4pw639ply1j38a0vibrsmn7"; - }) - ]; - - sourceRoot = "."; - - unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc)) - cp $curSrc ./$ttfName - ''; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "robotomono"; + tag = "v${finalAttrs.version}"; + hash = "sha256-i0r8x4VgaOYW/pYXK+AXw7jMwhA8Hs9VQ1lq5f/xTe0="; + }; installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -a *.ttf $out/share/fonts/truetype/ + runHook preInstall + install -Dm644 fonts/ttf/*.ttf -t $out/share/fonts/truetype/RobotoMono + runHook postInstall ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0"; - - meta = with lib; { + meta = { homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; longDescription = '' @@ -85,8 +35,8 @@ stdenv.mkDerivation { wider glyphs are adjusted for weight. Curved caps like 'C' and 'O' take on the straighter sides from Roboto Condensed. ''; - license = licenses.asl20; - platforms = platforms.all; - maintainers = [ maintainers.romildo ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.romildo ]; }; -} +}) From 291a8ed602d773e615e919cafe9583aa35a86bf0 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Fri, 7 Nov 2025 22:27:45 +0200 Subject: [PATCH 1579/2279] roboto-mono: add update script --- pkgs/by-name/ro/roboto-mono/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ro/roboto-mono/package.nix b/pkgs/by-name/ro/roboto-mono/package.nix index 0e251e149478..eaadebdb5ea8 100644 --- a/pkgs/by-name/ro/roboto-mono/package.nix +++ b/pkgs/by-name/ro/roboto-mono/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -21,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; From 50e6a99cb02ba9641022be6c44c13f9f5933fc73 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 7 Nov 2025 21:24:10 +0100 Subject: [PATCH 1580/2279] ffmpegthumbnailer: unstable-2024-01-04 -> 2.2.3 --- pkgs/by-name/ff/ffmpegthumbnailer/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix index a19a0f5dafd5..ccd6ee4a6abb 100644 --- a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix +++ b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, ffmpeg-headless, @@ -9,17 +10,25 @@ libjpeg, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "ffmpegthumbnailer"; - version = "unstable-2024-01-04"; + version = "2.2.3"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c"; - hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0="; + tag = finalAttrs.version; + hash = "sha256-1hVPtCPwfovCtA6aagViUJkYTCFuiFkOqGEqMHIoZe8="; }; + patches = [ + (fetchpatch { + name = "ffmpeg-8-fix.patch"; + url = "https://github.com/dirkvdb/ffmpegthumbnailer/commit/df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch"; + hash = "sha256-PArrcKuaWWA6/H59MbdC36B57GSvvp5sHz24QLTBZYw="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -60,4 +69,4 @@ stdenv.mkDerivation { platforms = platforms.unix; mainProgram = "ffmpegthumbnailer"; }; -} +}) From bf076633a532d9241a744417c4fcb6d545c08fa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 20:47:07 +0000 Subject: [PATCH 1581/2279] androidStudioPackages.canary: 2025.2.2.3 -> 2025.2.2.4 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ce1c69460c0a..29407ea9f3e3 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -24,8 +24,8 @@ let sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs="; }; latestVersion = { - version = "2025.2.2.3"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 3" - sha256Hash = "sha256-lhqGfHUSUJw4IQryJprqvJuGMUVHHem3xf7CeeZ7kCo="; + version = "2025.2.2.4"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 4" + sha256Hash = "sha256-i7IcD1/qOXJZM0Wzah9DIV9vsU6T2XemSvc5RK33jBI="; }; in { From 55f990a41b24bab8175e6ce0be5572723128f0f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 21:04:11 +0000 Subject: [PATCH 1582/2279] tailwindcss_4: 4.1.16 -> 4.1.17 --- pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 107239a1850f..feba98214600 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: let - version = "4.1.16"; + version = "4.1.17"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-5s1EuBZ/V0bKMuVPahQR3RpsDdFdJqnCc7Oy7Z2H330="; - aarch64-linux = "sha256-ln60NPTWocDf2hBt7MZGy3QuBNdFqkhHJgI83Ua6jto="; - x86_64-darwin = "sha256-/eKu0JvyScq5+Yb9byCJ486anOHHhi/dv6gHxBfg9dM="; - x86_64-linux = "sha256-CeaHamPOsJzNflhn49uystxlw6Ly4v4hDWjqO8BDIFA="; + aarch64-darwin = "sha256-hSti2Rpt+laWloa8ikuuDkci3o9am0KxArtYm37OjP4="; + aarch64-linux = "sha256-JkaJmEMRzCyhBKnWpNA5tCZ67PRUPcnqC7wJTusMzI0="; + x86_64-darwin = "sha256-YzfIcYUyHAeSRN+9nCRQKjAGQBvRU50ZzcnfjekQGEM="; + x86_64-linux = "sha256-zBFdm2xO3k5CO/6mo8/D8D5sFwK32RA2m5VA4rTPOGA="; } .${system} or throwSystem; in From f147c87570b87621c7209400287fa7111202d350 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Fri, 7 Nov 2025 13:10:21 -0800 Subject: [PATCH 1583/2279] cudaPackages.cuda-samples: Build cuda-samples 13.0 for CUDA 13 Add fixups for the 13.0 release of cuda-samples and build it when targeting CUDA 13. --- .../cuda-modules/packages/cuda-samples.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix index e77ca8eda743..ff231c8c8c89 100644 --- a/pkgs/development/cuda-modules/packages/cuda-samples.nix +++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix @@ -3,6 +3,7 @@ _cuda, cmake, cuda_cccl, + cuda_culibos, cuda_cudart, cuda_nvcc, cuda_nvrtc, @@ -29,7 +30,7 @@ backendStdenv.mkDerivation (finalAttrs: { name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "cuda-samples"; - version = "12.8"; + version = if cudaAtLeast "13" then "13.0" else "12.8"; # We should be able to use samples from the latest version of CUDA # on most of the CUDA package sets we have. @@ -38,10 +39,17 @@ backendStdenv.mkDerivation (finalAttrs: { owner = "NVIDIA"; repo = "cuda-samples"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ba0Fi0v/sQ+1iJ4mslgyIAE+oK5KO0lMoTQCC91vpiA="; + hash = lib.getAttr finalAttrs.version { + "13.0" = "sha256-bOcAE/OzOI6MWTh+bFZfq1en6Yawu+HI8W+xK+XaCqg="; + "12.8" = "sha256-Ba0Fi0v/sQ+1iJ4mslgyIAE+oK5KO0lMoTQCC91vpiA="; + }; }; prePatch = + let + samplesAtLeast = lib.versionAtLeast finalAttrs.version; + samplesOlder = lib.versionOlder finalAttrs.version; + in # https://github.com/NVIDIA/cuda-samples/issues/333 '' nixLog "removing sample 0_Introduction/UnifiedMemoryStreams which requires OpenMP support for CUDA" @@ -52,7 +60,7 @@ backendStdenv.mkDerivation (finalAttrs: { '# add_subdirectory(UnifiedMemoryStreams)' '' # This sample tries to use a relative path, which doesn't work for our splayed installation. - + '' + + lib.optionalString (samplesOlder "13") '' nixLog "patching sample 0_Introduction/matrixMul_nvrtc" substituteInPlace \ "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \ @@ -66,6 +74,20 @@ backendStdenv.mkDerivation (finalAttrs: { "\''${CUDAToolkit_BIN_DIR}/../include/cuda" \ "${lib.getOutput "include" cuda_cccl}/include/cuda" '' + + lib.optionalString (samplesAtLeast "13") '' + nixLog "patching sample 0_Introduction/matrixMul_nvrtc" + substituteInPlace \ + "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \ + --replace-fail \ + "\''${CUDA_INCLUDE_DIR}/cooperative_groups" \ + "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \ + --replace-fail \ + "\''${CUDA_INCLUDE_DIR}/cccl/nv" \ + "${lib.getOutput "include" cuda_cccl}/include/nv" \ + --replace-fail \ + "\''${CUDA_INCLUDE_DIR}/cccl/cuda" \ + "${lib.getOutput "include" cuda_cccl}/include/cuda" + '' # These three samples give undefined references, like # nvlink error : Undefined reference to '__cudaCDP2Free' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o' # nvlink error : Undefined reference to '__cudaCDP2Malloc' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o' @@ -108,7 +130,7 @@ backendStdenv.mkDerivation (finalAttrs: { "add_subdirectory(jitLto)" \ "# add_subdirectory(jitLto)" '' - + lib.optionalString (cudaAtLeast "12.4") '' + + lib.optionalString (samplesOlder "13") '' nixLog "patching sample 4_CUDA_Libraries/jitLto to use correct path to libnvJitLink.so" substituteInPlace \ "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt" \ @@ -172,7 +194,8 @@ backendStdenv.mkDerivation (finalAttrs: { libnpp libnvjitlink libnvjpeg - ]; + ] + ++ lib.optionals (cudaAtLeast "13") [ cuda_culibos ]; cmakeFlags = [ (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) From e84d638284d0f51e849bcb542c3eafde4c333084 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 21:17:13 +0000 Subject: [PATCH 1584/2279] direwolf-unstable: 1.7-unstable-2025-04-29 -> 1.8-unstable-2025-11-07 --- pkgs/by-name/di/direwolf-unstable/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix index 88a621623bcf..416314a1512c 100644 --- a/pkgs/by-name/di/direwolf-unstable/package.nix +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -12,13 +12,13 @@ inherit hamlibSupport gpsdSupport extraScripts; }).overrideAttrs (oldAttrs: { - version = "1.7-unstable-2025-04-29"; + version = "1.8-unstable-2025-11-07"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "486b3cf1f685502af7dc87b0f9c9cead6800d47b"; - hash = "sha256-VFBkOWHGZP7GjekHL3GY3BGkVXQbtyD1YPmu0xaQ1ME="; + rev = "3658a878920803bbb69a4567579dcc4d6cb80a92"; + hash = "sha256-EcQrNN0nRxEfhJc3AbYkxlRaBKpoHQRrZbExYBankMk="; }; # drop upstreamed cmake-4 patch From 2d281d87700c499a36b93da5948f7d10325b5611 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Nov 2025 21:19:39 +0000 Subject: [PATCH 1585/2279] diffoscope: 307 -> 308 Changes: https://diffoscope.org/news/diffoscope-308-released/ --- pkgs/by-name/di/diffoscope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index 7df82ec5f70d..3e99792e4d47 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -106,12 +106,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "307"; + version = "308"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-ccMBoupgrDwbKaWAQa+Tqo6WfB5Qsva17uvpg2UX4jY="; + hash = "sha256-ahHy7E2bkNB3IeiY4P8/ksn68O+uXJ2DVscZPw7wGRI="; }; outputs = [ From 036a1cb8563a6e81d733a9ec7624a99127e042a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 21:32:59 +0000 Subject: [PATCH 1586/2279] python3Packages.aioesphomeapi: 42.5.0 -> 42.7.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 61266462b20e..4a1ab7dfa2d2 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "42.5.0"; + version = "42.7.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-naYlRUJFYnxI3mOR+th+Sh2xSnAq67HSRdoopLLbqYo="; + hash = "sha256-dMpAlblqkmwYsXdMLkxGxpVxbbS/sBkRJR46BwXs2PM="; }; build-system = [ From cd60f02b84d3b241f5e324dfeeda1f30b1b2922c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Nov 2025 21:48:08 +0000 Subject: [PATCH 1587/2279] cyan: fix `cmake-4` build failure Without the change the build fails on `master` as https://hydra.nixos.org/build/311319725: CMake Error at CMakeLists.txt:31 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. ZHF: #457852 --- pkgs/by-name/cy/cyan/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix index 327994945850..7e3714a12476 100644 --- a/pkgs/by-name/cy/cyan/package.nix +++ b/pkgs/by-name/cy/cyan/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, qt5, cmake, pkg-config, @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; }; + patches = [ + # cmake-4 build fix: + # https://github.com/rodlie/cyan/pull/123 + (fetchpatch2 { + name = "cmake-4.patch"; + url = "https://github.com/rodlie/cyan/commit/885e81310de8df7f32a5e1d2c722f89bcd969cd1.patch?full_index=1"; + hash = "sha256-5VhXKamDNGeEvi86l+R3Lvzb4G5JFBq2dqqd6TdyxZ4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From f6871f8d71088db1b9dc0a5c4c552d97e67d3664 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Nov 2025 21:57:43 +0000 Subject: [PATCH 1588/2279] h2o.tests: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change `h2o.tests` eval fails as: $ nix build --no-link -f. h2o.tests error: … while evaluating the attribute 'h2o' at pkgs/by-name/h2/h2o/package.nix:78:36: 77| passthru = { 78| tests = { inherit (nixosTests) h2o; }; | ^ 79| }; … in the left operand of the update (//) operator at pkgs/top-level/all-packages.nix:153:5: 152| nixosTests = 153| import ../../nixos/tests/all-tests.nix { | ^ 154| inherit pkgs; (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: undefined variable 'lib' at nixos/tests/all-tests.nix:676:44: 675| gvisor = runTest ./gvisor.nix; 676| h2o = import ./web-servers/h2o { inherit lib runTest; }; | ^ 677| hadoop = import ./hadoop { --- nixos/tests/all-tests.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 511e2101fa7b..4a2bae095ad1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -673,7 +673,10 @@ in guacamole-server = runTest ./guacamole-server.nix; guix = handleTest ./guix { }; gvisor = runTest ./gvisor.nix; - h2o = import ./web-servers/h2o { inherit runTest; }; + h2o = import ./web-servers/h2o { + inherit runTest; + inherit (pkgs) lib; + }; hadoop = import ./hadoop { inherit handleTestOn; package = pkgs.hadoop; From 8b65a7721715d746f1a587c7b638046dac07a302 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 22:06:51 +0000 Subject: [PATCH 1589/2279] qownnotes: 25.10.4 -> 25.11.1 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 73db3a0cda24..ca20001ba823 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.10.4"; + version = "25.11.1"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-taYrPrirSIu1CGs8GeX2lhSS8R1l3mr8YPqpkH4Y/bk="; + hash = "sha256-6U+UYF45Nv6cX9ghSmOBQF13HxgcwTbBDnDMLr9jxXY="; }; nativeBuildInputs = [ From 754edf0e23035bf5c9fe4f1a5d35fc158fb58463 Mon Sep 17 00:00:00 2001 From: jamie Date: Fri, 7 Nov 2025 22:12:27 +0000 Subject: [PATCH 1590/2279] limine: fix typo ('streched' to 'stretched') --- nixos/modules/system/boot/loader/limine/limine.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix index 0c38e92f96a7..35e81d2afcfb 100644 --- a/nixos/modules/system/boot/loader/limine/limine.nix +++ b/nixos/modules/system/boot/loader/limine/limine.nix @@ -229,10 +229,10 @@ in }; wallpaperStyle = lib.mkOption { - default = "streched"; + default = "stretched"; type = lib.types.enum [ "centered" - "streched" + "stretched" "tiled" ]; description = '' @@ -375,7 +375,7 @@ in } (lib.mkIf (cfg.style.wallpapers == [ defaultWallpaper ]) { boot.loader.limine.style.backdrop = lib.mkDefault "2F302F"; - boot.loader.limine.style.wallpaperStyle = lib.mkDefault "streched"; + boot.loader.limine.style.wallpaperStyle = lib.mkDefault "stretched"; }) (lib.mkIf cfg.enable { assertions = [ From 2e59e4828dabe95fc62e7893bc99fcfac86a97b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 22:12:34 +0000 Subject: [PATCH 1591/2279] python3Packages.htmldate: 1.9.3 -> 1.9.4 --- pkgs/development/python-modules/htmldate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index c97199f97a3d..830b271a5e7a 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "htmldate"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "adbar"; repo = "htmldate"; tag = "v${version}"; - hash = "sha256-9uFf/sx0AZdlvizU65H87hbtwDKf8Ykm67bKM9Oq//s="; + hash = "sha256-ZSHQgj6zXmLdqDQWGnh2l70iXzdohsxdAIQGDSBufIA="; }; build-system = [ setuptools ]; From 32a1219b32dd8f2aab9ae34679ca667260eaced4 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 7 Nov 2025 19:28:14 -0300 Subject: [PATCH 1592/2279] microsoft-edge: 142.0.3595.53 -> 142.0.3595.65 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index bd98470847ec..35b07f7afe98 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -162,11 +162,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "142.0.3595.53"; + version = "142.0.3595.65"; 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-cSSKWxIkQe8jrv7gL5lX2Cs9roU8eD2MIHuLGQMnycM="; + hash = "sha256-aqQH4ttBWTjpzAEeWpheEJiu1FUMKMJu9j8Gu2pldbA="; }; # With strictDeps on, some shebangs were not being patched correctly From 0ea279e22f731760d158be32259f958049ff461b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 22:31:04 +0000 Subject: [PATCH 1593/2279] vscode-extensions.james-yu.latex-workshop: 10.10.2 -> 10.11.2 --- .../vscode/extensions/james-yu.latex-workshop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix index 85f420c67d99..0e3256c382c3 100644 --- a/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix +++ b/pkgs/applications/editors/vscode/extensions/james-yu.latex-workshop/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "10.10.2"; - hash = "sha256-Ls02bUSh5O5mDT2SEnaibvpHw535yelv5NaQ/NRM13k="; + version = "10.11.2"; + hash = "sha256-+vlOfTCsYLqN9fxxdLyHs0Cn7Lwcj4Is2L1SwqIFcJI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; From 2d241e605c89caaafa7b1615ebf2faadadef7286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 22:32:58 +0000 Subject: [PATCH 1594/2279] stackit-cli: 0.46.0 -> 0.47.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index a81bb73492bf..15284aa9905c 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-f7Af7Zk8rRrYyGChMgAM/a2Cs7fo3ZlN78aq5teZ0oo="; + hash = "sha256-6cWFUPPRQD+uCVatj7usF0ndXvqI7hdhE1KjdYDflb4="; }; - vendorHash = "sha256-tMPj4w/9fO9NlmwZoN4F3G4Cc+8wLmAr+fTueHGBn+A="; + vendorHash = "sha256-9e643w+1oHp9w50PSHF8SOqlwoym7OjSIH4PWGEAvdQ="; subPackages = [ "." ]; From 7802da5812ddb0d606c03f45cd4274c38dffe522 Mon Sep 17 00:00:00 2001 From: aware70 <7832566+aware70@users.noreply.github.com> Date: Fri, 7 Nov 2025 16:34:58 -0600 Subject: [PATCH 1595/2279] supercell-wx: fix build for Qt 6.10 --- pkgs/by-name/su/supercell-wx/package.nix | 3 ++- .../su/supercell-wx/patches/fix-qt-6.10.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index 8bddcb3a20b1..587444f6e36b 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ aware70 ]; }; - env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow"; + env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow -DQT_NO_USE_NODISCARD_FILE_OPEN"; env.GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}"; doCheck = true; @@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { # These may be or already are submitted upstream {{{ ./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp + ./patches/fix-qt-6.10.patch # }}} ]; diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch new file mode 100644 index 000000000000..d58710225f2d --- /dev/null +++ b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch @@ -0,0 +1,13 @@ +diff --git a/external/qt6ct.cmake b/external/qt6ct.cmake +index 665b5368..9e6ed0e9 100644 +--- a/external/qt6ct.cmake ++++ b/external/qt6ct.cmake +@@ -5,7 +5,7 @@ find_package(QT NAMES Qt6 + COMPONENTS Gui Widgets + REQUIRED) + find_package(Qt${QT_VERSION_MAJOR} +- COMPONENTS Gui Widgets ++ COMPONENTS Gui Widgets WidgetsPrivate + REQUIRED) + + #extract version from qt6ct.h From e0e6c5c67827c5678d51ae190ecb743c19fdf038 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 8 Nov 2025 01:37:32 +0300 Subject: [PATCH 1596/2279] nixVersions.git: 2.32pre20250919_07b96c1d -> 2.33pre20251107_479b6b73 Git version was lagging behind 2.32 a lot. A lot of commits to catch up on. There are some notable changes like dropping the aws-sdk-cpp in favor of the much lighter aws-crt-cpp. Diff: https://github.com/NixOS/nix/compare/07b96c1d14ab8695e5071fb73e19049fce8f3b6b...479b6b73a9576452c14ca66b7f3cd4873969077e --- pkgs/tools/package-management/nix/default.nix | 6 +++--- .../package-management/nix/modular/doc/manual/package.nix | 4 ++++ .../nix/modular/src/libstore/package.nix | 8 +++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index edcc45090f72..54131e6ecd51 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -194,14 +194,14 @@ lib.makeExtensible ( nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything; nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.32pre20250919_${lib.substring 0 8 src.rev}"; + version = "2.33pre20251107_${lib.substring 0 8 src.rev}"; inherit maintainers teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "07b96c1d14ab8695e5071fb73e19049fce8f3b6b"; - hash = "sha256-9tR08zFwQ9JNohdfeb40wcLfRnicXpKrHF+FHFva/WA="; + rev = "479b6b73a9576452c14ca66b7f3cd4873969077e"; + hash = "sha256-eBjgsauQXFz2yeiNoPEzgkf7uyV+S8HYCQgZhPVx/9I="; }; }; diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix index 75ca70ae8fbd..b6f58434bd8b 100644 --- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix +++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix @@ -10,6 +10,7 @@ jq, python3, rsync, + json-schema-for-humans, nix-cli, # Configuration Options @@ -39,6 +40,9 @@ mkMesonDerivation (finalAttrs: { jq python3 rsync + ] + ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [ + json-schema-for-humans ]; nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 988ed8d23370..fc24d6bccf59 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -9,6 +9,7 @@ boost, curl, aws-sdk-cpp, + aws-crt-cpp, libseccomp, nlohmann_json, sqlite, @@ -37,9 +38,10 @@ mkMesonLibrary (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp # There have been issues building these dependencies - ++ lib.optional ( - stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin) - ) aws-sdk-cpp; + ++ + lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)) + # Nix >=2.33 doesn't depend on aws-sdk-cpp and only requires aws-crt-cpp for authenticated s3:// requests. + (if lib.versionAtLeast (lib.versions.majorMinor version) "2.33" then aws-crt-cpp else aws-sdk-cpp); propagatedBuildInputs = [ nix-util From b4741629576af65a1c8ff07169a13caa83030abc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 7 Nov 2025 15:11:02 -0600 Subject: [PATCH 1597/2279] vimPlugins: update on 2025-11-07 Signed-off-by: Austin Horstman --- .../editors/vim/plugins/generated.nix | 960 +++++++++--------- .../editors/vim/plugins/overrides.nix | 7 + 2 files changed, 487 insertions(+), 480 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e4f4122c2e2c..901c207e894c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-10-24"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "a7138a0ee04d8af42c262554eccee168bbf1454f"; - sha256 = "115hnj4mkpqkyal3d1w3drs1jrxp4lhiz0bfqpak5n58j2ly8678"; + rev = "db56110b19c702053e86d54b48d8d570c59d0b6b"; + sha256 = "1k980vbvdyaam9q6bp9wng7v5774rqn2lapns43fnxrmf9whnc0q"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -204,12 +204,12 @@ final: prev: { LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2025-10-28"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "064e61058b6bbaef02a6143662628d105695b8e5"; - sha256 = "0lh0japff6lywy17kfa20aws9p81ig8g9fpzm6jxh6w0xhnhzzb1"; + rev = "a507822c0f67df661d1411f9274a65ca9cc832f5"; + sha256 = "16xzmyz7l64q2hfimvfqi8cwysw6vci919dmn5n7ydws6h5pijag"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; meta.hydraPlatforms = [ ]; @@ -217,12 +217,12 @@ final: prev: { LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-10-23"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "37ef81678d288d21272ada4cb85b2c0769bcd50b"; - sha256 = "1q1p6v9xarr2viyscrmg04j57dd298piraqz4xr75rh1w50lry3x"; + rev = "682e251efc9c4e0545d1f6bbc8c8639b198ecb1b"; + sha256 = "1hxy2rcx17kjxpi2yh1p1hy4q9g7yap3kwqsyc4gys0hzmjv3n6a"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -308,12 +308,12 @@ final: prev: { NrrwRgn = buildVimPlugin { pname = "NrrwRgn"; - version = "2022-02-13"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0"; - sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah"; + rev = "6a3f40bff37fcff7d4245932b47118f071b925f9"; + sha256 = "1lc5wjwic8xvr3y746yny2a32d4p0lnxqj6ml1vyaszpidsimjih"; }; meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; meta.hydraPlatforms = [ ]; @@ -412,12 +412,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-10-29"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "3b0d7d781589ce98ce577202d25d07741ffcf479"; - sha256 = "0zswfigqlic5rn9l3762x9383qhhwcx6bvswgs0ak8srlbd5zwng"; + rev = "976b31e094615b2c27009561b3c67a37c87c93c2"; + sha256 = "1j51wbimw7fx30sx8rpc78aqx7j582lhywgb4vzd2d0r3irj3v10"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -660,12 +660,12 @@ final: prev: { advanced-git-search-nvim = buildVimPlugin { pname = "advanced-git-search.nvim"; - version = "2025-08-18"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "aaronhallaert"; repo = "advanced-git-search.nvim"; - rev = "ec0dabe38857bc7ba2097677e80155a572e0dfbe"; - sha256 = "04rsv04xndk60sibwq4xx9mzkbv4444nhpk15mxnk15hp2784149"; + rev = "e6d0fa39c7b058b4f3019912c3e26f854c4e36af"; + sha256 = "0knc41f4yzahzxqq112lgwism2jlm2sz58pian03lxkjgnvrylwb"; }; meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/"; meta.hydraPlatforms = [ ]; @@ -1429,12 +1429,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "2025-09-12"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "a2907cc3cd661e0f89f7db1f4fc304782a676a7d"; - sha256 = "0acqa0b5n4l01ac9mbbxz2nbg8k8a50s0ajngg72l68q6m5z9mkm"; + rev = "658bc3da344aa5e37efe10ec3ae4309a8035d102"; + sha256 = "1gig4zqzm70msvl9achzr1gn90rmb670znc39jp7n66n45ifiq8j"; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.hydraPlatforms = [ ]; @@ -1455,12 +1455,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "2025-09-27"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "db58475d3fd2a16f9b1467d6895e3c4c195ed7dd"; - sha256 = "0q8s4215xmchi06lx0kqj1qw2f3svjq3yfdggyi065adm8di3k0r"; + rev = "45b336ec52615dd1a3aa47848d894616dd6293a5"; + sha256 = "14661jnzixfm62yf9nim8yh8j3rzqn101h9m5mb03ia37axdw5dy"; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.hydraPlatforms = [ ]; @@ -1572,12 +1572,12 @@ final: prev: { blink-cmp-conventional-commits = buildVimPlugin { pname = "blink-cmp-conventional-commits"; - version = "2025-02-18"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "disrupted"; repo = "blink-cmp-conventional-commits"; - rev = "e7ce3ddcc6d4044067d6d77ab41d480202e814ad"; - sha256 = "0m72nyg3pm1ig04hvch6lzd4hy77dnmdxxmbq154qwkjhbm0bs6m"; + rev = "c6eea4ecb755dffb7b57f42a1259447de7984974"; + sha256 = "1d4mqmk342pq8isaixwvyppbv1g5ddc2a448ifa8yp4vgc7lk95d"; }; meta.homepage = "https://github.com/disrupted/blink-cmp-conventional-commits/"; meta.hydraPlatforms = [ ]; @@ -1728,12 +1728,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-10-29"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "e6705fcfccc71636f93f7417296f6831303c30ac"; - sha256 = "1qgr8ikhmg5x1wwhqianm8ijkk7ip1d16an1f3ljc0q8h2sr9pm6"; + rev = "b0d25f47c3b50ccb4dbb26945f5e19d535701187"; + sha256 = "1l96lg8qz6givg9l78bgdlxxnjj7nf9lz7c5s7clrvwcya1hhypq"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1949,12 +1949,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2025-10-25"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8c4125e3c746976ba025dc5d908fa22c6aa09486"; - sha256 = "0gfsia8p9si1wh3430rl5pklw48c0h3zmx6q5bkvm1ajidndfgrp"; + rev = "234fc048de931a0e42ebcad675bf6559d75e23df"; + sha256 = "0m6lg9fifx6izj6572jp0a5klmdly019hg2parvlqfyxwlksxlsq"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -3028,12 +3028,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-10-27"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "547b38eb42176194b326fdaa871685ec11d84c1d"; - sha256 = "01ppa31ksfgwgx68xbm672xrzc7cihhvdjff1f31bb7cwy36q3v3"; + rev = "2af9b441cb55ec4e2c54dace3f5fa8d581f2c884"; + sha256 = "0zqx11054x5rrkjdwd5dzg00xjs9xhwbjf2qp7v6zy8nvy9hxscq"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -3106,12 +3106,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-10-30"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "50ea30ec76e1a2695164991a7480f0fa0662e9db"; - sha256 = "13dsgrwk6m9l35idcd5j6q0si6451yy66psr4wi97dzhw8lvfc41"; + rev = "3e02000a14847aa49a90c297633d4be2f03702bc"; + sha256 = "13bi04ryra8inzfaagh1l0vyh2x5zmxwxnww4pmax29z8cw7887j"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3431,12 +3431,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-10-22"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081"; - sha256 = "1igspxqkqqv9f1fqh0sf6dlap1p8an8jl167a93v33c8ig2h6if9"; + rev = "cde4da5c1083d3527776fee69536107d98dae6c9"; + sha256 = "0109c6y5kfckys2ikn6lv1m5zkmv7f4jy0l64nw3gr1wja1zr5vl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3445,12 +3445,12 @@ final: prev: { conjure = buildVimPlugin { pname = "conjure"; - version = "2025-10-24"; + version = "2025-11-02"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "c5da84f291ec7d9f9f6e449c8aeb28b4c2d01562"; - sha256 = "0cchd39g2hym8kmnrxqka84aj8cvhpv5x5syfysnirrkww8s6d9z"; + rev = "dab027e0cb710beb070424a117b9065279f6083d"; + sha256 = "0ra30mszsp4w128066isqxc4glc587gyd5sz76v0p0yh21l1kg9c"; }; meta.homepage = "https://github.com/Olical/conjure/"; meta.hydraPlatforms = [ ]; @@ -3523,12 +3523,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-10-27"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "93adf9844dcbe09a37e7a72eaa286d33d38bf628"; - sha256 = "1b741nmj241ixqc3rik0w1d8mdgqy1q73vr8pblqcz5937dr8j1a"; + rev = "5bde2cfe01f049f522eeb8b52c5c723407db8bdf"; + sha256 = "09dwpn5siysyi86v49y9rb9sk3ghg9l4ws280wwd8r91j82xmipz"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3536,12 +3536,12 @@ final: prev: { copilot-lualine = buildVimPlugin { pname = "copilot-lualine"; - version = "2025-04-05"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "AndreM222"; repo = "copilot-lualine"; - rev = "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333"; - sha256 = "06kshzfzn3av27a1wrgaq93l6vz46a8084dd03addi2zw0rphaqn"; + rev = "222e90bd8dcdf16ca1efc4e784416afb5f011c31"; + sha256 = "0ngq7k2l31xinf5pza92ir472qyfja6yia216m9v7dhsvhynm0qx"; }; meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; meta.hydraPlatforms = [ ]; @@ -3627,12 +3627,12 @@ final: prev: { cornelis = buildVimPlugin { pname = "cornelis"; - version = "2025-10-28"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "agda"; repo = "cornelis"; - rev = "d18cb7c13c73f429a80536dc4c4f96eed2ffb51b"; - sha256 = "1lz3jzdzklhjx50z38vwz8ihhy38vwcxazvm1rx50z3adpwiw5mh"; + rev = "8f7bdfe1a05dd3a310a9af3325bd4da2c78b567b"; + sha256 = "1km6vni134pqh9izmqpdjs9wnff5k1fwbhy654ggnhsd7q9yjbqw"; }; meta.homepage = "https://github.com/agda/cornelis/"; meta.hydraPlatforms = [ ]; @@ -3887,12 +3887,12 @@ final: prev: { dart-nvim = buildVimPlugin { pname = "dart.nvim"; - version = "2025-10-23"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "iofq"; repo = "dart.nvim"; - rev = "71421e7ef5aee8267e24dc562fdd07a83bda192e"; - sha256 = "1jny6xq5ami3msa8b22hp7yrraljwg7vfkwj7rps8j7whrdxkfjh"; + rev = "8822aabbfef95eda2b22a8f7ee08912c762ef941"; + sha256 = "1rmh2ql1xx4s212mcmmgv63abagl2z20k2njin9c7y5kcdppcdh0"; }; meta.homepage = "https://github.com/iofq/dart.nvim/"; meta.hydraPlatforms = [ ]; @@ -4069,12 +4069,12 @@ final: prev: { debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2025-10-13"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "ece265d9a65b55511cce3aaa5e46f39d58b4340e"; - sha256 = "19aqfv3hgbkxjv8rcc70bkrdh0pnd8myvsm7dcym1v6dgi4lzbl1"; + rev = "6b21243add2195e0918e062d6be86ad1d01e6d66"; + sha256 = "0pvyhgw520843lz5gmi1z1lc7lzs621wpzlxs8mn8qr8nq0djz0w"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; meta.hydraPlatforms = [ ]; @@ -4656,12 +4656,12 @@ final: prev: { dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2025-09-08"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "041d923368d540a1e438989ce8f915628081a56a"; - sha256 = "0bl6hggv01pg5970nsi0vaf23mb46xzpjrkasi7134465lh0m1m3"; + rev = "ae752c13e95fb7c5f58da4b5123cb804ea7568ee"; + sha256 = "1bq0v2bf0wxz7l59rqr8n3mdg5sr7hh6zlddpm5p457qmrs90ic7"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; meta.hydraPlatforms = [ ]; @@ -4721,12 +4721,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-10-22"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "97cf26a039a10f53bb5474ba7bf32fbc67eac592"; - sha256 = "1w9c595nhrdk5pxd510r0wrjzvnh68jj3i1r78v362llwm44j37q"; + rev = "e9cf21828228b30bc3c59957c0a1e7898d473767"; + sha256 = "1nx1ciz5ig9l8dw3dzgs4awlszlwi31ab91ikywjblm2xh7ymb0m"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4760,12 +4760,12 @@ final: prev: { edge = buildVimPlugin { pname = "edge"; - version = "2025-09-22"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "dfb013e84e8b8302d99ed75e664ccb2a05925ad3"; - sha256 = "0hvyag79pqi52qiw0zxan9psc26ycmlbnxw6qr2v8mpzi666bgzq"; + rev = "4145071bb0ea909511fa9a444eec80367b11296f"; + sha256 = "09d64sbjsbl6lb42glni789scggz6h0smy7jm5rpq1h23k0iarsf"; }; meta.homepage = "https://github.com/sainnhe/edge/"; meta.hydraPlatforms = [ ]; @@ -4812,12 +4812,12 @@ final: prev: { editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2025-04-21"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8"; - sha256 = "1rsifgfdfjs6pmbvl6631xizsrdm1vv8vx63ak8q4rkdwxrc8vnv"; + rev = "13b86c5c691785ffbf2d6508c621dabb08e93df0"; + sha256 = "020i94wrdmjqfzkkrgmcs0626n65jbylg5kyz14llr108v3yxa4j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -4826,12 +4826,12 @@ final: prev: { efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2025-10-08"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "9f82d2fe9919cd0c45c25d20c86c7728d3e162d3"; - sha256 = "04733hb67kq99nq3xlni2pkdrlijw63fx36v559vs2i8majzxcpk"; + rev = "11cc7a346f86b587a42a0348b41aa7c143e4ba1b"; + sha256 = "1a740iqsc7l0cncg923g4h24lcg6rxziznx7yfzbczfgi9cqq9bw"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; meta.hydraPlatforms = [ ]; @@ -4957,12 +4957,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "2025-10-27"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "0909c23a2b8cbc337cffe91fda36381747e88506"; - sha256 = "1m0mhqqmcicpyfmxzp57c7b7pcfm8vxy8iymsfq629xkdf2lqbqj"; + rev = "17f101d7de851a7d3d705c22bc7c1760bce3cf6e"; + sha256 = "03qwxhpx895vipqq6j85xp0j1il6xbsl9pvyn96x3yqmpyw1s7dc"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -5648,12 +5648,12 @@ final: prev: { git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2025-10-13"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "54da04264ec5313d602aebea7c5dc90141696ad7"; - sha256 = "12b33k9nm5kyy50lwrqm3yfdx5hy89vayi7f303fi0kwasaaxw32"; + rev = "5c536e2d4134d064aa3f41575280bc8a2a0e03d7"; + sha256 = "1gd7l3qirq6s4y6bsgmsbbp48rlm1vx9afqj1kjmaa2m9jr5g9hh"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; meta.hydraPlatforms = [ ]; @@ -5817,12 +5817,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-10-26"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "eb92453bc049c156290ed402f90f74090aa86363"; - sha256 = "194xwv39i0ml4400pc7j5wy613vfa33jfgaz6633wqd2xy4jf6ih"; + rev = "81bb94c1d21648245eb14c69461f5c7f8c705752"; + sha256 = "04xqsp0xp941yrskbdw3l003b9l81ar1c3vfjp0xbpwp6sgnz7as"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5999,12 +5999,12 @@ final: prev: { gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2025-09-22"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "834dbf21836862300ced7444db4262b796330ab7"; - sha256 = "0vlf94j9ijynvxyp0my2s9zz00c56cq4dp9039bcm6d059dkz3hf"; + rev = "4bfc6983abc249c5943a60d8eb3980a3c2ababe1"; + sha256 = "1s9kh1d8hbmdwsclb098lcr0rh5cj24wb5yrv217idn3bxypxf7z"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; meta.hydraPlatforms = [ ]; @@ -6051,12 +6051,12 @@ final: prev: { guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2025-10-11"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "5fd971c4a4d6112f14dc4024a6abf1db82b63c7b"; - sha256 = "1g6l0yyhplav607ryyql0760crvdgzg5pzy26dbjijz99c5a8k6x"; + rev = "8c1f379640628ccb119cf77e0c7950dd222aaf79"; + sha256 = "196fm6v41mgxasyqkj3q1jrw0iwl30l138cvfzbm5wrd6rignnws"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; meta.hydraPlatforms = [ ]; @@ -6156,12 +6156,12 @@ final: prev: { harpoon2 = buildVimPlugin { pname = "harpoon2"; - version = "2025-02-10"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "ed1f853847ffd04b2b61c314865665e1dadf22c7"; - sha256 = "1dcpdlna2lff9dlsh6i4v16qmn5r9279wdvn0ry3xg4abqwnzc9g"; + rev = "87b1a3506211538f460786c23f98ec63ad9af4e5"; + sha256 = "1d6fbqs1813nyarw3a4lckw746szw9sbxn9kch6lnxk5qxa8y159"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; meta.hydraPlatforms = [ ]; @@ -6273,12 +6273,12 @@ final: prev: { helm-ls-nvim = buildVimPlugin { pname = "helm-ls.nvim"; - version = "2025-10-26"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "qvalentin"; repo = "helm-ls.nvim"; - rev = "142777b0ad47f0b007051b187602fad13f00557f"; - sha256 = "1c8lmq8gqv0zpw8a4bbbb3jpwk481a16hanav4yw88jnlvq3bm14"; + rev = "d6f3a8d4ad59b4f54cd734267dfb5411679ea608"; + sha256 = "0hkb7mhm4dvs0x151193hvr69k1czsk7l0zbv0x2pr15rrmm3lsv"; }; meta.homepage = "https://github.com/qvalentin/helm-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -6638,12 +6638,12 @@ final: prev: { inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2025-09-28"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "7c79416330364976955ec8059fe3832b72ee1271"; - sha256 = "1n64wf9c9bqi5lh76kv9a6ziv5i9p812mj5k8kg73i5c4z68www5"; + rev = "2597bccb57d1b570fbdbd4adf88b955f7ade715b"; + sha256 = "014hbrqwjlb5ij4ifgpbj6znp657k81yf7ws11hss5h3rx67m012"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; meta.hydraPlatforms = [ ]; @@ -6977,12 +6977,12 @@ final: prev: { jule-nvim = buildVimPlugin { pname = "jule.nvim"; - version = "2025-10-30"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "julelang"; repo = "jule.nvim"; - rev = "6c0b4ffed1c610d76bacaa91fdb09b501df5dada"; - sha256 = "1p68k55mbps2s3f0k5dbw2a6c0f7jfg57kvx3gzdmp0lc1ph10if"; + rev = "bf12f77901595b4ceea5de96e1aad6c353057411"; + sha256 = "1ap5hkbxqiwbdkpcgf9hymgcx0zcy9irz0i4m3lx2827614ab12k"; }; meta.homepage = "https://github.com/julelang/jule.nvim/"; meta.hydraPlatforms = [ ]; @@ -7029,12 +7029,12 @@ final: prev: { kanagawa-paper-nvim = buildVimPlugin { pname = "kanagawa-paper.nvim"; - version = "2025-10-30"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "thesimonho"; repo = "kanagawa-paper.nvim"; - rev = "f8d7de5293b6cb1ee0fb7833d10e277beae4966a"; - sha256 = "0axbw3ngkdnclj344v0zdrvr8nd08xnwzsqywdpk5pii3khfkscb"; + rev = "8423e164a0fd2d1117a2e18c229cfd9e0635c82d"; + sha256 = "1zvg0sfq4prfwnczvizsl00qpipjhwi970q45ry9w3j02blv042i"; }; meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; meta.hydraPlatforms = [ ]; @@ -7042,12 +7042,12 @@ final: prev: { kanso-nvim = buildVimPlugin { pname = "kanso.nvim"; - version = "2025-10-17"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "webhooked"; repo = "kanso.nvim"; - rev = "c2525ebafa73c1860301716d9a17e3f07f5038b8"; - sha256 = "1ymqyvfmv4yicz8kscc7gk0rpw16amy28b6f0j1fi6r6gf0d8rd7"; + rev = "81041940f469fba3c9eb6efe32eb3174281806df"; + sha256 = "1vcmglqp5h202g81d83qlmzy6n76ml38qx06y6ifmmkvgq1g6070"; }; meta.homepage = "https://github.com/webhooked/kanso.nvim/"; meta.hydraPlatforms = [ ]; @@ -7159,12 +7159,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-10-25"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "9a9308b664f71159f1c150e8cfb18541b143a9e9"; - sha256 = "1vjyaav4cv89c5kr35x37fdd0avh2sy3kdvpg7lw226977iy0nvz"; + rev = "c328aeb219c4b77106917dd2698c90ea9657281b"; + sha256 = "1hzy2mvvlh5gmya88inymsjxm7n52siaz3cg9jjn130jhr76mmsg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; @@ -7251,12 +7251,12 @@ final: prev: { lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2025-10-28"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "f0f5bbb9e5bfae5e6468f9359ffea3d151418176"; - sha256 = "08ki2mi4p1wdlkynapx8zrm36m7akvxybxxk7mg69ihdrkcrg6w1"; + rev = "85c7ff3711b730b4030d03144f6db6375044ae82"; + sha256 = "0hyh2dwh2ca7nf48cjsyrmbrnr1xyq530dsl4j6gl0fkg3i397l7"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; meta.hydraPlatforms = [ ]; @@ -7264,12 +7264,12 @@ final: prev: { lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2025-10-30"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "faf46237f0df43a29e12abd143ff1a0bbac27b7e"; - sha256 = "0xjsxpc4dilprms34yzkh845rd4fnlsirp5434xzi6yjrp1h4lax"; + rev = "5231c62aa83c2f8dc8e7ba957aa77098cda1257d"; + sha256 = "1sqy17m8lv4c1slpwyc7hnlp5iiqd0dav6r96szcyvbpahn4y3fn"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; meta.hydraPlatforms = [ ]; @@ -7316,12 +7316,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-10-30"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "4f2d243482fbf578db41c16f5c6b2dc34e0d1206"; - sha256 = "1jfqfsab8rly9rrn1wgg46qpk9m91caxkk0xjvm1hmwmg6qm4lbs"; + rev = "892a95683a8b037620235d330c6b83b9d617b332"; + sha256 = "1rql217zwx5x4651ascy3ywkq369km190jrz9ad54vs2vicaqyq0"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -7355,12 +7355,12 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-10-24"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "44e3a60a7a62069e5c9445b7a8104612d4f060cb"; - sha256 = "0g9r5356p8azann21i2bxx7p6h63k4lnk9vwlip8j9psw9mgmr7s"; + rev = "673517c316a0808a2f6948ed863e18c6cc03da21"; + sha256 = "1zsr8c9zkbrb5gikijq0ag0496rpj4win5bdjizm8d73p1hfrrxc"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7888,12 +7888,12 @@ final: prev: { lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2025-07-31"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "62cadce83aaceed677ffe7a2d6a57141af7131ea"; - sha256 = "131l83vfaj5b1yrsscrlbgs7rxl5n77275c1mpfbvafyy59ypg8f"; + rev = "1e56259e00c70959a1b3fba908b8583722fb96bf"; + sha256 = "13zaqnjqfiq9vqan3sm8x7nqwr49nwbnxnfdyxy0smaf30cmhf3c"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; meta.hydraPlatforms = [ ]; @@ -7953,12 +7953,12 @@ final: prev: { ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2025-03-04"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "67dc3465af8d8caa49a00aaff066289a94eb753e"; - sha256 = "00l7snw6ji9zx1x99ck4js4n4mfi2spyzssfkwmf56q7w8h2v63b"; + rev = "49ea83c231139d98b7c9668c99e7b4591421b056"; + sha256 = "0kk1m74vwsx80vjyndg1c3xliqbdhmphgn87g70mx7yi0xxwncpl"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; meta.hydraPlatforms = [ ]; @@ -8070,12 +8070,12 @@ final: prev: { maple-nvim = buildVimPlugin { pname = "maple.nvim"; - version = "2025-08-02"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "forest-nvim"; repo = "maple.nvim"; - rev = "c9525e84852197784de0d0203e73b8cb433297ff"; - sha256 = "1idid6gv116yd8lrjzkyvhgw4lhd23gpaj326436mqndz7nwbaf9"; + rev = "6fce52a264005884003567fd75978a4503ba8386"; + sha256 = "0cpqf7a7cxf1xx62kxip0x7fzmsszzqymwr0087pj7n6ppwzb1f8"; }; meta.homepage = "https://github.com/forest-nvim/maple.nvim/"; meta.hydraPlatforms = [ ]; @@ -8148,12 +8148,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-10-14"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "c93ea99d96b4bfda5b7c7d0dfca9c26edf6e78f0"; - sha256 = "1h6yx5w464npnp205xwy73y82492ifqwkhzxhx9rb00qikxxvwqm"; + rev = "5529dc4af26bbf00bf4ddcac797f8116baf6571e"; + sha256 = "02rrrn1p71pcabfz4i9q59g295k69gxxm2clga2m4rdv92xjnzr7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -8162,12 +8162,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2025-10-29"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "3590d66effccc7376d8c3dbe45e8291f9fed2843"; - sha256 = "018hvw7amg33j6iffaj9yw6csscr1cgxg2i7irzwyd8h3gm2s5k8"; + rev = "d7b5feb6e769e995f7fcf44d92f49f811c51d10c"; + sha256 = "1249asya0kkrql0hw0zxdw8lkvm997kskwn3mk4vjj9vvsfpp903"; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -8175,12 +8175,12 @@ final: prev: { mason-null-ls-nvim = buildVimPlugin { pname = "mason-null-ls.nvim"; - version = "2024-04-09"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "jay-babu"; repo = "mason-null-ls.nvim"; - rev = "de19726de7260c68d94691afb057fa73d3cc53e7"; - sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys"; + rev = "8e7806acaa87fae64f0bfde25bb4b87c18bd19b4"; + sha256 = "0lsimv7w9317df3idifqkxcg3r3dl30l7d3nlvna17dcpjkc0m1s"; }; meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -8370,12 +8370,12 @@ final: prev: { mini-ai = buildVimPlugin { pname = "mini.ai"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.ai"; - rev = "11c57180bc9084089206e211ac7aa598bedc9673"; - sha256 = "1j5gh95m3i85w5ygzdsswhs8skdbr5qjxl2frwzzi8qmvipiiip1"; + rev = "0d3c9cf22e37b86b7a0dfbe7ef129ee7a5f4f93c"; + sha256 = "1sapda1s8ddkx54cd9f4fmyzq3k2p32wql20a8v67mm2gniaxbdg"; }; meta.homepage = "https://github.com/nvim-mini/mini.ai/"; meta.hydraPlatforms = [ ]; @@ -8383,12 +8383,12 @@ final: prev: { mini-align = buildVimPlugin { pname = "mini.align"; - version = "2025-10-12"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.align"; - rev = "f42eeb70232fbc4761f2d895a173b117bfd11541"; - sha256 = "1rqrx4bz4pwq25rz5h46fax0pp0ph31xjqz1ld3ncq4gi4mi6yx5"; + rev = "60c61c8c63dca41b5ac6bfc36b52df69b1a03e6b"; + sha256 = "1y8bkfl22h15jms5k4nphlyrpwxy8g61igxl2i2myxghwqag5rgb"; }; meta.homepage = "https://github.com/nvim-mini/mini.align/"; meta.hydraPlatforms = [ ]; @@ -8396,12 +8396,12 @@ final: prev: { mini-animate = buildVimPlugin { pname = "mini.animate"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.animate"; - rev = "8ce6df739aa9d14c876bace722af28c3d09e9971"; - sha256 = "1scq1r3v5k6qy2cgb8kzjp7xj86cq6ghji1wy42a6zqx85id4n0z"; + rev = "0365de8b69331c25d0d0d7573407a7dc7719e578"; + sha256 = "1c070l4mi8xj2cfx13z1p1qvc7gy0yizqq1yfn23widg8g9p8rzm"; }; meta.homepage = "https://github.com/nvim-mini/mini.animate/"; meta.hydraPlatforms = [ ]; @@ -8409,12 +8409,12 @@ final: prev: { mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2025-10-20"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.base16"; - rev = "2a462667a9f9b9a04da8a2a35eac7577426b38ee"; - sha256 = "1123vgb1avkr3fbxviw3c5ai2rgrfi7pzm38kvcj8db5xj0pxa7s"; + rev = "67638505e36a8ffe335655af2fe104138f60ab3d"; + sha256 = "0p9qy5f3j2vdnggfhfiz80ivr8bpkglsdip5hsk1q3m33y4x462x"; }; meta.homepage = "https://github.com/nvim-mini/mini.base16/"; meta.hydraPlatforms = [ ]; @@ -8422,12 +8422,12 @@ final: prev: { mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "2025-10-14"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.basics"; - rev = "131a4f91387dd490eb9d40b262129ca9fec5ff97"; - sha256 = "05wnbg8z0a118db1p76pn43z0d3a951vzx5dfk14zs204qcs6rss"; + rev = "862b940b1ea67993893c6fd39ca1000beed1af46"; + sha256 = "1ryl7ki67q2fphzrkxl8gpszsg7i8fqfvy6vrj82r2g152f66k8b"; }; meta.homepage = "https://github.com/nvim-mini/mini.basics/"; meta.hydraPlatforms = [ ]; @@ -8435,12 +8435,12 @@ final: prev: { mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.bracketed"; - rev = "0ea3cb6478e5fdeca33b53fd08683eb2e622f6ce"; - sha256 = "0k3gw4w891sck9hghhj8aw4pzv2ip4ch1xnga78ai17b6kj9askl"; + rev = "e50e3abcf6a3a5d234f58e4a247dfb3035f30a65"; + sha256 = "0fsjzkf35drizr5am30by3f9021pvcdbz2a5nv9q8i9nn2524fr5"; }; meta.homepage = "https://github.com/nvim-mini/mini.bracketed/"; meta.hydraPlatforms = [ ]; @@ -8448,12 +8448,12 @@ final: prev: { mini-bufremove = buildVimPlugin { pname = "mini.bufremove"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.bufremove"; - rev = "1b5d7e7bc81cd02476bdd964c3d850c48eb91a07"; - sha256 = "17g6m9cyfb2fhspyp43scxgp4kc5ylv1pfb23m1qljx25ysd0fp0"; + rev = "10857aa39160c127694151828914df3131ba83b6"; + sha256 = "12m9z1pzjgnpqi68rpa57sn95m0yj69mh0iy13w046r0pdcz0505"; }; meta.homepage = "https://github.com/nvim-mini/mini.bufremove/"; meta.hydraPlatforms = [ ]; @@ -8461,12 +8461,12 @@ final: prev: { mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.clue"; - rev = "6a42206a734befeb697da27afdf05f55ac2303fc"; - sha256 = "0n8l66nfiq3h61w5faqig5xqk0m48vdc2pg2n9maida8hqyyz0l0"; + rev = "e806253398f631c0c05a3cfe54fe479477ef9f4d"; + sha256 = "1hh8mmb3aarn67c409jhv9bfdwqhnmrdgayngwysn5d2px7mqjx1"; }; meta.homepage = "https://github.com/nvim-mini/mini.clue/"; meta.hydraPlatforms = [ ]; @@ -8474,12 +8474,12 @@ final: prev: { mini-colors = buildVimPlugin { pname = "mini.colors"; - version = "2025-10-20"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.colors"; - rev = "e0425ab4db1fb9b3059db89ab57e74d8ef0c2e52"; - sha256 = "1dn4f55vi94g9s2b11mg6in7vz38yq5xhhza6yp6ipms8abxb747"; + rev = "f43cab15ee0458acb13ac33a478b7e14fd4616eb"; + sha256 = "13qqkdhhb48agf5nlx6sqx3z7177q3pq9pdj99p89cf1z6kna9is"; }; meta.homepage = "https://github.com/nvim-mini/mini.colors/"; meta.hydraPlatforms = [ ]; @@ -8487,12 +8487,12 @@ final: prev: { mini-comment = buildVimPlugin { pname = "mini.comment"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.comment"; - rev = "c40bc46e72f41d3db265f6d86deb3dc259c0985d"; - sha256 = "0hray8c4w0q167yz9j5nnpfh30h2ka1wgb7jwhc8dbnn94fvvbai"; + rev = "a0c721115faff8d05505c0a12dab410084d9e536"; + sha256 = "1r5hcq48b6hycmanlkrdv96zkahrwjqjgxgam0a1p8nx75jg9apa"; }; meta.homepage = "https://github.com/nvim-mini/mini.comment/"; meta.hydraPlatforms = [ ]; @@ -8500,12 +8500,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-10-28"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.completion"; - rev = "2ab1c8078061a647b0867581a1dcedb046b9ce27"; - sha256 = "0gf5mfp0rafm534snd5np4zyqa3rk6d6izln3bzn9nqr370ba73d"; + rev = "581934b58ff25cec7f68a3dfee66c9d1c42faf8e"; + sha256 = "1spk0143n84l4382xc3ny6nw7qp9b6kdaj52svxzh82av0r030xy"; }; meta.homepage = "https://github.com/nvim-mini/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -8513,12 +8513,12 @@ final: prev: { mini-cursorword = buildVimPlugin { pname = "mini.cursorword"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.cursorword"; - rev = "d843392f739fcfd85969e2dadeb71c8e0221afb5"; - sha256 = "1d52mdq1pi841hkln9qiirpkyzp9r3z10ff3ahyicb5mrb7czybp"; + rev = "dda0f57d55bb1fa19423b7201b2ba892c7d2bb3c"; + sha256 = "1qaq0xcaz8fc7sv7qdrm55z989jp6w24wbcl7qvc3a1hmgwz88ap"; }; meta.homepage = "https://github.com/nvim-mini/mini.cursorword/"; meta.hydraPlatforms = [ ]; @@ -8526,12 +8526,12 @@ final: prev: { mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.deps"; - rev = "4c11a93f841e9bfb001321796dae339c8cb57e44"; - sha256 = "0z2sg6zbvwajap1ww3mm0r6l3wrcs8044dgmngndkn0h6pr8f3w6"; + rev = "8f6f74a8b68dbad02f1813dff4ddae5afeee92df"; + sha256 = "0qx879gxyq60wnn9kys7df54rzw0pwfhd2mamk4hswsn613hc65y"; }; meta.homepage = "https://github.com/nvim-mini/mini.deps/"; meta.hydraPlatforms = [ ]; @@ -8539,12 +8539,12 @@ final: prev: { mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "2025-10-24"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.diff"; - rev = "98fc732d5835eb7b6539f43534399b07b17f4e28"; - sha256 = "04xalxirbxwlxay6i4vqvva661lrw0q4lplgxyinn8nmrabfr996"; + rev = "fbb93ea1728e7c9d0944df8bd022a68402bd2e7e"; + sha256 = "0jrndrfxasdrq0avgc1cic28646vn68mq4zz1w8kcy8f7jn3bgw4"; }; meta.homepage = "https://github.com/nvim-mini/mini.diff/"; meta.hydraPlatforms = [ ]; @@ -8552,12 +8552,12 @@ final: prev: { mini-doc = buildVimPlugin { pname = "mini.doc"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.doc"; - rev = "16254b78d6cdb0e7c654b3d07dfed49a52df4ee0"; - sha256 = "1kafd3zcvqnx25py7k30rpdkwgk0dkxb1kjzf6yhssmszssb94ms"; + rev = "eb61bebe1d2b96835b1b67bb6e600cfc69ae4ad2"; + sha256 = "0fcwgyxi3y6j8apcqhbgf8sz983bmriv5vyhwj9ix6qzpridvwj0"; }; meta.homepage = "https://github.com/nvim-mini/mini.doc/"; meta.hydraPlatforms = [ ]; @@ -8565,12 +8565,12 @@ final: prev: { mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "2025-10-16"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.extra"; - rev = "188422c54ee770f14a634d9511e71e3b1e3686e2"; - sha256 = "0pd7vivz4s4l79vsypfgvy383wxj93606rszakh3q2hbpgry0gp0"; + rev = "7a5231ff48e715daad4fe94448de0639bc227fdb"; + sha256 = "0h40hawk4lfl9v80hkk458cbjlpjc68li95ikq7pccg0kdylgl2p"; }; meta.homepage = "https://github.com/nvim-mini/mini.extra/"; meta.hydraPlatforms = [ ]; @@ -8578,12 +8578,12 @@ final: prev: { mini-files = buildVimPlugin { pname = "mini.files"; - version = "2025-10-24"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.files"; - rev = "d5c1337441aff47768288e8562eb66ae8b5171a9"; - sha256 = "1fs75zshh1lkynm5wrs6y6g5c5wws8mibz1khvb7hh5v24gap383"; + rev = "dce9a4e4f14b3bf469e83c78aef393a090f4d057"; + sha256 = "1rmazylfy7j54ii3b6shrrd4g66r37hr2x0qdn670bhvrm3m6kg4"; }; meta.homepage = "https://github.com/nvim-mini/mini.files/"; meta.hydraPlatforms = [ ]; @@ -8591,12 +8591,12 @@ final: prev: { mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.fuzzy"; - rev = "b8af7f3633b3039b3f14db246dac2412fd1335f0"; - sha256 = "14kwh0f7s3b9j3cdcb2655rm9jvaklwrj1m77l2dzhgx3sd5rlla"; + rev = "18e9cc3d7406f44a145d074ad18b10e472509a18"; + sha256 = "0b5d80744gcjp6nyzidby569p8s6jy0vkk29lk9msq0flxyb1lgg"; }; meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/"; meta.hydraPlatforms = [ ]; @@ -8604,12 +8604,12 @@ final: prev: { mini-git = buildVimPlugin { pname = "mini-git"; - version = "2025-10-16"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini-git"; - rev = "dcb13b6852b93382aa5c42446ab09748778e4a77"; - sha256 = "07xcrcr2zr73qpvdqcdg9vi8blp00fnc2f1kacyygmhxbbx199hw"; + rev = "832467238636e3dfa1db76de929996b6668c35ef"; + sha256 = "1g59hk5y0p1mbmf8n279awiqm16c5bvl17082z71sk1faaq8z83r"; }; meta.homepage = "https://github.com/nvim-mini/mini-git/"; meta.hydraPlatforms = [ ]; @@ -8617,12 +8617,12 @@ final: prev: { mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "2025-10-03"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hipatterns"; - rev = "5629d5fba132b4ab0b3f0039549308421f65ff45"; - sha256 = "0wyibqfms98i1c02sssz4sva0kk9dlpv06lfpcghjy7jxvnajva6"; + rev = "add8d8abad602787377ec5d81f6b248605828e0f"; + sha256 = "0282zk18fnlhdl59d9hll67njpzd54h5cv9vvkgns35kw9h42jhn"; }; meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/"; meta.hydraPlatforms = [ ]; @@ -8630,12 +8630,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2025-10-23"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hues"; - rev = "902810225edbf68a76dbbdc6a03a54a540af380e"; - sha256 = "18nciyjx5qlfj7x2q63ynyz8c9b3g9c7i33apgldc13lia1ysgrf"; + rev = "83ad0612688241c5088fb1738a33a0503586d4be"; + sha256 = "1dhl6d25ia6mf6lzvq2v74a0lizsxvxic23536cxmb3ygqis150p"; }; meta.homepage = "https://github.com/nvim-mini/mini.hues/"; meta.hydraPlatforms = [ ]; @@ -8643,12 +8643,12 @@ final: prev: { mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.icons"; - rev = "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a"; - sha256 = "0k049j68sdbr41fy50ifyzy25nkb0brhbpwkf2w6iz0z4x4kqd4j"; + rev = "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428"; + sha256 = "0360yf87zq1zlnhhzxnnljh6c2q0s7h8a2c4bqi0k5k4j4fknyya"; }; meta.homepage = "https://github.com/nvim-mini/mini.icons/"; meta.hydraPlatforms = [ ]; @@ -8656,12 +8656,12 @@ final: prev: { mini-indentscope = buildVimPlugin { pname = "mini.indentscope"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.indentscope"; - rev = "e9fa0714fc753e1e737940577904e553ee340903"; - sha256 = "0bv1bxqnkfkhwqphqy6mg6lp5038l5p08ljzx2zji2gkdckp5xk8"; + rev = "0308f949f31769e509696af5d5f91cebb2159c69"; + sha256 = "0z22icdlxa4d3bnc57inafd49lmpn3g6qj3y5qbcgrr3n2086asa"; }; meta.homepage = "https://github.com/nvim-mini/mini.indentscope/"; meta.hydraPlatforms = [ ]; @@ -8669,12 +8669,12 @@ final: prev: { mini-jump = buildVimPlugin { pname = "mini.jump"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.jump"; - rev = "7574c48a707aedcf1ad428a9cdefb8fdf871a638"; - sha256 = "087g65xg1zcbzax9mx1dg4nf7n7gyj0rha1ib4idw1c7960pkmf4"; + rev = "99799e8ca33fe936b81a70b5ab9a081f8794c8a1"; + sha256 = "1ig56zibrqplicy2f7b189s1af5sx4pc10922n2j046dr6vdcslx"; }; meta.homepage = "https://github.com/nvim-mini/mini.jump/"; meta.hydraPlatforms = [ ]; @@ -8682,12 +8682,12 @@ final: prev: { mini-jump2d = buildVimPlugin { pname = "mini.jump2d"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.jump2d"; - rev = "5ff749990336e67195724d1dcddfea4e50057a19"; - sha256 = "0cqqhm905an8daxw5pfy3jlywaqh71b200sgjd2mrb3rlnpbfg06"; + rev = "7a089cb719adb7c2faa2a859038d69d58fcbee84"; + sha256 = "1bslcspciqhdrsfqadij61i00jgaxklbx6q6gsd9i90j2yw9cndd"; }; meta.homepage = "https://github.com/nvim-mini/mini.jump2d/"; meta.hydraPlatforms = [ ]; @@ -8695,12 +8695,12 @@ final: prev: { mini-keymap = buildVimPlugin { pname = "mini.keymap"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.keymap"; - rev = "8849b592ded4c1ca99fca681be955f532befc05e"; - sha256 = "1z400g6i71n6bcnza9y8i1fdkp08fk74npbq152ykhv6dd0p4c6i"; + rev = "9a1ee970f05b113b3ce9ee6f330fe862706b7e49"; + sha256 = "19b0rzbd7svwss0hwhh4bcqsswngkhp4xp182hw7fcvv3gqvqv1a"; }; meta.homepage = "https://github.com/nvim-mini/mini.keymap/"; meta.hydraPlatforms = [ ]; @@ -8708,12 +8708,12 @@ final: prev: { mini-map = buildVimPlugin { pname = "mini.map"; - version = "2025-10-10"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.map"; - rev = "70578281b12e4f4dce535c9b0faa8345a70ff2a9"; - sha256 = "08dy13nq2vsl9r322g6hlzl5v30qx088biqnhn4kxjwv8agz78c5"; + rev = "234eaf5cbcaee320d87e96465fbb534aa05b301e"; + sha256 = "10jhyi9jbw2b1wjxl6ab7xlcn37pkbkccy9pni7xbpxpbgwqjnr5"; }; meta.homepage = "https://github.com/nvim-mini/mini.map/"; meta.hydraPlatforms = [ ]; @@ -8721,12 +8721,12 @@ final: prev: { mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "2025-10-12"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.misc"; - rev = "165c34e43de9ae62cf8b72bd33bc90f4edde8e67"; - sha256 = "04ddxsa12b0r1q12gwpn2mkfbvjac90ny9wb3xsxkxnwqw09jhl4"; + rev = "61f29f871c34cbc221666384723e4523907323e3"; + sha256 = "1i12n7n11f0jhbc86scamnvvlgyh7z6cvrrw8ryihqb0rzzsbhr9"; }; meta.homepage = "https://github.com/nvim-mini/mini.misc/"; meta.hydraPlatforms = [ ]; @@ -8734,12 +8734,12 @@ final: prev: { mini-move = buildVimPlugin { pname = "mini.move"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.move"; - rev = "f33406ae7d95b931c6a0d3ba11e50983fe800afb"; - sha256 = "1gyqb5mg9xawz5y229psaw128iids33yizjh8wpff6ihnj1ymq18"; + rev = "4d214202d71e0a4066b6288176bbe88f268f9777"; + sha256 = "0hm9adfn4p3s4i97vqgpkbki6wz3r0g22l5mjyy0ffz8qdrdjvv5"; }; meta.homepage = "https://github.com/nvim-mini/mini.move/"; meta.hydraPlatforms = [ ]; @@ -8747,12 +8747,12 @@ final: prev: { mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.notify"; - rev = "7f3c4f05bb647bd2b8cb216c18db1768afe39ee0"; - sha256 = "0j7gilwgl7dqvq5mm25rz8m9frlnf0g4dmxhhydbaamcc8x54ciw"; + rev = "895630bc03d461609cbf64329203e7e007bb0db0"; + sha256 = "1r1395hpxscyhawxm7l1s8w7ijixficlqqicxh2m4xxqc5n09vv2"; }; meta.homepage = "https://github.com/nvim-mini/mini.notify/"; meta.hydraPlatforms = [ ]; @@ -8760,12 +8760,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-10-28"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "ee4a4a4abed25e3d108d985b0553c5271f2f71aa"; - sha256 = "1bg5fkramwrx1d247x827rpigpmf83asqwj7ijffrp80djp15lwk"; + rev = "42dbeaafb081a569b060b3b11101ca676a8f1193"; + sha256 = "0yiydhkiwa4iw1w7sxsddc484af30590rmz06kbc0nj8lg679fnb"; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8773,12 +8773,12 @@ final: prev: { mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.operators"; - rev = "1d0d1e1570e5bd22e6df3bcb068d0a2ac0d30710"; - sha256 = "1mcbx1pvf5cqbn6m2nav5qaydx0pjycmh6cwr247ws2rpl4y40a7"; + rev = "0670bfbfe492f630e37f240dbc31bdc652292e4e"; + sha256 = "1c5p7hvxbbyqwa5dmg53i3pzni3da1d53x492pk8kv7qzzq4fhm5"; }; meta.homepage = "https://github.com/nvim-mini/mini.operators/"; meta.hydraPlatforms = [ ]; @@ -8786,12 +8786,12 @@ final: prev: { mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.pairs"; - rev = "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9"; - sha256 = "01z80b55yg8sa1vfga8bq7jdl7glm93jxs8v390cyafshk4ajm98"; + rev = "b316e68f2d242d5bd010deaab645daa27ed86297"; + sha256 = "1x1a8z0r083mq529n4ryqa2s0vjzzjhmgl0j9l2ja3j09lwbv429"; }; meta.homepage = "https://github.com/nvim-mini/mini.pairs/"; meta.hydraPlatforms = [ ]; @@ -8799,12 +8799,12 @@ final: prev: { mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2025-10-20"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.pick"; - rev = "bb764a57b349ad3e8d5e7d8855b0c6104e2cc17c"; - sha256 = "1ar02impd4fc23psyz7aj73kzyxzd4zigw23ndnvg5syxi004awi"; + rev = "08a72201bd71d2ee2b2572e810cf09f0bc55a3cd"; + sha256 = "0gkxl63xgv59nr828mk0hzr8mh3dvjwfib7vm96fq8kkrs938i01"; }; meta.homepage = "https://github.com/nvim-mini/mini.pick/"; meta.hydraPlatforms = [ ]; @@ -8812,12 +8812,12 @@ final: prev: { mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.sessions"; - rev = "4ed3a6176e9f66915e4bf1ca66850e8c8073cfc2"; - sha256 = "0b6q4ggcpmf4bpsadz7272awwp2yw52gh4ldk1paxrhqrgc52sm8"; + rev = "6b69f4cf206ed8560669446a0310937d88e1c871"; + sha256 = "0v229a2c2gl3a9gjl0fmb8xl9h52y96rdbvfhjzq4g2i3wplmw5c"; }; meta.homepage = "https://github.com/nvim-mini/mini.sessions/"; meta.hydraPlatforms = [ ]; @@ -8825,12 +8825,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.snippets"; - rev = "7610dc3aaf7fb09b9cc428273a8ba15ef8aef495"; - sha256 = "1agh9b60l2my96zspzwi3xgssnz4g36w3m6nwbrs9q2q36gmazxz"; + rev = "66c041fb00ec007b7a7044751c7d3792d0e028a8"; + sha256 = "01iqls99by2s8nsm1l7hi075m1b5wz22vwl5c48wk6hdavd77acr"; }; meta.homepage = "https://github.com/nvim-mini/mini.snippets/"; meta.hydraPlatforms = [ ]; @@ -8838,12 +8838,12 @@ final: prev: { mini-splitjoin = buildVimPlugin { pname = "mini.splitjoin"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.splitjoin"; - rev = "b0d57bb5d1ed154e5902ae2745f1a320a7642443"; - sha256 = "1amhhmm4kh84pl24mvjwybr6vyq5v4pr5kl521rd7ppbz8ikispc"; + rev = "9fcd8856efb95a505090c3225726466494076127"; + sha256 = "11jvr6szgj8w86s8nv6ggc75h56va8xcrwxf7lwqm3nyvql3p0q9"; }; meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/"; meta.hydraPlatforms = [ ]; @@ -8851,12 +8851,12 @@ final: prev: { mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.starter"; - rev = "b43df0b0c66b14802e28d4761ed902704e3796e3"; - sha256 = "1c6x0nm6q4vx8vkm53gzfr01av0cy722g4zk88ma5rrr10ychzj1"; + rev = "8ee6ce6a4c9be47682516908557cc062c4d595a2"; + sha256 = "1nzs8x2v99fdi8mwy52qkzsrx4a562mpzhxmbygayvcsl11fngxd"; }; meta.homepage = "https://github.com/nvim-mini/mini.starter/"; meta.hydraPlatforms = [ ]; @@ -8864,12 +8864,12 @@ final: prev: { mini-statusline = buildVimPlugin { pname = "mini.statusline"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.statusline"; - rev = "faa39777ca729c6dafe86041207ba8db9321cb29"; - sha256 = "104wbg5cm4944j9axsq9wjwnhj01p6gd3z46v4hfmd2j672jppd7"; + rev = "14919901649d20d020e659c63c03baa75cd94f33"; + sha256 = "1sbh34s35cz7dyphh6ksk7sy8w7v43xrc8mrwjydbc6g805sw3jp"; }; meta.homepage = "https://github.com/nvim-mini/mini.statusline/"; meta.hydraPlatforms = [ ]; @@ -8877,12 +8877,12 @@ final: prev: { mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2025-10-28"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.surround"; - rev = "3c73e2a4d20f46f8bcb610020db2be5fde8319fb"; - sha256 = "1b5anbvi5v7qpfpxk0rmz29lhxjjf18g5kaiy84gkfamwvd2y747"; + rev = "88c52297ed3e69ecf9f8652837888ecc727a28ee"; + sha256 = "0w7f6g2gkb6c36kinml1qqvgrv72yyd1p8qk29zb6dlnahi3cgwq"; }; meta.homepage = "https://github.com/nvim-mini/mini.surround/"; meta.hydraPlatforms = [ ]; @@ -8890,12 +8890,12 @@ final: prev: { mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.tabline"; - rev = "40f0ec8ca166397a4f413d8396c56f5e01cc189c"; - sha256 = "0yj5fzrs3w2y3k4mdcikl8my37z4lh0qj84i2mnmplylnamch0yv"; + rev = "caf23615b9b99bacc79ecd60f61c4e6a8ec18c84"; + sha256 = "09spn1qh91i9mdjpw72rxs8vi02pmr7pl6chz07rvmydf96jsqsa"; }; meta.homepage = "https://github.com/nvim-mini/mini.tabline/"; meta.hydraPlatforms = [ ]; @@ -8903,12 +8903,12 @@ final: prev: { mini-trailspace = buildVimPlugin { pname = "mini.trailspace"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.trailspace"; - rev = "fab31f4955207cf84e28e7bed5cff35cccaf317f"; - sha256 = "0gsrsp1jh5zdpw6j773w7hg4qfxfs4vl8r14975cnfczkrgjf2np"; + rev = "f8083ca969e1b2098480c10f3c3c4d2ce3586680"; + sha256 = "16n3vxqzg1ywc199xmh4l2x75cyi52xad380picbr5q4l7dda36g"; }; meta.homepage = "https://github.com/nvim-mini/mini.trailspace/"; meta.hydraPlatforms = [ ]; @@ -8916,12 +8916,12 @@ final: prev: { mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2025-10-03"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.visits"; - rev = "4796c453678ca11f4aab68ab33f4d534a2d84e6d"; - sha256 = "0x0qrg3py0sj30ys9ffm33zh3f3f5zlckkydg7dhwbdqzcgla48y"; + rev = "f6b86565acc690aa111627433906be3d38e2ba81"; + sha256 = "1lnv5p8yd77n9z7ckrh2mgd10fn52y0hv4g9kha5fygpyfy64z19"; }; meta.homepage = "https://github.com/nvim-mini/mini.visits/"; meta.hydraPlatforms = [ ]; @@ -9033,12 +9033,12 @@ final: prev: { molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2025-09-20"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "c98f8c6d7a8a801b46e4766e000c574e0402c491"; - sha256 = "0ldxxmr9kkm7ih6ysgmb5razczf27sz4fjhg0pr5gmigywkf2vk8"; + rev = "4fd7be6a12b5efda5179db642f13bad60893acca"; + sha256 = "1x0lihygp6p03zps3mgs7s4jy6dvwjldyg4x2ggvjyrf0sdrgqzg"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; meta.hydraPlatforms = [ ]; @@ -9410,12 +9410,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-10-29"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "146408d801da2e9d917ca275f86b788fe612df85"; - sha256 = "0ggyd84qslf6jpzv952g92jls2k7m1xd1h1p6ijs49ia0qd8gynd"; + rev = "f3df514fff2bdd4318127c40470984137f87b62e"; + sha256 = "1yic7slj074qb3mwgv7cra8d70xcdrhizvyd9nszb0q0brg02c79"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -9436,12 +9436,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-10-31"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "d2400cd4ba2efe9b3dc4e4b2a76f5fd362b7a136"; - sha256 = "03kp8d4kb61jf6b4x1c6badqiv5qdj3l1i4fw4x5yiy8mr945vih"; + rev = "d66e4a13013cf68d7a3fdcdcf3d98d69b266e4f7"; + sha256 = "049garf306h03hy50c58dic51zq7lrzgjsi76rz524mr0pan2gb4"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -9514,12 +9514,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-10-23"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "c6d00913f802acedfb93c01267e89185f25800ca"; - sha256 = "03f440mc8d5q7clwjzrw8l3d71vsg8v4a47mf5k8kiacj0qbc5v5"; + rev = "d2a2ae4415872fbddb2441920ab109ee52fd4916"; + sha256 = "0ha5mz49gw5ck7ddb63raqg8874kavb82846lx66y0sw4y00wbl6"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -9776,12 +9776,12 @@ final: prev: { neotest-go = buildVimPlugin { pname = "neotest-go"; - version = "2024-05-19"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6"; - sha256 = "0wmxiv06zjjsr2fzp20p8lynn8wxqlx86r6zycan8v6kgs2vljh4"; + rev = "59b50505053f9c45a9febb79e11a56206c3e3901"; + sha256 = "0wl3xm7dq5mrin64h33lpq2yx0hiiwwkgxkvs49c1z14sz0c1nvf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; meta.hydraPlatforms = [ ]; @@ -9789,12 +9789,12 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-10-30"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "525325d904416eeea1be9140263b0991e7f7ec0c"; - sha256 = "0incbyxlnlh5msgyvpr0zzq7gcl7qlh6a0nyqj13kx167pmazh1k"; + rev = "2806bc07066a734d6ed94d45d2d2557a0e2195d8"; + sha256 = "044q6vpjm9hd6qxh3ynqmbr3vi4lr9crg21v2cby4fgcbyjs2jxd"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; meta.hydraPlatforms = [ ]; @@ -9829,12 +9829,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-10-26"; + version = "2025-11-02"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "122864eb2ceacf82a6354f3854443f2bcfca54d8"; - sha256 = "18w8dqsvynjccqbgf7vavhdayyhl5p8w4z8rnn9nz5n1xn88bdjq"; + rev = "1e93a6f35e6409751acf99c34461c1bd2b8edc57"; + sha256 = "1cnypjsbg5h66c7nqd7f6c2drkbm7i8hxs3rckhfzka28gmkgdxg"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -10193,12 +10193,12 @@ final: prev: { nfnl = buildVimPlugin { pname = "nfnl"; - version = "2025-10-24"; + version = "2025-11-02"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "d439796e6ef940cca8c535559a9d204476e51633"; - sha256 = "0bgxqla1ircwy95wqvil1h021xwrqym79qx1h3nrn8zxmkdk0jrl"; + rev = "fecf731e02bc51d88372c4f992fe1ef0c19c02ae"; + sha256 = "05223ynf2acvwqi6784b3dfvimdg5xxyqq1zd4l788ggafy1zil3"; }; meta.homepage = "https://github.com/Olical/nfnl/"; meta.hydraPlatforms = [ ]; @@ -10310,12 +10310,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-10-27"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "3e9ea1b897bb4419477bada535a7108bea76cf9c"; - sha256 = "1phz299jhq63wczr793j8f5jzc1p0ka5g4faxba951fwcks5ivmc"; + rev = "7d9a0496806cb206249eeb194b842865259d4e2c"; + sha256 = "0nqw5snbjabh8w4ks8mh1plwd58r943b5kmsylkf9q8jfbx9p6zv"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -10375,12 +10375,12 @@ final: prev: { noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2025-10-28"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "5099348591f7d3ba9e547b1e631c694c65bbe0b9"; - sha256 = "12c28is03zyz8ba3qa33mmf9g0r6nb7iavxfqidbd2l0bmyqg79x"; + rev = "7bfd942445fb63089b59f97ca487d605e715f155"; + sha256 = "02mc75dqn7h4ylgynpd9vsjx3y51rcys95l9ax1wiilgb4ay3b0l"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; meta.hydraPlatforms = [ ]; @@ -10388,12 +10388,12 @@ final: prev: { none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-10-14"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "a96172f673f720cd4f3572e1fcd08400ed3eb25d"; - sha256 = "1gsd8bdcghzpc0isdp0s1mny695ppp75ylq8v56d4h7my1bpb2d8"; + rev = "550197530c12b4838d685cf4e0d5eb4cca8d52c7"; + sha256 = "1cqxacz6mz52qqflzh1p4fw2pm7vgpnw200c3z1xi9ysrr0k2pb9"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -10492,12 +10492,12 @@ final: prev: { nvchad = buildVimPlugin { pname = "nvchad"; - version = "2025-09-20"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "f107fabe11ac8013dc3435ecd5382bee872b1584"; - sha256 = "0yaxwf1p1dkwagcbcag5hyrbam0gzsgla7wmk9w3cb9hy7l7iln2"; + rev = "eb209a4a82aecabe609d8206b865e00a760fb644"; + sha256 = "0acqyswcyw2606n4msk5anxqkzggqvsckvbkxdqdx562mqczyysz"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; meta.hydraPlatforms = [ ]; @@ -10661,12 +10661,12 @@ final: prev: { nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2025-08-13"; + version = "2025-11-02"; src = fetchFromGitHub { owner = "catgoose"; repo = "nvim-colorizer.lua"; - rev = "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2"; - sha256 = "1gxjpdm4i4bylx9wlp1ldbs8sskjz79pfysk7avy8zbk7d2mwman"; + rev = "81e676d3203c9eb6e4c0ccf1eba1679296ef923f"; + sha256 = "0pm1bmsbcqz4q3238fhggxdlwbaqj4bbsf2pg6r10qpbc6381xnm"; }; meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/"; meta.hydraPlatforms = [ ]; @@ -10739,12 +10739,12 @@ final: prev: { nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-10-15"; + version = "2025-10-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6782b097af2417a4c3e33849b0a26ae2188bd7ea"; - sha256 = "0wacs8hzwwdapfj9qqvkqm8mrc93gdlbxqsysbkjjf77j51g9snn"; + rev = "e97dc47e134ffb33da008658fecfae8f8547c528"; + sha256 = "1prkp8p1kkzgsrs5pwj4xbcdj3ncfhalhp5q332vci4qlk8qyb6a"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -10843,12 +10843,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "2025-10-31"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "8f50aca151fb6f539ebc9e0ded9fa05b1f8cb69f"; - sha256 = "00pamp59csgy8m3amwvydqlkbir5lq7z5cv29c11p2n4z2r6pz56"; + rev = "170560c18866c0ecd7ba290d9246cae42ddee906"; + sha256 = "0cmrrdj9hbg97ysfyd6kh8v2cn19vq90rn09m1w7pqfrpal2bk2m"; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -10947,12 +10947,12 @@ final: prev: { nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2025-01-21"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "cf00140361cabcd4e55a987fd9770a92ee682301"; - sha256 = "1y4m3m27bkzyjx8g2zd1ampgm84c2f10a7sd4v5qpirf9xiqhhqb"; + rev = "4170767cbd43e3f4af2a160f2980fff5cd6ee962"; + sha256 = "0xq5ci8bnr82a51brki1abifjc4ygwpm2mdy29mm7lsdzrjdv7bd"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; meta.hydraPlatforms = [ ]; @@ -11129,12 +11129,12 @@ final: prev: { nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-10-08"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "380ac148f989e1291aac002dc959ecc68c5243d0"; - sha256 = "0kyrzxgzvf9y8imkrfnvzympfqm04xqsclmkz4adfgb64s5b3m0q"; + rev = "38d265ee4d45da73a083ca83e41de7d37567be5c"; + sha256 = "0g7vagxilq1fygrc62zashdkv25aask1akpm2rvmdkga6gpf4dki"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.hydraPlatforms = [ ]; @@ -11194,12 +11194,12 @@ final: prev: { nvim-lightline-lsp = buildVimPlugin { pname = "nvim-lightline-lsp"; - version = "2022-05-30"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "josa42"; repo = "nvim-lightline-lsp"; - rev = "0fe34eed830b223770111c6333fe48d9fca158d5"; - sha256 = "08qxyr998d7zwnk0czfq4hif0q801fm2ijpbwql32kd6a62bnhjf"; + rev = "7fa5e1a89932e3da3ca68a0825e304ba43438ad1"; + sha256 = "1fvfmhv796ilciwh82k3hwbqvrkld887pdjrz5qhhg416075nl97"; }; meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; meta.hydraPlatforms = [ ]; @@ -11220,12 +11220,12 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-10-07"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "9da1fb942dd0668d5182f9c8dee801b9c190e2bb"; - sha256 = "0lkfhkld811gqki3bbcl1s1f22a3bdi7gp97q1pjlymia391flf1"; + rev = "8b349e822a36e9480aed96c6dd2f757f80524a35"; + sha256 = "0g1g6ry3h2xn5ps5kvjgzar3cipgy4l0yfjcpk85b86f4x69662d"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -11272,12 +11272,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-10-31"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e25994a1c2373784364852cd904cb39b6d75f227"; - sha256 = "18s6ngglynajysmvp0975lnbhavd1dckj87g0hyzbydrj73f401m"; + rev = "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0"; + sha256 = "1lb85magzq9kghp9xkcxr0lnz975qkfvczk5i4d1q2i7yxzfns9l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -11688,12 +11688,12 @@ final: prev: { nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2025-10-13"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "a7705d7233ac3c47f7a1e80172bbeaa11f1c722f"; - sha256 = "1vx53qg4p2cj7hw2yxg60w018m4v7gibgdwhng5dici2nyfy49lj"; + rev = "80fdcc53e236b23f2c71d628ea5121e6d782f898"; + sha256 = "0xqlsivw49aki1ymy6jc6yar4kw8rs8wb45p7kmlvs3wn86akjbp"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; meta.hydraPlatforms = [ ]; @@ -11961,12 +11961,12 @@ final: prev: { nvim-unity = buildVimPlugin { pname = "nvim-unity"; - version = "2025-10-29"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "apyra"; repo = "nvim-unity"; - rev = "0305a5f21917ddf40d89a9467d8c153cf5cc82fa"; - sha256 = "13g95p2nqs4wpg3201077rm9bhq1mdg43fx8621qw7svkw9f8gyi"; + rev = "624b0532bc6971c06eb9ba162c7afef29bb6e87a"; + sha256 = "1gjmcbn7vk2j4r79mvdqw8c9p8fq86chr8vlf3x0nfjy6cr46wiy"; }; meta.homepage = "https://github.com/apyra/nvim-unity/"; meta.hydraPlatforms = [ ]; @@ -12130,12 +12130,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2025-10-24"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "1a1a475846a4cfa3cfedde1c59141d99b6212951"; - sha256 = "1ianli3dqpgwiyfhbfxs866bxsqn4m0c09nd4s3048sj6ay6g6pj"; + rev = "fcb33fb2ffccc8107b3d5ebbf93df4e0824ac8ce"; + sha256 = "0cf9bibysjz14i990iqkzwb6zzf23z4pi6y37qxqb4xd9mxsa7x7"; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -12169,12 +12169,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-10-30"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "4be7903a962875a47422110d0e9ff3e475db1d27"; - sha256 = "0d4mzs4by6nzd3hr8hw513gpmvs387zzz9vs8amdydf9crplkf9f"; + rev = "13ba3e8651ee02c52cb3e60ce78aff68acec97ea"; + sha256 = "1av3z2n1w8p7pwp8c5dmpk02s8bk7l1k9zjbl1ik7s9j6ndpnvv8"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -12208,12 +12208,12 @@ final: prev: { oklch-color-picker-nvim = buildVimPlugin { pname = "oklch-color-picker.nvim"; - version = "2025-10-04"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "eero-lehtinen"; repo = "oklch-color-picker.nvim"; - rev = "da958405624e31336cc76ca0075f4a255e6c448a"; - sha256 = "1x20bxdqyiygscxkn65vninai6p3pnr7q5cajps070kdjywg4gdn"; + rev = "5ecc00741f6b7159af2d468c14e87a17715ab4c4"; + sha256 = "1g4akgw13d17akd9xdmv9908l6j80w5idqd7621adfxmfa2h3cv7"; }; meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/"; meta.hydraPlatforms = [ ]; @@ -12286,12 +12286,12 @@ final: prev: { onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2025-07-30"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "de495fabe171d48aed5525f002d14414efcecbb2"; - sha256 = "1qci3rslcmv79fsfq21vjad6zmk6qp59z1g531w2k85psj6hlz41"; + rev = "918e89e6993b2901eea47b9f4eb666d53c2542a6"; + sha256 = "164a8qamldk098x28wq8z87vkg3m6gi8pscvn3ccbyf9b5rplr07"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; meta.hydraPlatforms = [ ]; @@ -12390,12 +12390,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "2025-10-29"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "NickvanDyke"; repo = "opencode.nvim"; - rev = "c7594f8727541ca5ca3b44aa4796b8ffcb0d1bad"; - sha256 = "0kc1bc39gp1d70va97270b1dp2brgnxb9j5g8qdan2mr51dhnzxs"; + rev = "87cda19e743c0475f94bb5970dfe0d2816792c68"; + sha256 = "03izfimswsdy5g7qlx3s0g25yn3yashnmz73a2miiz0r03645p6f"; }; meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/"; meta.hydraPlatforms = [ ]; @@ -12429,12 +12429,12 @@ final: prev: { org-roam-nvim = buildVimPlugin { pname = "org-roam.nvim"; - version = "2025-09-19"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "org-roam.nvim"; - rev = "946c3289d8aa5a84b84458b8c9aa869c2a10f836"; - sha256 = "0jzlvlbaas4kb1ii0d7yr842awk1sv1i9jy997s2nd26vd9rk61w"; + rev = "57ebbd05ef143b0ad09e6fae3cd3b8b584b3e5a6"; + sha256 = "04z86r6v0qg5jj1swrjki6bn8cnd2yfmxfj8b6hzs1xm5hhzjn69"; }; meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/"; meta.hydraPlatforms = [ ]; @@ -12612,12 +12612,12 @@ final: prev: { parrot-nvim = buildVimPlugin { pname = "parrot.nvim"; - version = "2025-10-10"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "frankroeder"; repo = "parrot.nvim"; - rev = "e527fe9a89a3e958fbab9eac8ec9d52ca56bafcd"; - sha256 = "1wl5rvsl7g0y4hy8fk1z1q512f4j5s7bp3x8c1ryw1hdv4276l0f"; + rev = "ccb35e9fea98c1cc14ef5f8e8d0829bfbd1c103e"; + sha256 = "0hmhkksmw0n7823r8ammymcqjnxj2cnjjlhjdrsbpxsnaz9mk9ka"; }; meta.homepage = "https://github.com/frankroeder/parrot.nvim/"; meta.hydraPlatforms = [ ]; @@ -12990,12 +12990,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "2025-10-30"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "06b363b62587279dad7ab9365bc24f2f4d5b71ac"; - sha256 = "0hw87j44j3vrx5irb3q3k2008if0ivmzhw0ihnkl8lyplxlan615"; + rev = "deaec4c3606ade11f6ae89b4e9576065b3140d0e"; + sha256 = "00iml75wgf05iy9cc8arxcsbbdzq218ryg23xkpf2x7jdc3810sm"; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -13420,12 +13420,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-10-28"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "10126effbafb74541b69219711dfb2c631e7ebf8"; - sha256 = "02la4cclxsaz7fqf805v7kz089vrgpc91fzn1sr9j27cgh3jsn4g"; + rev = "060c911c62f995a9db4467dde6fafd699cf94d55"; + sha256 = "195gj8saaqb2mw8qnry9cix8wn34bkz8ifvwfa2lzp9f1mzb6ri7"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -13459,12 +13459,12 @@ final: prev: { resession-nvim = buildVimPlugin { pname = "resession.nvim"; - version = "2025-06-01"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "resession.nvim"; - rev = "84c81e5fd8a94dc85a60b97089536174e558e288"; - sha256 = "1jhv172izp772fn07lf4a80kcd7sj2j5cq763h0xaafb4h03kjax"; + rev = "05adc14db5c2d0eae064765101dd5e9c594c7851"; + sha256 = "01r4bjvkl2bsi1rcrnk3y7k57jxy3giq908jja8yf4nn0hzvfrpd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/resession.nvim/"; @@ -13538,12 +13538,12 @@ final: prev: { rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2025-08-24"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "72a04c4065345b51b56aed4859ea1d884f734097"; - sha256 = "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8"; + rev = "eb3ff49a4f2b4e8b06d27de529e44fa52a60ab8a"; + sha256 = "110q4l61alp7jq8mv0zpcj655f04lkv6753f59rj4qdydrlgwi5z"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; meta.hydraPlatforms = [ ]; @@ -13876,12 +13876,12 @@ final: prev: { sidekick-nvim = buildVimPlugin { pname = "sidekick.nvim"; - version = "2025-10-30"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "folke"; repo = "sidekick.nvim"; - rev = "317ada137f2b34cccc872b68f0a29d987cbce438"; - sha256 = "0bh948g2ggm6ic9n4b5m939hfxy8qw23i8mxywcricg673nvf7qr"; + rev = "c2bdf8cfcd87a6be5f8b84322c1b5052e78e302e"; + sha256 = "00vhdr01v1kak20z8vq4yf70p0w0m4knhiw1cri8az8a4wn8h6q0"; }; meta.homepage = "https://github.com/folke/sidekick.nvim/"; meta.hydraPlatforms = [ ]; @@ -13955,12 +13955,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-10-24"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "6c7c64b6e1be6eb95fd9583c0969e0df625c6cd6"; - sha256 = "10bphggh0n9x81cc9yi33a2h0bb4vzxjmjkd7aw6l42sfgc1zvvd"; + rev = "1611946e397a8b42807a9ad527088bf7ebc9ce33"; + sha256 = "1k5nppad6f3rbl26c4p48zl0xxxryw5ykx44s11b86z9hf478wgg"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -14020,12 +14020,12 @@ final: prev: { snacks-nvim = buildVimPlugin { pname = "snacks.nvim"; - version = "2025-10-30"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "folke"; repo = "snacks.nvim"; - rev = "0bc7c2631a3bb35a20e0e5938401765bb9516496"; - sha256 = "1avi0za8r7bfvadcsx71wsjchbxd8rparhjnk85s4p73wvindwrg"; + rev = "9a15b317495cda991d3b4990f18aed47a9a9a891"; + sha256 = "0m2aj9lqz88r93gyn5gchaarpxfkwwnnfbf0x4d79icl9gcv9ivv"; }; meta.homepage = "https://github.com/folke/snacks.nvim/"; meta.hydraPlatforms = [ ]; @@ -14098,12 +14098,12 @@ final: prev: { sonokai = buildVimPlugin { pname = "sonokai"; - version = "2025-10-19"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "48c809c887ce7b7828f7ea27408fc2ef2179efb5"; - sha256 = "104x2gl2d57sy91pkmzywpay5b9k9xqcssf04l9jfzsqm4vmmkpa"; + rev = "ec07018013b4683cf33f80ee4bdf3eca2621da33"; + sha256 = "13cs2bydz4gwdxpid8ikxijz794n59mvzpmlv6g1zcli7n9h36rl"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; meta.hydraPlatforms = [ ]; @@ -14241,12 +14241,12 @@ final: prev: { splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2025-10-25"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "cace6c962b67312fc1265d55337048e80d64ca90"; - sha256 = "1p9lxglifb75lz2b0kgvj7ibd7901b8y4410v55mp0m9914armzy"; + rev = "937f216a565ffd3345760b95bc6a0378234a76d0"; + sha256 = "019lm4g94q020c7kpi8qacxnpvx0b5cc2a7vqfmvbzyd8ag5ardf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -14934,12 +14934,12 @@ final: prev: { telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2025-03-12"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "1f08ed60cafc8f6168b72b80be2b2ea149813e55"; - sha256 = "137a05qwbpcrcrfj4az7dwx5a43yyfib4crx1hi8bhjx9j5gqav7"; + rev = "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c"; + sha256 = "04x1zhfq24qglhfv3rk3s2j6arysxq27czvpm4w037386bi0q48a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; meta.hydraPlatforms = [ ]; @@ -15456,12 +15456,12 @@ final: prev: { tinted-nvim = buildVimPlugin { pname = "tinted-nvim"; - version = "2025-09-13"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-nvim"; - rev = "930d1ba963f5224c20dba665fdf81ceded8c2745"; - sha256 = "18xwbi7c6n890saq825k5lr1m1cjrjilxph7abi7aw0npf7r5whd"; + rev = "6e4ec620befb7c9dd7ff26b092f33fc560cc1d73"; + sha256 = "0fvvqb89mlg2k56h92v5igl0ha4j8rh036ib1j6s6ilxilv4z39i"; }; meta.homepage = "https://github.com/tinted-theming/tinted-nvim/"; meta.hydraPlatforms = [ ]; @@ -15469,12 +15469,12 @@ final: prev: { tinted-vim = buildVimPlugin { pname = "tinted-vim"; - version = "2025-09-13"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-vim"; - rev = "89a72d0451b74e374845f592033a154c4434a06e"; - sha256 = "0khs36p9c36cqghwh6i0821ik926b6m70jbj7n1plvril9kdqr18"; + rev = "bb2a3347ae5631db596ae134945032cfcb56268b"; + sha256 = "1ik70p4ax9yafn30pp8xyqvsfqzlvwhg63q4mip7lf620apg2g9x"; }; meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; meta.hydraPlatforms = [ ]; @@ -15495,12 +15495,12 @@ final: prev: { tiny-glimmer-nvim = buildVimPlugin { pname = "tiny-glimmer.nvim"; - version = "2025-09-04"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-glimmer.nvim"; - rev = "84f6b0d8d83b098141e67072ef8f2606820a4454"; - sha256 = "05911xc3rjxypl1w3j6phj384irs6c4jgbywhq5mf8g0pf1yzxga"; + rev = "73b17b8a41ac7a61bfdcbe1cd3743c29d28d376e"; + sha256 = "0yli2ffppi01r85nhm23f8iddqmanipg4xaq555bx46271iy90xx"; }; meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; meta.hydraPlatforms = [ ]; @@ -15508,12 +15508,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-10-28"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "994c13daf8e75011af82edf30fb0fd90c019a898"; - sha256 = "1cz0ggdpahy4rdckdik94dgj4i8zl8dz95y3yvw902qmqw377wwf"; + rev = "63dd87d195f28e01732e121c5ddfc0a74ccff54a"; + sha256 = "08fcrccm1afpzbrkwy7q9nrs0l63jq9frprd0mr1d5vkq7ciy875"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -15626,12 +15626,12 @@ final: prev: { tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2025-10-28"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "2642dbb83333e0575d1c3436e1d837926871c5fb"; - sha256 = "0835zvgf1k6xszc4rz5pyb5cz1cyf95vj1q17nx48zz95p4vk0bl"; + rev = "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd"; + sha256 = "1s8qh9a8yajlfybcsky6rb31f0ihfhapm51531zn4xd0fyzy8dz3"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; meta.hydraPlatforms = [ ]; @@ -15705,12 +15705,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-10-31"; + version = "2025-11-01"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "5895593a4bccadd0a91988cbd3fe0908508e7451"; - sha256 = "0zwhivajzwf83n76zbpihy69qfpbxqy506m0z6m7cqgxj2yak9l7"; + rev = "6b436021ccea7c3fde67cb42febfd4335ce3c73c"; + sha256 = "1411yy2zy6sr39g0gn01sckn48zjwqghwbjvd1bs7ksvj09a5v42"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -15758,12 +15758,12 @@ final: prev: { trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2025-10-28"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "d7494d8bc563f8ae8b3f35d78c7478cf842b0ab9"; - sha256 = "1m5gv12dskjcd8y8dlrz3678dp51f0qdkv0yz10wlnryqm8sk8c2"; + rev = "bd67efe408d4816e25e8491cc5ad4088e708a69a"; + sha256 = "0cpwraxfvhnw0lvq26w58s15ynzyah9xn26bqn41acyi7ddclkz9"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; meta.hydraPlatforms = [ ]; @@ -15797,12 +15797,12 @@ final: prev: { ts-autotag-nvim = buildVimPlugin { pname = "ts-autotag.nvim"; - version = "2025-10-02"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "tronikelis"; repo = "ts-autotag.nvim"; - rev = "bfa97e1bdfac00bc2c788edb20400cc51b9bb493"; - sha256 = "00jaq51hvdqg2a6c755vvigc9r0dkm3wfjicjf8aj7gpsyr6h7fk"; + rev = "35f79f6253dff5cc43cf943d74c4b2734370a81d"; + sha256 = "1qk0c4wlgch41nrhq51smvykc1gbhxvm4kmq8r69xxznm31mmzwp"; }; meta.homepage = "https://github.com/tronikelis/ts-autotag.nvim/"; meta.hydraPlatforms = [ ]; @@ -15901,12 +15901,12 @@ final: prev: { typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2025-08-31"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "bf11d98ad5736e1cbc1082ca9a03196d45c701f1"; - sha256 = "0lsiw5rd89gclb84pkzkkn9hf6pdgsjcm9gs3ax45g8szal8z7gg"; + rev = "db26c05e267239581c89f5c825fdb8c3cf6da0c5"; + sha256 = "1pacl309w06qr70077c1vg2xgk2jx57f75c0nvw5mr1zvhgh2wca"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -15979,12 +15979,12 @@ final: prev: { ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2025-10-21"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "6a51446c2c8f09a7c207d2dc2aaa5bbbda36e093"; - sha256 = "05m9nz0gzk2cwik4ax8bhffgnv8xjvssfi4kimvwc3aghijr5z0h"; + rev = "72e160cb1ce8c0db2ac4315f77d97420a2f4223d"; + sha256 = "181x3v2a0ysynyd0gvqh1ddb2c8lk2fl91j1kv1zzhf5vx9g5bc0"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; meta.hydraPlatforms = [ ]; @@ -16031,12 +16031,12 @@ final: prev: { unified-nvim = buildVimPlugin { pname = "unified.nvim"; - version = "2025-06-23"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "axkirillov"; repo = "unified.nvim"; - rev = "5831251be3a4d552f15a32565fe1a3f07c6a4a94"; - sha256 = "1jz256licjs3vmzx9bf3ambk23m770qqvz9x07h6z8ixyyw8hky4"; + rev = "6442680a541cd0fa8290b7b8894a61eeae4b2e26"; + sha256 = "1x1gmi26qx4nr885hdc9lghfcac6ar1m0q3k9i12rj2rqa0i337r"; }; meta.homepage = "https://github.com/axkirillov/unified.nvim/"; meta.hydraPlatforms = [ ]; @@ -16070,12 +16070,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "2025-10-31"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ba185505e1f7d61961c0c23966f692306f31d460"; - sha256 = "0b1xlb2b4n24ykx3p6i3x4kw1lzdgg2bb4l283mf4qqc1zyavv9l"; + rev = "6bb338e7b9a905a5c2750f28a5e46fb08e653d8c"; + sha256 = "0fwxyn6vy0apy6shai7yrlmlrb38yzpr1ry9ylgmnynhyfzi87kb"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -16174,12 +16174,12 @@ final: prev: { vague-nvim = buildVimPlugin { pname = "vague.nvim"; - version = "2025-10-24"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "vague-theme"; repo = "vague.nvim"; - rev = "5689afda42d60c8db12ff93dd6e1322f59e46a93"; - sha256 = "10qvvsxa5v3g1891wgjg6ga63a4gjis38vga0fd4gv2va6j0wn8i"; + rev = "dba28050887c2810b5ebf9e0143b4e919bd55757"; + sha256 = "1zjbwaysdckllknp3xsa2wjyafic6aq0qygf1pf9l5lgp0hm6qqr"; }; meta.homepage = "https://github.com/vague-theme/vague.nvim/"; meta.hydraPlatforms = [ ]; @@ -16200,12 +16200,12 @@ final: prev: { venv-selector-nvim = buildVimPlugin { pname = "venv-selector.nvim"; - version = "2025-10-27"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "linux-cultist"; repo = "venv-selector.nvim"; - rev = "567dcd6cc555caf5163c99ca2ba6a86c661393e5"; - sha256 = "11xxidmjwbpcq6apwzc7bqxdxyb1d596lfvczzh9j5q1y0jjbpig"; + rev = "1ef6564d0bd0d9c4194711cfb696357a6119abd7"; + sha256 = "1v8b9j4ysyiyjv7qy37sja4mmywfzil082llrjkw86lwglrjipja"; }; meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/"; meta.hydraPlatforms = [ ]; @@ -16629,12 +16629,12 @@ final: prev: { vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2025-09-22"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "159573187e9996d06cf26e49a533f424f4d70b43"; - sha256 = "051h32i6mxnqjshnplm1n562jpi2z3ym6cf9nk093h28y24p0bw1"; + rev = "6b51799f26c5fe262ebb04742ce7cdb011082ed7"; + sha256 = "05cdf3nrphy6mczkvmr62dllb0vn28b68yzi9k4msnw8iw6jyfa3"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; meta.hydraPlatforms = [ ]; @@ -16746,12 +16746,12 @@ final: prev: { vim-argwrap = buildVimPlugin { pname = "vim-argwrap"; - version = "2023-12-26"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "f3e26a5ad249d09467804b92e760d08b1cc457a1"; - sha256 = "0qd9jzfilqr7kwgh251vcb9f4p55b9d73d90kxsa596b5wy5a494"; + rev = "03615d1eed248408567bc8fa6a5a8c94ef3cd170"; + sha256 = "1pydv9kh9l9f3dd9vn5llpx2c1zz8w6lrrcy3h244ixwawf9niy7"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; meta.hydraPlatforms = [ ]; @@ -17474,12 +17474,12 @@ final: prev: { vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2025-10-15"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "5a83ee1fdafcdedb03222bb46f7cfd70646025ee"; - sha256 = "1nacskpx9d9p5bxknpf9ka42mfcp3b15rdp6b7wyjv44ndhfvm66"; + rev = "236179fd6bdc2aabeb1326d428e6b29d41044d8e"; + sha256 = "1gsg1nmsxzmv0hga68xg9j1v4qsknrgw8hhsp0flr167gmcy15w0"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; meta.hydraPlatforms = [ ]; @@ -17786,12 +17786,12 @@ final: prev: { vim-endwise = buildVimPlugin { pname = "vim-endwise"; - version = "2025-04-06"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "eab530110d7a0d985902a3964894816b50dbf31a"; - sha256 = "1lj12b0qim0n1x6aqvz79wl6415x9yi96yx22v3iycn00s6awpmj"; + rev = "4994afb0cdf956d9a665a14b9c834869e602c396"; + sha256 = "1x1y99cqzzkf7a76w5ksd9qm96m078wx60lpjv6i2ifcn6m9yz0f"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; meta.hydraPlatforms = [ ]; @@ -19062,12 +19062,12 @@ final: prev: { vim-latex-live-preview = buildVimPlugin { pname = "vim-latex-live-preview"; - version = "2023-09-25"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "e1906cd4930a58ebaa5eb446436df23522eafb51"; - sha256 = "1adfyk96prwbf8dmznnfqvz27jxq0fpjygdhbrcc8b2i93i2dia2"; + rev = "9973568fc7275f70a4277d474821284128850034"; + sha256 = "05ni1vc6scakhkaqv4vkxbzdpg2gji90c1qb6virk7jdsd8amqx5"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; meta.hydraPlatforms = [ ]; @@ -19257,12 +19257,12 @@ final: prev: { vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2025-10-06"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "04ef607075184e7b8481245a40a9010368511e98"; - sha256 = "0pf5smslzs295dryl9zf640g8wsysjpx0dqa3dpijj38visi0i5q"; + rev = "c0de72708afe7b90f54bd085933bf8b7eb9971a1"; + sha256 = "1mj1kjfqa1v3rpr21mpvv6png3vk35jbchcyld3amz90l79hwhm9"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; meta.hydraPlatforms = [ ]; @@ -19296,12 +19296,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2025-10-30"; + version = "2025-11-05"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "fadc9609d2ccbf4ad6c70ab963e64176712d89f1"; - sha256 = "07hjjbgdvark1v9vmgm7f6lf8d5bd1y02sg4djpgsvz9bpzga9nn"; + rev = "19aef037e198fa5694b98a052f23e285bf113550"; + sha256 = "0qbaspslipdkb7vflwd9qc50jl4qvsg4d8zjnkhm173dgq63czxc"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -19426,12 +19426,12 @@ final: prev: { vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2025-10-03"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "ca538c3bb02836510526ff7d07cf7e4c8e9a3b90"; - sha256 = "0901b4pqnx3xwxm99ihy4yhp8dhfbb18ghj3d41whvbddc171zih"; + rev = "1c276e12b49a83c1bdca74351187b8adea5da4b9"; + sha256 = "1cb3y7kxa13nbzbsch8qz0qzdbhd46di2ds3yhx1hv5bcg500q5c"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.hydraPlatforms = [ ]; @@ -19972,12 +19972,12 @@ final: prev: { vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2025-04-30"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "a9896b7f7c09b7804dd9e200e7b96c18ecb5fa0b"; - sha256 = "01282v4pfjzabixrnwlfrfy84d4xxczzgc38zgk4rz831ani3681"; + rev = "c31d5c10b29c99cf1a344ae30e2ffa32cf2df743"; + sha256 = "1xf4694592w8vhwybkag9bqvrd53wg8xcdmdafg1qsk9bbhq89gz"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; meta.hydraPlatforms = [ ]; @@ -20128,12 +20128,12 @@ final: prev: { vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2025-09-03"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "904dac1530cfec0880cd44e4f7f206eb2e9e3247"; - sha256 = "0m6xgah7bsyppsm0g3zk3drapfymzlkbzkpl278byvnz3zqj6sy5"; + rev = "3f17a5cc3d7b0b7699bb5963fef9435a839dada0"; + sha256 = "1jh5iqq3qxsfqf1p2fr6gjjc3ri272b0qaf5i26ix5dvcl4jd55i"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; meta.hydraPlatforms = [ ]; @@ -20648,12 +20648,12 @@ final: prev: { vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; - version = "2025-09-16"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-sentence-chopper"; - rev = "c855a92c12b6cb3accdb9535658720a6939d82ea"; - sha256 = "0pbbg2k0xyyn890afsbvkwc3w1d3h4a3n452phj6hhg4z01kw6a8"; + rev = "d2cd11c3ee08b8ab303b374af38a5671ec5007a0"; + sha256 = "0yr6kb2znf72yh1kqk09r4hg4zjijy1g3g36jd0mbrbr1qqp6mbz"; }; meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; meta.hydraPlatforms = [ ]; @@ -21728,12 +21728,12 @@ final: prev: { vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2025-08-21"; + version = "2025-11-02"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "7e9fb4e66d345e9898045b52df544c9e553ef5e4"; - sha256 = "1bb2yaq13l65p8k77a2bml0lvazhzjan4k7f4n43szkby1dvhdll"; + rev = "dc37e83e7484fa2085cdaf37f84408e12006165a"; + sha256 = "1gkhlb93w68cgrwydb5wby1zzczapzqidapk8q842bxadaypkdll"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; meta.hydraPlatforms = [ ]; @@ -21936,12 +21936,12 @@ final: prev: { vimade = buildVimPlugin { pname = "vimade"; - version = "2025-10-30"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "27279c2fccc3c490cc6ca31c28bb0f6d84089eb4"; - sha256 = "0dplck7xfaxxgfphk1w9xfys04bsfijpbwxwm2cdkb48ihiva3g1"; + rev = "bf0a44e2f1e985a1c3e70043891377d46125a8ab"; + sha256 = "0b063sw12vv011l5021dc9fpfay8y1cc61lmxd4ig11lv6lcds5p"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; meta.hydraPlatforms = [ ]; @@ -22080,12 +22080,12 @@ final: prev: { vimux = buildVimPlugin { pname = "vimux"; - version = "2025-10-26"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "66d53eab51aa7d2c0f55f3ee2e381b923e705e37"; - sha256 = "0kjr181j55f5wy468w6h2nyvvpq13aqf06vm2vsfvnwwzycgmsfq"; + rev = "614f0bb1fb598f97accdcea71d5f7b18d7d62436"; + sha256 = "17hbhqxcd31w5sd98cia88rsnrnsychdhbvpqjscr4k8mr2awhch"; }; meta.homepage = "https://github.com/preservim/vimux/"; meta.hydraPlatforms = [ ]; @@ -22496,12 +22496,12 @@ final: prev: { wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2025-10-24"; + version = "2025-11-03"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "0c53ebe0d8b74dc6c70632b3703eada3b74708ab"; - sha256 = "18bigy34qijb4q44lw0wq81p3k9ac5w29sm2f8686pdzsblh1q7j"; + rev = "0b46f96e07d1eaf9b495027be4caa1fab2ffe295"; + sha256 = "0jz309cxyqv1i2pq123h18pnid14yxlrjqdvhyzwfhafjh8pzjs9"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; meta.hydraPlatforms = [ ]; @@ -22614,12 +22614,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-10-30"; + version = "2025-11-07"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "f710a9ebfa9aa6fdac9ee1bc636f8f92030c745c"; - sha256 = "0nrj069f2sqkfdh02b0r2hwady6xnz9x064h8mci2mb0008mqkv4"; + rev = "667028e28f03286aaf6aaca3d63653ff731a3381"; + sha256 = "0jpdhbqqh79csa00bhw1532qlck5xnij8n2z724z5d2k5ng9fqa7"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -22796,12 +22796,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "2025-10-23"; + version = "2025-11-04"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "b4f5b0832311aa3b6ba624275d389ce8070f7aa6"; - sha256 = "05qyjmyvgqnr3qm5il4h85xapaf7ya8739sxbrgyx00gzjkrxzcx"; + rev = "11b0678865c2c0c6c0bc4054996b565c2cda4f75"; + sha256 = "0ilf4n2wnja6li72ph2rs90w8hs54vys4kcicfh3cqx2038xp1c1"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 73730fba3c33..2f9a1713aa2a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3195,6 +3195,11 @@ assertNoAdditions { "snacks.debug" "snacks.dim" "snacks.explorer.init" + "snacks.gh.actions" + "snacks.gh.buf" + "snacks.gh.init" + "snacks.gh.render" + "snacks.gh.render.init" "snacks.git" "snacks.image.convert" "snacks.image.image" @@ -3207,6 +3212,8 @@ assertNoAdditions { "snacks.picker.actions" "snacks.picker.config.highlights" "snacks.picker.core.list" + "snacks.picker.source.gh" + "snacks.picker.util.diff" "snacks.scratch" "snacks.scroll" "snacks.terminal" From de8c403f28104228aa8e67d5cc7f59b9dedaa65c Mon Sep 17 00:00:00 2001 From: Redlonghead Date: Thu, 6 Nov 2025 22:09:18 -0600 Subject: [PATCH 1598/2279] coreshot: fix building with qt 6.10 --- .../misc/cubocore-packages/coreshot/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 4531a57317ec..50a38084194e 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, qt6, cmake, ninja, @@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5KGaMCL9BCGZwK7HQz87B1qrNvx5SQyMooZw4MwMdCc="; }; + patches = [ + (fetchpatch { + name = "fix-building-with-Qt-610"; + url = "https://gitlab.com/cubocore/coreapps/coreshot/-/commit/a01c943bec46eea261f545957dbafafc3ea370bb.patch"; + hash = "sha256-SD4bYM8nBnGPO8iS8htFZZFUdimbLmpqxgWPioLMjsM="; + }) + ]; + nativeBuildInputs = [ cmake ninja From e4bf01c92234fb9f43ed8d575f2279043cfa1d85 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 7 Nov 2025 16:41:20 -0600 Subject: [PATCH 1599/2279] vimPlugins.nvim-treesitter: update grammars Signed-off-by: Austin Horstman --- .../vim/plugins/nvim-treesitter/generated.nix | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c2dd5c50f55f..5bae846989cb 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -596,12 +596,12 @@ }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=a37c5ee"; + version = "0.0.0+rev=5baef88"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "a37c5ee95ce401ca311c0ae1369d9cfb953e151d"; - hash = "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4="; + rev = "5baef88717ad0156fd29a8b12d0d8245bb1096a8"; + hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -619,12 +619,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=911d701"; + version = "0.0.0+rev=439a3fc"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "911d7017566116b15c4b2c339e1dbe11fcf03f63"; - hash = "sha256-c/rg3qgUO7RfmFhFSIPyl6npNieztaVv58u10p9JH3o="; + rev = "439a3fcdbf239db35f587936a36f48b704ba8357"; + hash = "sha256-GJv+JYpcsBmNEQoTViXS5Xu4jEYTBKFod14COoeCe9g="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -1457,12 +1457,12 @@ }; javadoc = buildGrammar { language = "javadoc"; - version = "0.0.0+rev=92f9d71"; + version = "0.0.0+rev=3e9a823"; src = fetchFromGitHub { owner = "rmuir"; repo = "tree-sitter-javadoc"; - rev = "92f9d7115598c1b012f5931a84ee5d50d46c0eb7"; - hash = "sha256-A8aMgDKAPZ18qy7GMihBpNrmL52Zf/wAjsPQoMCL3oE="; + rev = "3e9a823a02d3115d74294f04c39bd2c958ec3da6"; + hash = "sha256-qqkEGJn9ocHdr8SSeYcJ5kAZr11Ot7rvH1QVYYre8/Q="; }; meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc"; }; @@ -1891,12 +1891,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=6543579"; + version = "0.0.0+rev=f1c4a94"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "65435795eb4132d5eff66d62347050e863e5ebe5"; - hash = "sha256-s7oNzU7rTjejwgW9F28GayuxEe/Gn51+yQi7iPqgFfw="; + rev = "f1c4a9445c65fb4668a87bfb344d762d0356781d"; + hash = "sha256-YX5DaGtuXBcLbSP0L1C52fPW4oDqeMGqewU48bfFmuQ="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -2172,12 +2172,12 @@ }; pkl = buildGrammar { language = "pkl"; - version = "0.0.0+rev=d62e832"; + version = "0.0.0+rev=798222b"; src = fetchFromGitHub { owner = "apple"; repo = "tree-sitter-pkl"; - rev = "d62e832b69a0aa3d4f87fc34ba62d931d6c23f55"; - hash = "sha256-6sVPCbs3rLlEhK9Fj2sJGjNBmvaGrajSOoGo6G78buo="; + rev = "798222b4a29ba9a9715583e22242ab0f2ac6abc0"; + hash = "sha256-BLm8KvzBZt6+ZvZ6umrdgs5E8D3rPTZNCx611s6h+kA="; }; meta.homepage = "https://github.com/apple/tree-sitter-pkl"; }; @@ -3541,12 +3541,12 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=321231f"; + version = "0.0.0+rev=d1c0a65"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "321231f99e3704f1555de14cda5dca93ee14a95b"; - hash = "sha256-W7/eYAGC+usKoUdT4JgP+0d3/FykrK/lkBSvhy38qQE="; + rev = "d1c0a65348272ff235e5553fcd9171b151d251b4"; + hash = "sha256-hu2lfluEA9r6LiC1NvvqaWVOinKK0QylbxI3rYz5DO8="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; @@ -3629,4 +3629,15 @@ location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; + zsh = buildGrammar { + language = "zsh"; + version = "0.0.0+rev=v0.34.0"; + src = fetchFromGitHub { + owner = "georgeharker"; + repo = "tree-sitter-zsh"; + rev = "v0.34.0"; + hash = "sha256-rMOLASmlXaCxEI7ZLXbBU0BMLZle++U0HzEqdVF5qyg="; + }; + meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh"; + }; } From 73dec402d589bea6098798ef9b80531f83dba5da Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 7 Nov 2025 19:47:38 -0300 Subject: [PATCH 1600/2279] _1password-gui-beta: 8.11.18-30.BETA -> 8.11.18-34.BETA --- pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index c9dab6f3bf8a..dff1ac361bb6 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -29,28 +29,28 @@ }, "beta": { "linux": { - "version": "8.11.18-30.BETA", + "version": "8.11.18-34.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-30.BETA.x64.tar.gz", - "hash": "sha256-rCb54NhczM5Us6DRd1DgA7xGem4Ri4GIcJ0FFCiNAvo=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-34.BETA.x64.tar.gz", + "hash": "sha256-1x0FwxQ6oWGdcJ7Up9S+f423IpFAMEJ08WQnbgaesVU=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-30.BETA.arm64.tar.gz", - "hash": "sha256-qL6Xa8g2qgyl+UfDThH18rbaXxkt+bN0y2TcQ8C214Y=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-34.BETA.arm64.tar.gz", + "hash": "sha256-ita34logGU5zd6USi4XgOQosWooebHssyIobPZ8wlVg=" } } }, "darwin": { - "version": "8.11.18-30.BETA", + "version": "8.11.18-34.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-x86_64.zip", - "hash": "sha256-xkCTyFxZhCKsCTTyWz3SPA9XKhR5p7GT3hwBwXQVb40=" + "url": "https://downloads.1password.com/mac/1Password-8.11.18-34.BETA-x86_64.zip", + "hash": "sha256-NONcgqasLQd9nQnEQfibcYLPagvt2VuIFUxgkTMVRxE=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-aarch64.zip", - "hash": "sha256-Ou3GSMTNmaz+sbYCYqmxH9qrQMDmUBfTUPVcvdNDt6k=" + "url": "https://downloads.1password.com/mac/1Password-8.11.18-34.BETA-aarch64.zip", + "hash": "sha256-SVPXpEFBI0mutj/J5vvb2o20za+5d/zzB7altIHADYw=" } } } From 8497842c3f2fa12d3482ad22723aff7eec1db003 Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 7 Nov 2025 23:47:58 +0100 Subject: [PATCH 1601/2279] switch-to-configuration-ng: fix error message for preSwitchCheck arg --- pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index a33b391a524a..2641aba9f13a 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -149,7 +149,7 @@ fn parse_os_release() -> Result> { fn do_pre_switch_check(command: &str, toplevel: &Path, action: &Action) -> Result<()> { let mut cmd_split = command.split_whitespace(); let Some(argv0) = cmd_split.next() else { - bail!("missing first argument in install bootloader commands"); + bail!("missing first argument in pre-switch check"); }; match std::process::Command::new(argv0) From 3a4f9aa50d3ef91b781a560d54ab9dbf1f30a5ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 22:54:31 +0000 Subject: [PATCH 1602/2279] bottles-unwrapped: 51.25 -> 52.0 --- pkgs/by-name/bo/bottles-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix index 49c8d15fcf77..5aec3d925137 100644 --- a/pkgs/by-name/bo/bottles-unwrapped/package.nix +++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix @@ -32,13 +32,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.25"; + version = "52.0"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; tag = version; - hash = "sha256-W25MpdXLO+vcMvvCJmA87lB9WiBOJHsWp8D/LU0xjAY="; + hash = "sha256-nly5DldxJtgBLpXdVpfQwu3qTQm9E0MmC3i4QGYbOEw="; }; patches = [ From 12a6dd2f30944a0bfc73f9f33857d70ea8f76ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 7 Nov 2025 14:56:17 -0800 Subject: [PATCH 1603/2279] python3Packages.pymobiledevice3: 5.0.3 -> 5.1.2 Diff: https://github.com/doronz88/pymobiledevice3/compare/v5.0.3...v5.1.2 Changelog: https://github.com/doronz88/pymobiledevice3/releases/tag/v5.0.4 https://github.com/doronz88/pymobiledevice3/releases/tag/v5.1.0 https://github.com/doronz88/pymobiledevice3/releases/tag/v5.1.1 https://github.com/doronz88/pymobiledevice3/releases/tag/v5.1.2 --- pkgs/development/python-modules/pymobiledevice3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix index 5812bdbff51c..582f2da789b0 100644 --- a/pkgs/development/python-modules/pymobiledevice3/default.nix +++ b/pkgs/development/python-modules/pymobiledevice3/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { pname = "pymobiledevice3"; - version = "5.0.3"; + version = "5.1.2"; pyproject = true; src = fetchFromGitHub { owner = "doronz88"; repo = "pymobiledevice3"; tag = "v${version}"; - hash = "sha256-fw7KGijIgIXXFbtNpq1QBrxUP4F6ivLQXQn94YZnQL4="; + hash = "sha256-HKkLkkPCu9d7iBy7FEPWR6cnNuYFgxSGN6beMCCiuyo="; }; build-system = [ From dbf0923e558ef2ea46744b23d52b153ff29eba94 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 7 Nov 2025 23:46:52 +0100 Subject: [PATCH 1604/2279] qgis: 3.44.3 -> 3.44.4 --- pkgs/applications/gis/qgis/unwrapped.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c102d9c23356..e6868cc03407 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -21,7 +21,6 @@ grass, gsl, hdf5, - libspatialindex, libspatialite, libzip, netcdf, @@ -82,14 +81,14 @@ let ]; in mkDerivation rec { - version = "3.44.3"; + version = "3.44.4"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-g7ZdNLal16b0Fbq492mPpOiNkYc3Bm4c7INWX+2e7H8="; + hash = "sha256-G9atxBBANlUDGl39bkwTo6L04/+0o5A5ake4KvIY70E="; }; passthru = { @@ -115,7 +114,6 @@ mkDerivation rec { geos gsl hdf5 - libspatialindex libspatialite libzip netcdf @@ -159,6 +157,9 @@ mkDerivation rec { "-DWITH_PDAL=True" "-DENABLE_TESTS=False" "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}" + + # See https://github.com/libspatialindex/libspatialindex/issues/276 + "-DWITH_INTERNAL_SPATIALINDEX=True" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withServer [ From 50b55e486f8e7baf901dc45508f63f65a6d1fd94 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 7 Nov 2025 17:00:48 -0600 Subject: [PATCH 1605/2279] yaziPlugins: update on 2025-11-07 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - mediainfo: 25.5.31-unstable-2025-08-28 → 25.5.31-unstable-2025-11-04 - recycle-bin: 0-unstable-2025-10-25 → 0-unstable-2025-11-03 - sudo: 0-unstable-2025-09-22 → 0-unstable-2025-11-05 Signed-off-by: Austin Horstman --- pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix | 6 +++--- pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix | 6 +++--- pkgs/by-name/ya/yazi/plugins/sudo/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix index c5692e7db0cf..8e046356a4a2 100644 --- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mediainfo.yazi"; - version = "25.5.31-unstable-2025-08-28"; + version = "25.5.31-unstable-2025-11-04"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "mediainfo.yazi"; - rev = "2093ab79d47d750c0b74759d2dd93aff8c7ee5c8"; - hash = "sha256-GObz6kpBTT1HuWgsAWlbbzCw2GxZGKLTWaUKKztiTaw="; + rev = "7543154138ffb2bb0c738419af6ff4595152a809"; + hash = "sha256-qWh/2WA1pBhze+g5aDSl4gHk2zJSgnl4WZr74FfNA74="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix index 5de164d5d744..a3e01204d065 100644 --- a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "recycle-bin.yazi"; - version = "0-unstable-2025-10-25"; + version = "0-unstable-2025-11-03"; src = fetchFromGitHub { owner = "uhs-robert"; repo = "recycle-bin.yazi"; - rev = "8bb62865fdef06ea27c10367595017c118ef2831"; - hash = "sha256-p7UBJCWvyOHpt2EbjDNJJ0wuPxK425vyy+9lf9al9F0="; + rev = "bce0eb110e2447544fd619f30ff82bfee51a6347"; + hash = "sha256-dj/lKod8I6Fs1Vp2e6AOEmUVSwT12Ck7zT5e4Qsmzt0="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix index c895b5a30754..22bc4af3eb35 100644 --- a/pkgs/by-name/ya/yazi/plugins/sudo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/sudo/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "sudo.yazi"; - version = "0-unstable-2025-09-22"; + version = "0-unstable-2025-11-05"; src = fetchFromGitHub { owner = "TD-Sky"; repo = "sudo.yazi"; - rev = "8148f9101d0aeb8eed5ba2b7e943d51963f14bd9"; - hash = "sha256-old+I3UlgMWfG0HuKEdIkAO2/4KNRLAWj0l+lB9+aZU="; + rev = "86205aa8044f10b02471be1087f3381bbadc967e"; + hash = "sha256-mpQLij+Sg88RarCC+0u7JfZ2EqcX4gB7jvy8bfBt90w="; }; meta = { From 5f47eabf75ab72f82560ace14de10418e06aac60 Mon Sep 17 00:00:00 2001 From: Zachary Arnaise <121795280+zacharyarnaise@users.noreply.github.com> Date: Sat, 8 Nov 2025 00:04:14 +0100 Subject: [PATCH 1606/2279] maintainers: add zacharyarnaise --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 76cde1dde704..3706a1ecbe15 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28895,6 +28895,16 @@ name = "Zexin Yuan"; keys = [ { fingerprint = "FE16 B281 90EF 6C3F F661 6441 C2DD 1916 FE47 1BE2"; } ]; }; + zacharyarnaise = { + name = "Zachary Arnaise"; + github = "zacharyarnaise"; + githubId = 121795280; + keys = [ + { + fingerprint = "5C1A 2BE8 C6B4 AFC0 DE82 73E9 B1F3 94D8 D460 C3B2"; + } + ]; + }; zacharyweiss = { name = "Zachary Weiss"; email = "me@zachary.ws"; From d93a80f6e876cc82eb0ceed7d9bf26c6d3fa7bec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 23:05:02 +0000 Subject: [PATCH 1607/2279] cargo-tauri: 2.9.2 -> 2.9.3 --- pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 3fa44d6fe442..cc4c43735845 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-kkCeNQL5NR7DGKa3rbPx3NRQv1vAOHw741icHmzj5v8="; + hash = "sha256-cpD4eh0qxwPmGMDAzI1AHVLEe4WU80xGzeZIT56iMpc="; }; - cargoHash = "sha256-oTL/kwvuFio7RTnpVqeEXNsWCsNUKY8GlNlh+59LVxg="; + cargoHash = "sha256-H+HwPoUlCU7lDMZSQetaKQvCTowPnAvBres2QPJu5+Q="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config From 8f4ef02d923cc4fefbd6b713ee26a246473192bf Mon Sep 17 00:00:00 2001 From: Zachary Arnaise <121795280+zacharyarnaise@users.noreply.github.com> Date: Sat, 8 Nov 2025 00:05:14 +0100 Subject: [PATCH 1608/2279] tilt: add zacharyarnaise as maintainer --- pkgs/by-name/ti/tilt/binary.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ti/tilt/binary.nix b/pkgs/by-name/ti/tilt/binary.nix index 5035423def89..e0db9c04765c 100644 --- a/pkgs/by-name/ti/tilt/binary.nix +++ b/pkgs/by-name/ti/tilt/binary.nix @@ -42,6 +42,9 @@ buildGoModule rec { mainProgram = "tilt"; homepage = "https://tilt.dev/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ anton-dessiatov ]; + maintainers = with lib.maintainers; [ + anton-dessiatov + zacharyarnaise + ]; }; } From 211b24db2fb08692f719ae42bc583d30171b17a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 00:08:14 +0000 Subject: [PATCH 1609/2279] nakama: 3.33.0 -> 3.33.1 --- pkgs/by-name/na/nakama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix index 7790fe196058..684d11a43604 100644 --- a/pkgs/by-name/na/nakama/package.nix +++ b/pkgs/by-name/na/nakama/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nakama"; - version = "3.33.0"; + version = "3.33.1"; src = fetchFromGitHub { owner = "heroiclabs"; repo = "nakama"; tag = "v${version}"; - hash = "sha256-GiUufoWLwWBuZxId+vMkJPaJIb/FWLJAJLb7WKoyn5M="; + hash = "sha256-e+Z8BmEbBJazSorIYuVIbrwKHATN9SWTBOh60ol/c8g="; }; vendorHash = null; From 4b0b54a907878cafd51584f305c4422736af5e05 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 7 Nov 2025 16:08:58 -0800 Subject: [PATCH 1610/2279] bash: fix cpe eval --- pkgs/shells/bash/5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 0ca4ca768b5d..017edfe2613e 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -278,7 +278,7 @@ lib.warnIf (withDocs != null) mainProgram = "bash"; identifiers.cpeParts = let - versionSplit = lib.split "p" version; + versionSplit = lib.split "p" fa.version; in { vendor = "gnu"; From a6c7b19721120727184c795391537d0a28fb8f47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 00:44:07 +0000 Subject: [PATCH 1611/2279] slepc: 3.24.0 -> 3.24.1 --- pkgs/by-name/sl/slepc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix index 357a7cb6a5de..4d236fc16121 100644 --- a/pkgs/by-name/sl/slepc/package.nix +++ b/pkgs/by-name/sl/slepc/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "slepc"; - version = "3.24.0"; + version = "3.24.1"; src = fetchFromGitLab { owner = "slepc"; repo = "slepc"; tag = "v${finalAttrs.version}"; - hash = "sha256-nvzX0p/H3EYR8+7jD+I4FdvU+WstxR/U4Upcn7yZULk="; + hash = "sha256-Eg0GLPM1AbgUl2/c2+F012LjZweuBNAWjY1WtlghjeY="; }; postPatch = '' From d213dae9bddf494358fac0314e25be9d46da8827 Mon Sep 17 00:00:00 2001 From: FKouhai Date: Sat, 8 Nov 2025 01:54:14 +0100 Subject: [PATCH 1612/2279] hygg: skip test_stdin_processing on darwin --- pkgs/by-name/hy/hygg/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix index ff1901af28cd..00f166181a7e 100644 --- a/pkgs/by-name/hy/hygg/package.nix +++ b/pkgs/by-name/hy/hygg/package.nix @@ -28,7 +28,11 @@ rustPlatform.buildRustPackage (finalAttrs: { # e2e test fails since it cant find the input pdf file "--skip=tests::test_end_to_end" "--skip=test_epub_processing" - ]; + ] + ## Skipping this test due to the high variability of its outcome + ## When the package was merged the test was passing but on hydra its not + ## Look at PR #448907 + ++ (if pkgs.stdenv.isDarwin then [ "--skip=test_stdin_processing" ] else [ ]); doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From da8712fc073d7e3bfb6e06c62b30a36ed67638ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 01:58:25 +0100 Subject: [PATCH 1613/2279] cygwin.w32api: fix meta maintainers --- pkgs/os-specific/cygwin/w32api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/cygwin/w32api/default.nix b/pkgs/os-specific/cygwin/w32api/default.nix index 4950da53116d..1fcb6d607066 100644 --- a/pkgs/os-specific/cygwin/w32api/default.nix +++ b/pkgs/os-specific/cygwin/w32api/default.nix @@ -39,7 +39,7 @@ license ; platforms = lib.platforms.unix ++ lib.platforms.windows; - teams = [ lib.maintainers.corngood ]; + maintainers = [ lib.maintainers.corngood ]; }; } // ( From ac579c670831aa427dce4270e82e5ef5441e74d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 01:03:19 +0000 Subject: [PATCH 1614/2279] lux-cli: 0.18.8 -> 0.20.0 --- pkgs/by-name/lu/lux-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index dd7c01bfeca8..6923cd52e476 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.18.8"; + version = "0.20.0"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-AHmIdVkU4a+zmJPWfGkmRI7Mc/NdX+KokKHn9CZ9tOM="; + hash = "sha256-cQ7kgg4pv7j47cvhhHV9885M1hlknZJI2FRWxX5SmCc="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-noOyrKNxfndkq7VlyxLs8R8FG+1xkwM7MbKu0vO4Nh8="; + cargoHash = "sha256-x4cLC+UeoSI4yYdEJb26vnj9JvZ5t31J0mcnQJjZabk="; nativeInstallCheckInputs = [ versionCheckHook From 4a8f2c2a693d004e14d720aa7a2711f6731f1375 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 01:23:47 +0000 Subject: [PATCH 1615/2279] python3Packages.philipstv: 2.1.1 -> 3.0.1 --- pkgs/development/python-modules/philipstv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/philipstv/default.nix b/pkgs/development/python-modules/philipstv/default.nix index d482554a755d..5f0231d9e695 100644 --- a/pkgs/development/python-modules/philipstv/default.nix +++ b/pkgs/development/python-modules/philipstv/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "philipstv"; - version = "2.1.1"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bcyran"; repo = "philipstv"; tag = version; - hash = "sha256-BvQurZls9NjtHhTXLQ9t8fHkAF/QU/c6mmRvNmE0v90="; + hash = "sha256-9OlPaGruD6HDJArvIOb/pIVw5nqTUleDfxeYp2xBbEA="; }; build-system = [ From 762359c6f95eed398ed16e0edbc3cbf3bcbfb35c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 01:39:34 +0000 Subject: [PATCH 1616/2279] haproxy: 3.2.7 -> 3.2.8 --- pkgs/by-name/ha/haproxy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 27e19e2c0e90..cc5c4be08fc1 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -43,11 +43,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-Hwrp37CzGeLVy25M35MaCHetiOAJDEbPFvrwCPv1Qng="; + hash = "sha256-RnA/uUcg+SzOKwgEmkDZF2liA3umdohcVaVr2dYl58I="; }; buildInputs = [ From c83e7752ddc66d26587fbe98dc72190c7020b354 Mon Sep 17 00:00:00 2001 From: Zaechus Date: Thu, 30 Oct 2025 14:01:10 -0600 Subject: [PATCH 1617/2279] devilutionx: 1.5.4 -> 1.5.5 --- pkgs/by-name/de/devilutionx/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix index a3f8d21ba257..cf9ff5ebb9a3 100644 --- a/pkgs/by-name/de/devilutionx/package.nix +++ b/pkgs/by-name/de/devilutionx/package.nix @@ -12,7 +12,9 @@ SDL2_image, SDL_audiolib, simpleini, + flac, fmt, + libogg, libpng, libtiff, libwebp, @@ -45,20 +47,20 @@ let owner = "diasurgical"; repo = "libzt"; fetchSubmodules = true; - rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8"; - sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew="; + rev = "1a9d83b8c4c2bdcd7ea6d8ab1dd2771b16eb4e13"; + sha256 = "sha256-/A77ZM4s+br1hYa0OBdjXcWXUXYG+GiEYcW8VB+UJHo="; }; in stdenv.mkDerivation (finalAttrs: { pname = "devilutionx"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; tag = finalAttrs.version; - hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM="; + hash = "sha256-XfHpKERYZ+VCeWx95568FEEZ4UZg3Z4abA8mG4kHjy0="; }; patches = [ ./add-nix-share-path-to-mpq-search.patch ]; @@ -83,7 +85,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bzip2 + flac fmt + libogg libpng libtiff libwebp From 296e29eb9ffd1c04ea7914c474e7092ecb8be190 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 7 Nov 2025 20:47:07 -0500 Subject: [PATCH 1618/2279] devilutionx, smpq, stormlib: add cmake fix --- pkgs/by-name/de/devilutionx/package.nix | 4 ++++ pkgs/by-name/sm/smpq/package.nix | 1 + pkgs/by-name/st/stormlib/package.nix | 1 + 3 files changed, 6 insertions(+) diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix index cf9ff5ebb9a3..a65c8c68011d 100644 --- a/pkgs/by-name/de/devilutionx/package.nix +++ b/pkgs/by-name/de/devilutionx/package.nix @@ -76,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "@assets@" "$out/share/diasurgical/devilutionx/" ''; + cmakeFlags = [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/sm/smpq/package.nix b/pkgs/by-name/sm/smpq/package.nix index 817b2077d04b..0048797bfe04 100644 --- a/pkgs/by-name/sm/smpq/package.nix +++ b/pkgs/by-name/sm/smpq/package.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "WITH_KDE" false) + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix index cf7f4d7ebcf2..99a4ee90d9af 100644 --- a/pkgs/by-name/st/stormlib/package.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "WITH_LIBTOMCRYPT" true) + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; strictDeps = true; From 5ff1655c9ed8fc42c42737a78b25fb9f11d7939a Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 4 Nov 2025 02:56:37 +0000 Subject: [PATCH 1619/2279] python3Packages.taxi: disable failing tests - The `nixpkgs` update of `python3Packages.click` from 8.1.8 to 8.2.1 in PR 448189 has made these tests fail. The failures are occurring because of interactive inputs in the testing. --- pkgs/development/python-modules/taxi/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 6fd45eef85eb..2bc58cc9599e 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -35,6 +35,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "taxi" ]; + # Broken by the update of `click` from version 8.1.8 -> 8.2.1 in + # https://github.com/NixOS/nixpkgs/pull/448189. + disabledTests = [ + "test_ignore_date_error_week_day" + "test_ignore_date_error_previous_day" + ]; + meta = with lib; { homepage = "https://github.com/sephii/taxi/"; description = "Timesheeting made easy"; From 618b1603a04dc57ace82f7164515b480c67dc8fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 01:53:50 +0000 Subject: [PATCH 1620/2279] python3Packages.unicodedata2: 16.0.0 -> 17.0.0 --- pkgs/development/python-modules/unicodedata2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index b2ef805de809..7b60c65ef0b3 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "unicodedata2"; - version = "16.0.0"; + version = "17.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "05488d6592b59cd78b61ec37d38725416b2df62efafa6a0d63a631b27aa474fc"; + sha256 = "sha256-/6Lw1oNGQv6ZbTVuco2ohyAVM7tUCXSuesl15m7MDjo="; }; nativeCheckInputs = [ pytestCheckHook ]; From 08cac96421cf426c85f4b08219d3c56abff43a89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 01:57:37 +0000 Subject: [PATCH 1621/2279] debian-devscripts: 2.25.22 -> 2.25.25 --- pkgs/by-name/de/debian-devscripts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 6f920a4dd69a..502cbdcf0967 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.25.22"; + version = "2.25.25"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-FiqM2n33tbzHgwZGZ2CaAvNTrAUgTuwMtNbXbn6EYJ4="; + hash = "sha256-3ZPRn0SwefYoSNNy0V51+nBFTEnE+xSfe3JOz9KOw94="; }; patches = [ From 1a173c125a101fcaa62a7dea2c5a81c572ef276a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 02:04:45 +0000 Subject: [PATCH 1622/2279] libretro.vba-m: 0-unstable-2025-10-17 -> 0-unstable-2025-11-05 --- pkgs/applications/emulators/libretro/cores/vba-m.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/applications/emulators/libretro/cores/vba-m.nix index 613861b185e5..1a25a66478dd 100644 --- a/pkgs/applications/emulators/libretro/cores/vba-m.nix +++ b/pkgs/applications/emulators/libretro/cores/vba-m.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "vbam"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2025-11-05"; src = fetchFromGitHub { owner = "libretro"; repo = "vbam-libretro"; - rev = "badf47c0e050983e44ac1217033283ca78313298"; - hash = "sha256-PwqwG+YMgdWNMoWx0mdUIBebQBMgaFd8BiI27xSUhps="; + rev = "d0787aee43d260675da203c2f85ba9fa226c0c66"; + hash = "sha256-WhsiKsDk7jEIklrOw1YFCcWSlAmLK4vCCji3Mnsgwmw="; }; makefile = "Makefile"; From 241ad9ec134ffad3260f51fa5745732aa63fb7b3 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:06:55 +1000 Subject: [PATCH 1623/2279] autotiling: modernize --- pkgs/misc/autotiling/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index fa0e6373480e..2d412952bc22 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "nwg-piotr"; - repo = pname; + repo = "autotiling"; tag = "v${version}"; hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk="; }; @@ -24,12 +24,12 @@ buildPythonApplication rec { ]; doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/nwg-piotr/autotiling"; description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ artturin ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ artturin ]; mainProgram = "autotiling"; }; } From 138ac3a28120ec45ca19a2edcc20ca58496d5d9d Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:07:39 +1000 Subject: [PATCH 1624/2279] jackett: modernize --- pkgs/shells/fish/plugins/sponge.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/fish/plugins/sponge.nix b/pkgs/shells/fish/plugins/sponge.nix index 9375079d7a53..ad6a9b088b58 100644 --- a/pkgs/shells/fish/plugins/sponge.nix +++ b/pkgs/shells/fish/plugins/sponge.nix @@ -10,15 +10,15 @@ buildFishPlugin rec { src = fetchFromGitHub { owner = "meaningful-ooo"; - repo = pname; + repo = "sponge"; rev = version; sha256 = "sha256-MdcZUDRtNJdiyo2l9o5ma7nAX84xEJbGFhAVhK+Zm1w="; }; - meta = with lib; { + meta = { description = "Keeps your fish shell history clean from typos, incorrectly used commands and everything you don't want to store due to privacy reasons"; homepage = "https://github.com/meaningful-ooo/sponge"; - license = licenses.mit; - maintainers = with maintainers; [ quantenzitrone ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ quantenzitrone ]; }; } From aa7ca28926a5ea114490f8f69e75a98b2422e323 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:09:00 +1000 Subject: [PATCH 1625/2279] jackett: modernize --- pkgs/servers/jackett/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2d48051f999b..6c69af569fdb 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -14,9 +14,9 @@ buildDotnetModule rec { version = "0.22.2390"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "jackett"; + repo = "jackett"; + tag = "v${version}"; hash = "sha512-Viz9gU16NG6nYeEwhar3OCSPnsHrM6ZehsOcNxteaGyvgrhbyWt5rNI54wCJ7OngHaZgIoQhMoNNkvIhX8JDUg=="; }; @@ -51,13 +51,13 @@ buildDotnetModule rec { passthru.tests = { inherit (nixosTests) jackett; }; - meta = with lib; { + meta = { description = "API Support for your favorite torrent trackers"; mainProgram = "jackett"; homepage = "https://github.com/Jackett/Jackett/"; changelog = "https://github.com/Jackett/Jackett/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ edwtjo nyanloutre purcell From ee1039297a3492a6e4d844971b5e0741a2776672 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:11:24 +1000 Subject: [PATCH 1626/2279] apulse: modernize, move to finalAttrs --- pkgs/misc/apulse/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index df2480f902e3..ac2ab9763b6f 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -14,15 +14,15 @@ let oz = x: if x then "1" else "0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "apulse"; version = "0.1.14"; src = fetchFromGitHub { owner = "i-rinat"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI="; + repo = "apulse"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SWvQvS9QBOevOSRpjY3XpyhzWoHAkXzkk8Mh4ovltNI="; }; nativeBuildInputs = [ @@ -40,12 +40,13 @@ stdenv.mkDerivation rec { "-DLOG_TO_STDERR=${oz logToStderr}" ]; - meta = with lib; { + meta = { description = "PulseAudio emulation for ALSA"; homepage = "https://github.com/i-rinat/apulse"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.jagajaga ]; + changelog = "https://github.com/i-rinat/apulse/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.jagajaga ]; mainProgram = "apulse"; }; -} +}) From a92c0fa8f6ea8d0ed3ac6cbc2a8b2fcdd77bdf57 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 12:13:40 +1000 Subject: [PATCH 1627/2279] lemmy-ui: modernize --- pkgs/servers/web-apps/lemmy/ui.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 85ce59d44ab6..298f1d8f3d4d 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -11,7 +11,6 @@ let pinData = lib.importJSON ./pin.json; - in stdenvNoCC.mkDerivation (finalAttrs: { @@ -23,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { with finalAttrs; fetchFromGitHub { owner = "LemmyNet"; - repo = pname; + repo = "lemmy-ui"; rev = version; fetchSubmodules = true; hash = pinData.uiHash; @@ -79,15 +78,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { distPhase = "true"; - passthru.updateScript = ./update.py; - passthru.tests.lemmy-ui = nixosTests.lemmy; - passthru.commit_sha = finalAttrs.src.rev; + passthru = { + updateScript = ./update.py; + tests.lemmy-ui = nixosTests.lemmy; + commit_sha = finalAttrs.src.rev; + }; - meta = with lib; { + meta = { description = "Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ happysalada billewanick georgyo From 2e6c73c34e7f01fa05ab06ce908aed8070be0946 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 21:19:43 -0500 Subject: [PATCH 1628/2279] nodePackages.npm-merge-driver: drop Upstream repo is archived. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0a5ff76f605f..f5a94b70e1b1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -219,6 +219,7 @@ mapAliases { }; }); # added 2024-10-04 inherit (pkgs) npm-check-updates; # added 2023-08-22 + npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 orval = throw "orval has been removed because it was broken"; # added 2025-03-23 parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 93dc30789725..41ba101d9ee1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -66,7 +66,6 @@ , "node-gyp-build" , "node2nix" , "np" -, "npm-merge-driver" , "nrm" , "parsoid" , "peerflix" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d8daeb941a20..522a63354ee8 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -41175,24 +41175,6 @@ in bypassCache = true; reconstructLock = true; }; - npm-merge-driver = nodeEnv.buildNodePackage { - name = "npm-merge-driver"; - packageName = "npm-merge-driver"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz"; - sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "git merge driver for automatically merging lockfiles"; - homepage = "https://github.com/npm/npm-merge-driver#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; nrm = nodeEnv.buildNodePackage { name = "nrm"; packageName = "nrm"; From f58316e04715bf57c56bb53a560d80b42374d531 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 21:25:20 -0500 Subject: [PATCH 1629/2279] nodePackages.csslint: drop Per https://github.com/CSSLint/csslint/issues/754, upstream considers it abandoned --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 31 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 insertions(+), 34 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f5a94b70e1b1..e035e5540c69 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -130,6 +130,7 @@ mapAliases { create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01 create-react-native-app = throw "create-react-native-app was removed because it was deprecated. Upstream suggests using a framework for React Native."; # added 2024-12-08 inherit (pkgs) cspell; + csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07 dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 41ba101d9ee1..ff8c0016dab5 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -27,7 +27,6 @@ , "code-theme-converter" , "conventional-changelog-cli" , "cpy-cli" -, "csslint" , "dhcp" , "diff2html-cli" , "dotenv-vault" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 522a63354ee8..2797a4c22f76 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22326,15 +22326,6 @@ let sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="; }; }; - "parserlib-1.1.1" = { - name = "parserlib"; - packageName = "parserlib"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; - sha512 = "e1HbF3+7ASJ/uOZirg5/8ZfPljTh100auNterbHB8TUs5egciuWQ2eX/2al8ko0RdV9Xh/5jDei3jqJAmbTDcg=="; - }; - }; "parseuri-0.0.6" = { name = "parseuri"; packageName = "parseuri"; @@ -35893,28 +35884,6 @@ in bypassCache = true; reconstructLock = true; }; - csslint = nodeEnv.buildNodePackage { - name = "csslint"; - packageName = "csslint"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; - sha512 = "GXGpPqGIuEBKesM4bt2IKFrzDKpemh9wVZRHVuculUErar554QrXHOonhgkBOP3uiZzbAETz0N2A4oWlIoxPuw=="; - }; - dependencies = [ - sources."clone-2.1.2" - sources."parserlib-1.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CSSLint"; - homepage = "http://csslint.net/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 07f90ae7de94..87bdade1571e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -454,6 +454,7 @@ mapAliases { cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12 crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27 crystal_1_11 = throw "'crystal_1_11' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-09-04 + csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07 cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19 cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_11_0 = throw "CUDA 11.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f696fdac2c7..4db94cf2e714 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6403,8 +6403,6 @@ with pkgs; inherit (llvmPackages_18) llvm libclang; }; - inherit (nodePackages) csslint; - css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; cvise = python3Packages.callPackage ../development/tools/misc/cvise { From 6e50819df059da4c3b303232a018e9b3fa40fbae Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 21:30:22 -0500 Subject: [PATCH 1630/2279] nodePackages.elm-oracle: drop Per https://github.com/ElmCast/elm-oracle/issues/26, it doesn't support elm 0.19+ so it's not suitable for use today. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e035e5540c69..88df9e94825a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -139,6 +139,7 @@ mapAliases { eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; inherit (pkgs.elmPackages) elm-review; + elm-oracle = throw "'elm-oracle' has been removed, since it doesn't work with modern versions of Elm."; # Added 2025-11-07 emojione = throw "emojione was archived and abandoned upstream, so it has been removed"; # Added 2025-11-06 escape-string-regexp = throw "escape-string-regexp was removed because it provides no executable"; # added 2025-03-12 inherit (pkgs) eslint; # Added 2024-08-28 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ff8c0016dab5..56286fa21a41 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -31,7 +31,6 @@ , "diff2html-cli" , "dotenv-vault" , "elasticdump" -, "elm-oracle" , "emoj" , "esy" , "fast-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 2797a4c22f76..c7656243341c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -36487,24 +36487,6 @@ in bypassCache = true; reconstructLock = true; }; - elm-oracle = nodeEnv.buildNodePackage { - name = "elm-oracle"; - packageName = "elm-oracle"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz"; - sha512 = "DUtF7aAlrrgijSRB4tGMgx6qp1NAVJpUGL4cjret1f57DEf41s+iPLPHxEkPbLrIdYjtEBzvRP8mMph37quqmQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Query for information about values in elm source files"; - homepage = "https://github.com/ElmCast/elm-oracle#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; From 30a1aa928b31413911a4f14091d08c654eadf15b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 2 Nov 2025 20:19:53 -0600 Subject: [PATCH 1631/2279] vimPlugins.blink-cmp-yanky: init at 2025-06-24 Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 901c207e894c..a5b41d6cb4e6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1674,6 +1674,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-cmp-yanky = buildVimPlugin { + pname = "blink-cmp-yanky"; + version = "2025-06-24"; + src = fetchFromGitHub { + owner = "marcoSven"; + repo = "blink-cmp-yanky"; + rev = "473b987c2a7d80cca116f6faf087dba4dbfbb3c5"; + sha256 = "1m0bkvp0bccavw46b6ycmhmx5bn7nx3w4z27linhlqd5gmlr1j0d"; + }; + meta.homepage = "https://github.com/marcoSven/blink-cmp-yanky/"; + meta.hydraPlatforms = [ ]; + }; + blink-compat = buildVimPlugin { pname = "blink.compat"; version = "2025-05-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2f9a1713aa2a..f90e0cd8be91 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -314,6 +314,10 @@ assertNoAdditions { }; }); + blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + bluloco-nvim = super.bluloco-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 434460ee1101..374ebb957ea5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -127,6 +127,7 @@ https://github.com/erooke/blink-cmp-latex/,HEAD, https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD, https://github.com/ribru17/blink-cmp-spell/,HEAD, https://github.com/archie-judd/blink-cmp-words/,HEAD, +https://github.com/marcoSven/blink-cmp-yanky/,HEAD, https://github.com/fang2hou/blink-copilot/,HEAD, https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD, From ab2e50976ad9a41ac8b18b130ae1fd98df35480b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 2 Nov 2025 20:21:13 -0600 Subject: [PATCH 1632/2279] vimPlugins.blink-cmp-env: init at 2025-09-13 Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a5b41d6cb4e6..b368a32da8a6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1609,6 +1609,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-cmp-env = buildVimPlugin { + pname = "blink-cmp-env"; + version = "2025-09-13"; + src = fetchFromGitHub { + owner = "bydlw98"; + repo = "blink-cmp-env"; + rev = "99af62c1f9aa46005e8f50ad4ccee581946546ca"; + sha256 = "1wad8v0av1lfcfm8i07351n3zq41xil1fhfm8yj6kg96bk7cwk0c"; + }; + meta.homepage = "https://github.com/bydlw98/blink-cmp-env/"; + meta.hydraPlatforms = [ ]; + }; + blink-cmp-git = buildVimPlugin { pname = "blink-cmp-git"; version = "2025-10-09"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f90e0cd8be91..f714b498bbc6 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -314,6 +314,10 @@ assertNoAdditions { }; }); + blink-cmp-env = super.blink-cmp-env.overrideAttrs { + dependencies = [ self.blink-cmp ]; + }; + blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs { dependencies = [ self.blink-cmp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 374ebb957ea5..09ecd3b3976b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -122,6 +122,7 @@ https://github.com/Kaiser-Yang/blink-cmp-avante/,HEAD, https://github.com/disrupted/blink-cmp-conventional-commits/,HEAD, https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-dictionary/,HEAD, +https://github.com/bydlw98/blink-cmp-env/,HEAD, https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD, https://github.com/erooke/blink-cmp-latex/,HEAD, https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD, From 1c9bb8806ebb1cf27b7b89e8c4e6e8ffd4333b16 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 2 Nov 2025 20:27:19 -0600 Subject: [PATCH 1633/2279] vimPlugins.blink-cmp-tmux: init at 2025-05-23 Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b368a32da8a6..38c5683fc549 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1674,6 +1674,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-cmp-tmux = buildVimPlugin { + pname = "blink-cmp-tmux"; + version = "2025-05-23"; + src = fetchFromGitHub { + owner = "mgalliou"; + repo = "blink-cmp-tmux"; + rev = "4586c705b6f80b536c34a61ed0d3cd4d7f08322d"; + sha256 = "1d7kvpzjmasfk8lszwhpay46w1b11sas9s8542gdwqiv0l32dp7p"; + }; + meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/"; + meta.hydraPlatforms = [ ]; + }; + blink-cmp-words = buildVimPlugin { pname = "blink-cmp-words"; version = "2025-08-06"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 09ecd3b3976b..18cacb5659d8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -127,6 +127,7 @@ https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD, https://github.com/erooke/blink-cmp-latex/,HEAD, https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD, https://github.com/ribru17/blink-cmp-spell/,HEAD, +https://github.com/mgalliou/blink-cmp-tmux/,HEAD, https://github.com/archie-judd/blink-cmp-words/,HEAD, https://github.com/marcoSven/blink-cmp-yanky/,HEAD, https://github.com/fang2hou/blink-copilot/,HEAD, From 0304dd8deaa65378b9ece8b4e0bb0c4bdf6226c6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 7 Nov 2025 19:39:03 -0600 Subject: [PATCH 1634/2279] vimPlugins.blink-indent: init at 2025-11-07 Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 38c5683fc549..54d95e730d12 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1752,6 +1752,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + blink-indent = buildVimPlugin { + pname = "blink.indent"; + version = "2025-11-07"; + src = fetchFromGitHub { + owner = "Saghen"; + repo = "blink.indent"; + rev = "a8feeeae8510d16f26afbb5c81f2ad1ccea38d62"; + sha256 = "1qm8h8yfkwf79hnfwn18qmk3546qzr3b9qzr6038lnbf54gzvkff"; + }; + meta.homepage = "https://github.com/Saghen/blink.indent/"; + meta.hydraPlatforms = [ ]; + }; + blink-nerdfont-nvim = buildVimPlugin { pname = "blink-nerdfont.nvim"; version = "2025-02-06"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 18cacb5659d8..d3ec2a41bd9b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -135,6 +135,7 @@ https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, +https://github.com/Saghen/blink.indent/,HEAD, https://github.com/dundalek/bloat.nvim/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/uloco/bluloco.nvim/,, From 3fd513480b7b82e08d380b7d17aab35e8d3ccf42 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 21:41:08 -0500 Subject: [PATCH 1635/2279] nodePackages.fleek-cli: drop Upstream repo was removed, and upstream suggests using @fleekplatform/cli instead. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 516 ------------------ 4 files changed, 1 insertion(+), 518 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 88df9e94825a..a243f6601516 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -148,6 +148,7 @@ mapAliases { expo-cli = throw "expo-cli was removed because it was deprecated upstream. Use `npx expo` or eas-cli instead."; # added 2024-12-02 inherit (pkgs) firebase-tools; # added 2023-08-18 inherit (pkgs) fixjson; # added 2024-06-26 + fleek-cli = throw "'fleek-cli' was removed because the upstream source code repo has been deleted."; # Added 2025-11-07 flood = pkgs.flood; # Added 2023-07-25 inherit (pkgs) fx; # Added 2025-11-06 ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index f9b6ba23fbe8..a76a0b724ac8 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -21,7 +21,6 @@ fast-cli = "fast"; fauna-shell = "fauna"; fkill-cli = "fkill"; - fleek-cli = "fleek"; grunt-cli = "grunt"; gulp-cli = "gulp"; jsonlint = "jsonlint"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 56286fa21a41..5f6b001fcaf4 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -36,7 +36,6 @@ , "fast-cli" , "fauna-shell" , "fkill-cli" -, "fleek-cli" , "forever" , "grunt-cli" , "makam" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c7656243341c..c517d8aad594 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -741,24 +741,6 @@ let sha512 = "JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g=="; }; }; - "@ethereumjs/rlp-4.0.1" = { - name = "_at_ethereumjs_slash_rlp"; - packageName = "@ethereumjs/rlp"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz"; - sha512 = "tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw=="; - }; - }; - "@ethereumjs/util-8.1.0" = { - name = "_at_ethereumjs_slash_util"; - packageName = "@ethereumjs/util"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz"; - sha512 = "zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA=="; - }; - }; "@ewoudenberg/difflib-0.1.0" = { name = "_at_ewoudenberg_slash_difflib"; packageName = "@ewoudenberg/difflib"; @@ -1641,24 +1623,6 @@ let sha512 = "2SBN7A/iCVufTmuXdS+W1wY0MZaEyhxlme/NQTlXbTaYWaMGZJMso3YRBNKJJLE1T7NkxsvCVCp7/2QSh8k+JA=="; }; }; - "@noble/curves-1.4.2" = { - name = "_at_noble_slash_curves"; - packageName = "@noble/curves"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz"; - sha512 = "TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw=="; - }; - }; - "@noble/hashes-1.4.0" = { - name = "_at_noble_slash_hashes"; - packageName = "@noble/hashes"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz"; - sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="; - }; - }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -2433,33 +2397,6 @@ let sha512 = "bhtGJtetkiqyB/OR506ftC+o98xLQXnOlvFO/zbkTddkLgMdPpyOt2A9Fuu+z4OVigqBiLBkzmR8i0w8xUUAmw=="; }; }; - "@scure/base-1.1.9" = { - name = "_at_scure_slash_base"; - packageName = "@scure/base"; - version = "1.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz"; - sha512 = "8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg=="; - }; - }; - "@scure/bip32-1.4.0" = { - name = "_at_scure_slash_bip32"; - packageName = "@scure/bip32"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz"; - sha512 = "sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg=="; - }; - }; - "@scure/bip39-1.3.0" = { - name = "_at_scure_slash_bip39"; - packageName = "@scure/bip39"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz"; - sha512 = "disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ=="; - }; - }; "@sec-ant/readable-stream-0.4.1" = { name = "_at_sec-ant_slash_readable-stream"; packageName = "@sec-ant/readable-stream"; @@ -3081,15 +3018,6 @@ let sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA=="; }; }; - "@types/atob-2.1.4" = { - name = "_at_types_slash_atob"; - packageName = "@types/atob"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.4.tgz"; - sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; - }; - }; "@types/cli-progress-3.11.6" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; @@ -3234,15 +3162,6 @@ let sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/inquirer-6.5.0" = { - name = "_at_types_slash_inquirer"; - packageName = "@types/inquirer"; - version = "6.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-6.5.0.tgz"; - sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; - }; - }; "@types/is-empty-1.2.3" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; @@ -3504,15 +3423,6 @@ let sha512 = "Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg=="; }; }; - "@types/through-0.0.33" = { - name = "_at_types_slash_through"; - packageName = "@types/through"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz"; - sha512 = "HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ=="; - }; - }; "@types/triple-beam-1.3.5" = { name = "_at_types_slash_triple-beam"; packageName = "@types/triple-beam"; @@ -5871,15 +5781,6 @@ let sha512 = "Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="; }; }; - "binary-search-tree-0.2.5" = { - name = "binary-search-tree"; - packageName = "binary-search-tree"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz"; - sha512 = "CvNVKS6iXagL1uGwLagSXz1hzSMezxOuGnFi5FHGKqaTO3nPPWrAbyALUzK640j+xOTVm7lzD9YP8W1f/gvUdw=="; - }; - }; "bindings-1.5.0" = { name = "bindings"; packageName = "bindings"; @@ -5997,15 +5898,6 @@ let sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="; }; }; - "bn.js-4.11.6" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; - sha512 = "XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA=="; - }; - }; "bn.js-4.12.1" = { name = "bn.js"; packageName = "bn.js"; @@ -7896,15 +7788,6 @@ let sha512 = "Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg=="; }; }; - "command-exists-1.2.9" = { - name = "command-exists"; - packageName = "command-exists"; - version = "1.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz"; - sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; - }; - }; "commander-11.1.0" = { name = "commander"; packageName = "commander"; @@ -11371,33 +11254,6 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; - "ethereum-bloom-filters-1.2.0" = { - name = "ethereum-bloom-filters"; - packageName = "ethereum-bloom-filters"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.2.0.tgz"; - sha512 = "28hyiE7HVsWubqhpVLVmZXFd4ITeHi+BUu05o9isf0GUpMtzBUi+8/gFrGaGYzvGAJQmJ3JKj77Mk9G98T84rA=="; - }; - }; - "ethereum-cryptography-2.2.1" = { - name = "ethereum-cryptography"; - packageName = "ethereum-cryptography"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz"; - sha512 = "r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg=="; - }; - }; - "ethjs-unit-0.1.6" = { - name = "ethjs-unit"; - packageName = "ethjs-unit"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz"; - sha512 = "/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw=="; - }; - }; "event-emitter-0.3.5" = { name = "event-emitter"; packageName = "event-emitter"; @@ -15070,15 +14926,6 @@ let sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ=="; }; }; - "inversify-5.1.1" = { - name = "inversify"; - packageName = "inversify"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz"; - sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; - }; - }; "ip-1.1.9" = { name = "ip"; packageName = "ip"; @@ -15547,15 +15394,6 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; - "is-hex-prefixed-1.0.0" = { - name = "is-hex-prefixed"; - packageName = "is-hex-prefixed"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz"; - sha512 = "WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA=="; - }; - }; "is-hexadecimal-2.0.1" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; @@ -16960,15 +16798,6 @@ let sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="; }; }; - "jwt-decode-2.2.0" = { - name = "jwt-decode"; - packageName = "jwt-decode"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; - sha512 = "86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ=="; - }; - }; "k-bucket-0.6.0" = { name = "k-bucket"; packageName = "k-bucket"; @@ -17230,15 +17059,6 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "lie-3.1.1" = { - name = "lie"; - packageName = "lie"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; - sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw=="; - }; - }; "lie-3.3.0" = { name = "lie"; packageName = "lie"; @@ -17446,15 +17266,6 @@ let sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ=="; }; }; - "localforage-1.10.0" = { - name = "localforage"; - packageName = "localforage"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"; - sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; - }; - }; "locate-character-3.0.0" = { name = "locate-character"; packageName = "locate-character"; @@ -19094,15 +18905,6 @@ let sha512 = "viYIo9PefV+w9dvoIBh1gI44Mvx1BOk67B4BpC2QK77qdY0xZF0Q+vWLt/BII6cLkIc8rLmSIcJaB/OrXXKe1g=="; }; }; - "micro-ftch-0.3.1" = { - name = "micro-ftch"; - packageName = "micro-ftch"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz"; - sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg=="; - }; - }; "micromark-3.2.0" = { name = "micromark"; packageName = "micromark"; @@ -20426,15 +20228,6 @@ let sha512 = "zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA=="; }; }; - "nedb-1.8.0" = { - name = "nedb"; - packageName = "nedb"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz"; - sha512 = "ip7BJdyb5m+86ZbSb4y10FCCW9g35+U8bDRrZlAfCI6m4dKwEsQ5M52grcDcVK4Vm/vnPlDLywkyo3GliEkb5A=="; - }; - }; "negotiator-0.5.3" = { name = "negotiator"; packageName = "negotiator"; @@ -21183,15 +20976,6 @@ let sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; }; }; - "number-to-bn-1.7.0" = { - name = "number-to-bn"; - packageName = "number-to-bn"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz"; - sha512 = "wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig=="; - }; - }; "numeral-2.0.6" = { name = "numeral"; packageName = "numeral"; @@ -21570,15 +21354,6 @@ let sha512 = "mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw=="; }; }; - "open-7.4.2" = { - name = "open"; - packageName = "open"; - version = "7.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; - sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; - }; - }; "open-8.4.2" = { name = "open"; packageName = "open"; @@ -23559,15 +23334,6 @@ let sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; }; }; - "querystring-0.2.1" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz"; - sha512 = "wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="; - }; - }; "querystring-es3-0.2.1" = { name = "querystring-es3"; packageName = "querystring-es3"; @@ -24189,15 +23955,6 @@ let sha512 = "LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w=="; }; }; - "reflect-metadata-0.1.14" = { - name = "reflect-metadata"; - packageName = "reflect-metadata"; - version = "0.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz"; - sha512 = "ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A=="; - }; - }; "reftools-1.1.9" = { name = "reftools"; packageName = "reftools"; @@ -24954,24 +24711,6 @@ let sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA=="; }; }; - "request-promise-4.2.6" = { - name = "request-promise"; - packageName = "request-promise"; - version = "4.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz"; - sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ=="; - }; - }; - "request-promise-core-1.1.4" = { - name = "request-promise-core"; - packageName = "request-promise-core"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; - sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; - }; - }; "requestretry-7.1.0" = { name = "requestretry"; packageName = "requestretry"; @@ -27114,15 +26853,6 @@ let sha512 = "UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ=="; }; }; - "stealthy-require-1.1.1" = { - name = "stealthy-require"; - packageName = "stealthy-require"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; - }; - }; "stop-iteration-iterator-1.1.0" = { name = "stop-iteration-iterator"; packageName = "stop-iteration-iterator"; @@ -27564,15 +27294,6 @@ let sha512 = "aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw=="; }; }; - "strip-hex-prefix-1.0.0" = { - name = "strip-hex-prefix"; - packageName = "strip-hex-prefix"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz"; - sha512 = "q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A=="; - }; - }; "strip-indent-1.0.1" = { name = "strip-indent"; packageName = "strip-indent"; @@ -28977,15 +28698,6 @@ let sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="; }; }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha512 = "ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ=="; - }; - }; "underscore-1.6.0" = { name = "underscore"; packageName = "underscore"; @@ -29598,15 +29310,6 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "untildify-4.0.0" = { - name = "untildify"; - packageName = "untildify"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"; - sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="; - }; - }; "unzip-response-2.0.1" = { name = "unzip-response"; packageName = "unzip-response"; @@ -29796,15 +29499,6 @@ let sha512 = "qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw=="; }; }; - "utf8-3.0.0" = { - name = "utf8"; - packageName = "utf8"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz"; - sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="; - }; - }; "utif-2.0.1" = { name = "utif"; packageName = "utif"; @@ -30705,15 +30399,6 @@ let sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; }; }; - "web3-utils-1.10.4" = { - name = "web3-utils"; - packageName = "web3-utils"; - version = "1.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz"; - sha512 = "tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A=="; - }; - }; "webassemblyjs-1.11.1" = { name = "webassemblyjs"; packageName = "webassemblyjs"; @@ -37479,207 +37164,6 @@ in bypassCache = true; reconstructLock = true; }; - fleek-cli = nodeEnv.buildNodePackage { - name = "fleek-cli"; - packageName = "fleek-cli"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fleek-cli/-/fleek-cli-0.0.1.tgz"; - sha512 = "6TL8NcVoGh7q+1qO/uQ4d/YDAG+x8ddQctZILObjdNmztf9Dv8JI9X0l0U+fsDPTcytYjkw910UwW7uzzWGclA=="; - }; - dependencies = [ - sources."@ethereumjs/rlp-4.0.1" - sources."@ethereumjs/util-8.1.0" - sources."@noble/curves-1.4.2" - sources."@noble/hashes-1.4.0" - sources."@scure/base-1.1.9" - sources."@scure/bip32-1.4.0" - sources."@scure/bip39-1.3.0" - sources."@types/atob-2.1.4" - sources."@types/inquirer-6.5.0" - sources."@types/node-22.13.10" - sources."@types/through-0.0.33" - sources."ajv-6.12.6" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-1.0.10" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-0.2.10" - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-search-tree-0.2.5" - sources."bluebird-3.7.2" - sources."bn.js-5.2.1" - sources."camelcase-5.3.1" - sources."caseless-0.12.0" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-width-3.0.0" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."command-exists-1.2.9" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."decamelize-1.2.0" - sources."delayed-stream-1.0.0" - sources."dotenv-8.6.0" - sources."ecc-jsbn-0.1.2" - sources."emoji-regex-8.0.0" - ( - sources."encoding-0.1.13" - // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - } - ) - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."ethereum-bloom-filters-1.2.0" - sources."ethereum-cryptography-2.2.1" - ( - sources."ethjs-unit-0.1.6" - // { - dependencies = [ - sources."bn.js-4.11.6" - ]; - } - ) - sources."extend-3.0.2" - sources."external-editor-3.1.0" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."figures-3.2.0" - sources."find-up-4.1.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-9.1.0" - sources."get-caller-file-2.0.5" - sources."getpass-0.1.7" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-flag-4.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."immediate-3.0.6" - sources."inquirer-7.3.3" - sources."inversify-5.1.1" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-hex-prefixed-1.0.0" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."isstream-0.1.2" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.1.0" - sources."jsprim-1.4.2" - sources."jwt-decode-2.2.0" - sources."lie-3.1.1" - sources."localforage-1.10.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."micro-ftch-0.3.1" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."mute-stream-0.0.8" - sources."nedb-1.8.0" - sources."node-fetch-2.7.0" - ( - sources."number-to-bn-1.7.0" - // { - dependencies = [ - sources."bn.js-4.11.6" - ]; - } - ) - sources."oauth-sign-0.9.0" - sources."onetime-5.1.2" - sources."open-7.4.2" - sources."os-tmpdir-1.0.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."performance-now-2.1.0" - sources."psl-1.15.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."querystring-0.2.1" - sources."randombytes-2.1.0" - sources."reflect-metadata-0.1.14" - sources."request-2.88.2" - sources."request-promise-4.2.6" - sources."request-promise-core-1.1.4" - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."restore-cursor-3.1.0" - sources."run-async-2.4.1" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."sprintf-js-1.0.3" - sources."sshpk-1.18.0" - sources."stealthy-require-1.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-hex-prefix-1.0.0" - sources."supports-color-7.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tough-cookie-2.5.0" - sources."tr46-0.0.3" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-fest-0.21.3" - sources."underscore-1.4.4" - sources."undici-types-6.20.0" - sources."universalify-2.0.1" - sources."untildify-4.0.0" - sources."uri-js-4.4.1" - sources."utf8-3.0.0" - sources."uuid-3.4.0" - sources."verror-1.10.0" - sources."web3-utils-1.10.4" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-module-2.0.1" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fleek command line utilities"; - homepage = "https://github.com/fleekhq/fleek-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; From cb181c4fa9d839ac8d566b11d12633982895fa86 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:00 +0000 Subject: [PATCH 1636/2279] =?UTF-8?q?gnome-session:=2049.0=20=E2=86=92=204?= =?UTF-8?q?9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-session/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-session/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 7bc805c8bc09..b449a7b8b0cb 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "49.0"; + version = "49.1"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-WnViLmPRt1FFyevmfoKDZ6dfWs5LYjf2TlRmHmpUXvM="; + hash = "sha256-F5UQvjc2KNeb56xYk+nTpeqUnAhhfX0uId45DjIN8fY="; }; patches = [ From d5b69926e7362db23beab9fbf664c7cbd211cd5a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:03 +0000 Subject: [PATCH 1637/2279] =?UTF-8?q?gnome-control-center:=2049.0=20?= =?UTF-8?q?=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index ff6efb76a0d6..d5256787d8ff 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -76,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-pdjc4qAooAR+hnQ8J3J33os1oGPUSDNgSuo+ieqFn5c="; + hash = "sha256-VALv+PIxY6dV3sJJNmwbOmXoDw2mDwd0p0DR5YdG+Gk="; }; patches = [ From f52ad84f9b70ddb80d07f07b499edf2f42876176 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:03 +0000 Subject: [PATCH 1638/2279] =?UTF-8?q?gnome-sudoku:=2049.0=20=E2=86=92=2049?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/49.0...49.2 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-sudoku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 8ad06d26f85a..3ea2e4d2224e 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "49.0"; + version = "49.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-CzfN4geSLJpKiiIV4s3+nzL0AWHSi2An+aaRMCW1CrU="; + hash = "sha256-ymcPrHPZ5cPngz/aNVZxC0Ig22Qz577FCnEFYNp9uEA="; }; nativeBuildInputs = [ From c636014b49a70e495a97478ad74d09f2a771d03e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:15 +0000 Subject: [PATCH 1639/2279] =?UTF-8?q?gnome-maps:=2049.1=20=E2=86=92=2049.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/49.1...49.2 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-maps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index df2278c38256..709d32a47fef 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "49.1"; + version = "49.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-QG+qUc5zo/iWpKFTBX+gLqp4y4LUjxHbRECDCUl1a+w="; + hash = "sha256-dd4/kCjDInLTbgnbqhG/3myFz3USCGVdO6RIJo08PzA="; }; doCheck = !stdenv.hostPlatform.isDarwin; From c4cefac8dd3cfd2d73999ba705bfc7a863ed4968 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:16 +0000 Subject: [PATCH 1640/2279] =?UTF-8?q?gnome-system-monitor:=2049.0=20?= =?UTF-8?q?=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-system-monitor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index 4bb82e4f716b..6a5ea9560478 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-system-monitor"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz"; - hash = "sha256-3MhE3XDkoHfwZlJNvRT5z+BLCYMdcLfWmlGBZyPNSqA="; + hash = "sha256-kVtqMhraEuunv1eMIMn+XkH1XVMoR8vRJLvdquwR1w8="; }; patches = [ From 569cd32f56b932fd729d4517b03910e1063511fd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:20 +0000 Subject: [PATCH 1641/2279] =?UTF-8?q?gnome-usage:=2048.rc=20=E2=86=92=2048?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-usage/-/compare/48.rc...48.0 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-usage/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-usage/package.nix b/pkgs/by-name/gn/gnome-usage/package.nix index 059aadd85b82..9bcbb5d885c0 100644 --- a/pkgs/by-name/gn/gnome-usage/package.nix +++ b/pkgs/by-name/gn/gnome-usage/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-usage"; - version = "48.rc"; + version = "48.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-usage/${lib.versions.major finalAttrs.version}/gnome-usage-${finalAttrs.version}.tar.xz"; - hash = "sha256-LUbc2QcKkY/sMUdxaaQDI2CdCFa5XHo3wBusqULTk+w="; + hash = "sha256-UB3jxtTWU9Wc4NcHdY3M+D3D6oGi7RSS0vMzFi/uChc="; }; nativeBuildInputs = [ From 006a6b82db0b5cc51508226f3cc8229c7108e97a Mon Sep 17 00:00:00 2001 From: Aether Chen <15167799+chenjunyu19@users.noreply.github.com> Date: Sat, 8 Nov 2025 10:58:03 +0800 Subject: [PATCH 1642/2279] mihomo: 1.19.11 -> 1.19.15 --- pkgs/by-name/mi/mihomo/package.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 7ac8cdbdb218..917d06708271 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -8,29 +8,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.11"; + version = "1.19.15"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-nt2bnfKzGU+6gUaSqHfnbCnWLMDoAcISmlNYFeM4Xu8="; + hash = "sha256-WygZtgXikBq7jhXeppDD74WcV9STxUviQqx8Cz1R0X4="; }; - patches = [ - # https://github.com/MetaCubeX/mihomo/pull/2178 - (fetchpatch { - url = "https://github.com/MetaCubeX/mihomo/commit/63ad95e10f40ffc90ec93497aac562765af7a471.patch"; - hash = "sha256-ZE2dlr0t//Q1CVy2ql/TWuLEALdF1ZCYTOVK87bKWQg="; - }) - # https://github.com/MetaCubeX/mihomo/pull/2177 - (fetchpatch { - url = "https://github.com/MetaCubeX/mihomo/commit/b06ec5bef810ec8d009f52428188440df0484ce4.patch"; - hash = "sha256-XQhlST4pa//+Bg5hWc2zADulz8FeEiHwB99Rw9o24b0="; - }) - ]; - - vendorHash = "sha256-k/Zjnq07+Sg+dwwcAf+ziInaDvlXn3bEG+QuxZ5lcM8="; + vendorHash = "sha256-t+v+szM5uXRy173tAtRf+IqiGNHaL6nNRgf6OZmeJyQ="; excludedPackages = [ "./test" ]; From 12581902ee344c2dac8b1f5de7dc176ab6a31c69 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 21:59:17 -0500 Subject: [PATCH 1643/2279] nodePackages.lua-fmt: drop Has critical issues like https://github.com/trixnz/lua-fmt/issues/40 unresolved --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 57 ------------------- 4 files changed, 1 insertion(+), 59 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index a243f6601516..6cdd91a76d8f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -197,6 +197,7 @@ mapAliases { less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18 + lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07 inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index a76a0b724ac8..d14d6c6d4f76 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -25,7 +25,6 @@ gulp-cli = "gulp"; jsonlint = "jsonlint"; localtunnel = "lt"; - lua-fmt = "luafmt"; parsoid = "parse.js"; poor-mans-t-sql-formatter-cli = "sqlformat"; pulp = "pulp"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 5f6b001fcaf4..a31bd4338de3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -54,7 +54,6 @@ , "live-server" , "livedown" , "localtunnel" -, "lua-fmt" , "madoko" , "mastodon-bot" , "mathjax" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c517d8aad594..1fd49733541d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3027,15 +3027,6 @@ let sha512 = "cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA=="; }; }; - "@types/commander-2.12.5" = { - name = "_at_types_slash_commander"; - packageName = "@types/commander"; - version = "2.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/commander/-/commander-2.12.5.tgz"; - sha512 = "YXGZ/rz+s57VbzcvEV9fUoXeJlBt5HaKu5iUheiIWNsJs23bz6AnRuRiZBRVBLYyPnixNvVnuzM5pSaxr8Yp/g=="; - }; - }; "@types/concat-stream-2.0.3" = { name = "_at_types_slash_concat-stream"; packageName = "@types/concat-stream"; @@ -3072,15 +3063,6 @@ let sha512 = "vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="; }; }; - "@types/diff-3.5.8" = { - name = "_at_types_slash_diff"; - packageName = "@types/diff"; - version = "3.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.8.tgz"; - sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A=="; - }; - }; "@types/es-aggregate-error-1.0.6" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; @@ -18157,16 +18139,6 @@ let sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; - "luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" = { - name = "luaparse"; - packageName = "luaparse"; - version = "0.2.1"; - src = fetchgit { - url = "https://github.com/oxyc/luaparse"; - rev = "ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802"; - sha256 = "f813d671f8f8088d70d29f7a7770bdd5ed41ed97240ae9346d7ced0c094ee049"; - }; - }; "lunr-2.3.9" = { name = "lunr"; packageName = "lunr"; @@ -39267,35 +39239,6 @@ in bypassCache = true; reconstructLock = true; }; - lua-fmt = nodeEnv.buildNodePackage { - name = "lua-fmt"; - packageName = "lua-fmt"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lua-fmt/-/lua-fmt-2.6.0.tgz"; - sha512 = "J4D7TK+BhSJ9ePQPpZPlu/aHE3X9ojN+D7DNv1HXZPryBJ74XWVmXpRX+qceXdE15TUsQRCj9w81waVOOFhfWA=="; - }; - dependencies = [ - sources."@types/commander-2.12.5" - sources."@types/diff-3.5.8" - sources."@types/get-stdin-5.0.1" - sources."@types/node-22.13.10" - sources."commander-2.20.3" - sources."diff-3.5.0" - sources."get-stdin-5.0.1" - sources."luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" - sources."undici-types-6.20.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Format Lua code"; - homepage = "https://github.com/trixnz/lua-fmt"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; From af892a833bbd5b61700f4409bd96afbd708eb9d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 03:03:04 +0000 Subject: [PATCH 1644/2279] cargo-semver-checks: 0.44.0 -> 0.45.0 --- pkgs/by-name/ca/cargo-semver-checks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index a9c71a50977f..9c5470d90d9f 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = "cargo-semver-checks"; tag = "v${version}"; - hash = "sha256-QU8vLdq129gcGi8/VfjflY6zkIXXam/Ri2zjbO3sPNg="; + hash = "sha256-sDx449IXsFUeNL7rXbGC+HUshwqcbpjvGwl0WIJZmwo="; }; - cargoHash = "sha256-0oPAIhhBcCwZT8sD2PWJ5ZDuMMFvmwxhyOXJWA9+jZg="; + cargoHash = "sha256-meF1qnISB60JXKZyYfnwE2LywGqKEVgZbwzZQEZ1Cmc="; nativeBuildInputs = [ cmake From 116053535452418a9b1a84a1e51fc9075c5c4ee5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 03:13:54 +0000 Subject: [PATCH 1645/2279] xk6: 1.2.3 -> 1.2.4 --- pkgs/by-name/xk/xk6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index 8d5f57ef048f..69253d2c1a8b 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-he6m5mkQ5Pp8hWPEU+/PD/ADCk0AQOyTAO8CVeNUa8o="; + hash = "sha256-c3MpvHWLCUWTY/oE143wVvZlddpMR/rdte2yUndAXNE="; }; vendorHash = null; From c1fca80784c9b484652decc7468eebc4913dfbf1 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 22:18:11 -0500 Subject: [PATCH 1646/2279] nodePackages.mastodon-bot: drop Upstream repo is archived --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 1354 ----------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 2 insertions(+), 1357 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6cdd91a76d8f..564ae2e7e67b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -204,6 +204,7 @@ mapAliases { markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 inherit (pkgs) mathjax-node-cli; # added 2023-11-02 + mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 meat = throw "meat was removed because it was abandoned upstream."; # Added 2025-10-20 inherit (pkgs) mermaid-cli; # added 2023-10-01 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a31bd4338de3..3bbfa908f887 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -55,7 +55,6 @@ , "livedown" , "localtunnel" , "madoko" -, "mastodon-bot" , "mathjax" , "multi-file-swagger" , "nijs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1fd49733541d..5bff2d74950f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4125,24 +4125,6 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha512 = "OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw=="; - }; - }; - "acorn-5.7.4" = { - name = "acorn"; - packageName = "acorn"; - version = "5.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz"; - sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="; - }; - }; "acorn-6.4.2" = { name = "acorn"; packageName = "acorn"; @@ -4179,15 +4161,6 @@ let sha512 = "n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ=="; }; }; - "acorn-jsx-3.0.1" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; - sha512 = "AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ=="; - }; - }; "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -4350,15 +4323,6 @@ let sha512 = "oQFi0K+TLDpw8vTeDnkX1opLEGPJ03OeT5dKzYqPHf6JjuaYmXoNdc5GQhZDF+IzX8ypWvYZ/NbftabNU02dkA=="; }; }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha512 = "I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ=="; - }; - }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -4440,15 +4404,6 @@ let sha512 = "8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="; }; }; - "ajv-keywords-1.5.1" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; - sha512 = "vuBv+fm2s6cqUyey2A7qYcvsik+GMDJsw8BARP2sDE76cqmaZVarsvHf7Vx6VJ0Xk8gLl+u3MoAPf6gKzJefeA=="; - }; - }; "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; @@ -4476,15 +4431,6 @@ let sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; }; - "ansi-escapes-1.4.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; - sha512 = "wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw=="; - }; - }; "ansi-escapes-3.2.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -4530,15 +4476,6 @@ let sha512 = "GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw=="; }; }; - "ansi-gray-0.1.1" = { - name = "ansi-gray"; - packageName = "ansi-gray"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; - sha512 = "HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw=="; - }; - }; "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -4629,15 +4566,6 @@ let sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; }; }; - "ansi-wrap-0.1.0" = { - name = "ansi-wrap"; - packageName = "ansi-wrap"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"; - sha512 = "ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw=="; - }; - }; "ansicolors-0.3.2" = { name = "ansicolors"; packageName = "ansicolors"; @@ -4935,15 +4863,6 @@ let sha512 = "LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw=="; }; }; - "array-differ-1.0.0" = { - name = "array-differ"; - packageName = "array-differ"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; - sha512 = "LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ=="; - }; - }; "array-differ-3.0.0" = { name = "array-differ"; packageName = "array-differ"; @@ -5052,15 +4971,6 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "array-uniq-1.0.3" = { - name = "array-uniq"; - packageName = "array-uniq"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha512 = "MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q=="; - }; - }; "array-unique-0.2.1" = { name = "array-unique"; packageName = "array-unique"; @@ -5502,15 +5412,6 @@ let sha512 = "OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg=="; }; }; - "babel-code-frame-6.26.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g=="; - }; - }; "babybird-0.0.1" = { name = "babybird"; packageName = "babybird"; @@ -5664,15 +5565,6 @@ let sha512 = "KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg=="; }; }; - "beeper-1.1.1" = { - name = "beeper"; - packageName = "beeper"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; - sha512 = "3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA=="; - }; - }; "bencode-0.7.0" = { name = "bencode"; packageName = "bencode"; @@ -6375,15 +6267,6 @@ let sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="; }; }; - "bufferstreams-1.1.3" = { - name = "bufferstreams"; - packageName = "bufferstreams"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz"; - sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg=="; - }; - }; "bufferutil-4.0.9" = { name = "bufferutil"; packageName = "bufferutil"; @@ -6627,15 +6510,6 @@ let sha512 = "n+21IZC3j06YpCWaxmUy5AnVqhmCIM2bQtqQyy00HJlmStRt6kwDX5F9Z97pqwAB+G/tgSz6q/kUBbNyQzIubw=="; }; }; - "caller-path-0.1.0" = { - name = "caller-path"; - packageName = "caller-path"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"; - sha512 = "UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g=="; - }; - }; "callsite-1.0.0" = { name = "callsite"; packageName = "callsite"; @@ -6654,15 +6528,6 @@ let sha512 = "OqeheDucGKifjQRx524URgV4z4NaKjocGhygTptDea+DLROre4ZEecA4KXDq+P7qlGCohYVNOh3qr+y5XH5Ftg=="; }; }; - "callsites-0.2.0" = { - name = "callsites"; - packageName = "callsites"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"; - sha512 = "Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A=="; - }; - }; "callsites-3.1.0" = { name = "callsites"; packageName = "callsites"; @@ -7149,15 +7014,6 @@ let sha512 = "3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw=="; }; }; - "circular-json-0.3.3" = { - name = "circular-json"; - packageName = "circular-json"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; - sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; - }; - }; "cjs-module-lexer-1.2.3" = { name = "cjs-module-lexer"; packageName = "cjs-module-lexer"; @@ -7239,15 +7095,6 @@ let sha512 = "/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="; }; }; - "cli-cursor-1.0.2" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; - sha512 = "25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A=="; - }; - }; "cli-cursor-2.1.0" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -7491,15 +7338,6 @@ let sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; }; }; - "clone-stats-0.0.1" = { - name = "clone-stats"; - packageName = "clone-stats"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; - sha512 = "dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA=="; - }; - }; "clsx-2.1.1" = { name = "clsx"; packageName = "clsx"; @@ -8860,15 +8698,6 @@ let sha512 = "w8a8nQk9YSCkMmH2wDbFqpH1XMz7l409mSvWnnG6Iu6D0Ydhvq61XASE7QIaA46FxfG2Ag524ZuGgAy2cXPfsw=="; }; }; - "d-1.0.2" = { - name = "d"; - packageName = "d"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.2.tgz"; - sha512 = "MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw=="; - }; - }; "d3-array-3.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -9121,24 +8950,6 @@ let sha512 = "39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="; }; }; - "dateformat-2.2.0" = { - name = "dateformat"; - packageName = "dateformat"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"; - sha512 = "GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw=="; - }; - }; - "deasync-0.1.20" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.20"; - src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz"; - sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; - }; - }; "debounce-fn-5.1.2" = { name = "debounce-fn"; packageName = "debounce-fn"; @@ -9364,15 +9175,6 @@ let sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA=="; }; }; - "deep-extend-0.5.1" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; - sha512 = "N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w=="; - }; - }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -9904,15 +9706,6 @@ let sha512 = "6GYP/EdzEY50HaOxTVTJ2p+mB5xDHTMJhS+UoGrVyS6VC+iQRh7kZ4FRpUYq6nziby7hPqWhOrFFUFTMUZJJ5w=="; }; }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; "dom-serializer-0.2.2" = { name = "dom-serializer"; packageName = "dom-serializer"; @@ -10138,15 +9931,6 @@ let sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha512 = "+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g=="; - }; - }; "duplexer2-0.1.4" = { name = "duplexer2"; packageName = "duplexer2"; @@ -10642,33 +10426,6 @@ let sha512 = "X13Q/ZSc+vsO1q600bvNK4bxgXMkHcf//RxCmYDaRY5DAcT+eoXjY5hoAPGMdRnWQjvyLEcyauG3b6hz76LNqg=="; }; }; - "es5-ext-0.10.64" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.64"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz"; - sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg=="; - }; - }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha512 = "zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g=="; - }; - }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha512 = "mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A=="; - }; - }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -10696,33 +10453,6 @@ let sha512 = "C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ=="; }; }; - "es6-set-0.1.6" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz"; - sha512 = "TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw=="; - }; - }; - "es6-symbol-3.1.4" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz"; - sha512 = "U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg=="; - }; - }; - "es6-weak-map-2.0.3" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; - sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; - }; - }; "esbuild-0.14.47" = { name = "esbuild"; packageName = "esbuild"; @@ -11029,24 +10759,6 @@ let sha512 = "2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w=="; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha512 = "75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ=="; - }; - }; - "eslint-3.19.0" = { - name = "eslint"; - packageName = "eslint"; - version = "3.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha512 = "x6LJGXWCGB/4YOBhL48yeppZTo+YQUNC37N5qqCpC1b1kkNzydlQHQAtPuUSFoZSxgIadrysQoW2Hq602P+uEA=="; - }; - }; "eslint-9.22.0" = { name = "eslint"; packageName = "eslint"; @@ -11110,15 +10822,6 @@ let sha512 = "Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA=="; }; }; - "esniff-2.0.1" = { - name = "esniff"; - packageName = "esniff"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz"; - sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="; - }; - }; "espree-10.3.0" = { name = "espree"; packageName = "espree"; @@ -11128,15 +10831,6 @@ let sha512 = "0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg=="; }; }; - "espree-3.5.4" = { - name = "espree"; - packageName = "espree"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz"; - sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; - }; - }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -11173,15 +10867,6 @@ let sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; - "estraverse-4.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - }; "estraverse-5.3.0" = { name = "estraverse"; packageName = "estraverse"; @@ -11236,15 +10921,6 @@ let sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; - }; - }; "event-stream-3.1.7" = { name = "event-stream"; packageName = "event-stream"; @@ -11407,15 +11083,6 @@ let sha512 = "c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="; }; }; - "exit-hook-1.1.1" = { - name = "exit-hook"; - packageName = "exit-hook"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; - sha512 = "MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg=="; - }; - }; "exit-hook-4.0.0" = { name = "exit-hook"; packageName = "exit-hook"; @@ -11497,15 +11164,6 @@ let sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg=="; }; }; - "ext-1.7.0" = { - name = "ext"; - packageName = "ext"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz"; - sha512 = "6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -11632,15 +11290,6 @@ let sha512 = "GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ=="; }; }; - "fancy-log-1.3.3" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"; - sha512 = "k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw=="; - }; - }; "fast-csv-4.3.6" = { name = "fast-csv"; packageName = "fast-csv"; @@ -11911,15 +11560,6 @@ let sha512 = "d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg=="; }; }; - "file-entry-cache-2.0.0" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; - sha512 = "uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w=="; - }; - }; "file-entry-cache-8.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -12226,15 +11866,6 @@ let sha512 = "Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA=="; }; }; - "flat-cache-1.3.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz"; - sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg=="; - }; - }; "flat-cache-4.0.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -12694,24 +12325,6 @@ let sha512 = "vli3D2RYpLW6XhryNrv7HMjFNbj+ks/CCVDjokxOtZ+p6QYRadj8Zc0ps+LolSsh/I97XO0OduP/ShOej08clA=="; }; }; - "generate-function-2.3.1" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; - sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ=="; - }; - }; "generic-pool-3.4.2" = { name = "generic-pool"; packageName = "generic-pool"; @@ -13243,15 +12856,6 @@ let sha512 = "oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="; }; }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; - }; - }; "globby-11.1.0" = { name = "globby"; packageName = "globby"; @@ -13288,15 +12892,6 @@ let sha512 = "OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg=="; }; }; - "glogg-1.0.2" = { - name = "glogg"; - packageName = "glogg"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"; - sha512 = "5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA=="; - }; - }; "glogg-2.2.0" = { name = "glogg"; packageName = "glogg"; @@ -13423,33 +13018,6 @@ let sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; - "gulp-eslint-3.0.1" = { - name = "gulp-eslint"; - packageName = "gulp-eslint"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-3.0.1.tgz"; - sha512 = "lNEEIgxKyzbjlq/kDfdS06KI+rEhfnWGd6xbMaiCP20jF5sZ/quQsuK7LZRMnQrAuUQ6MbyuYWamtgGp65440Q=="; - }; - }; - "gulp-util-3.0.8" = { - name = "gulp-util"; - packageName = "gulp-util"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; - sha512 = "q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw=="; - }; - }; - "gulplog-1.0.0" = { - name = "gulplog"; - packageName = "gulplog"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"; - sha512 = "hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw=="; - }; - }; "gulplog-2.2.0" = { name = "gulplog"; packageName = "gulplog"; @@ -13576,15 +13144,6 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-gulplog-0.1.0" = { - name = "has-gulplog"; - packageName = "has-gulplog"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; - sha512 = "+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw=="; - }; - }; "has-own-prop-2.0.0" = { name = "has-own-prop"; packageName = "has-own-prop"; @@ -14323,15 +13882,6 @@ let sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-3.3.10" = { - name = "ignore"; - packageName = "ignore"; - version = "3.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; - sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; - }; - }; "ignore-5.1.9" = { name = "ignore"; packageName = "ignore"; @@ -14746,15 +14296,6 @@ let sha512 = "ZC410b7IbrTrmt8bQb27xUOJgXkJu+XL6MVncb9FGyxjRIHyQqNjpSDY20zvSUttkAiYj0dait/67/sXyWvwYg=="; }; }; - "inquirer-0.12.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha512 = "bOetEz5+/WpgaW4D1NYOk1aD+JCqRjqu/FwRFgnIfiP7FC/zinsrfyO1vlS3nyH/R7S0IH3BIHBu4DBIDSqiGQ=="; - }; - }; "inquirer-12.4.3" = { name = "inquirer"; packageName = "inquirer"; @@ -15448,24 +14989,6 @@ let sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="; }; }; - "is-my-ip-valid-1.0.1" = { - name = "is-my-ip-valid"; - packageName = "is-my-ip-valid"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz"; - sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg=="; - }; - }; - "is-my-json-valid-2.20.6" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.20.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz"; - sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw=="; - }; - }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -15691,15 +15214,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha512 = "Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="; - }; - }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -15736,15 +15250,6 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; - "is-resolvable-1.1.0" = { - name = "is-resolvable"; - packageName = "is-resolvable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; - }; - }; "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; @@ -16537,15 +16042,6 @@ let sha512 = "nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw=="; }; }; - "json-stable-stringify-1.2.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz"; - sha512 = "Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA=="; - }; - }; "json-stable-stringify-without-jsonify-1.0.1" = { name = "json-stable-stringify-without-jsonify"; packageName = "json-stable-stringify-without-jsonify"; @@ -16672,15 +16168,6 @@ let sha512 = "8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA=="; }; }; - "jsonpointer-5.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz"; - sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; - }; - }; "jsonschema-1.5.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -17023,15 +16510,6 @@ let sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; }; }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - }; "levn-0.4.1" = { name = "levn"; packageName = "levn"; @@ -17311,15 +16789,6 @@ let sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; - "lodash._basecopy-3.0.1" = { - name = "lodash._basecopy"; - packageName = "lodash._basecopy"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; - sha512 = "rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ=="; - }; - }; "lodash._baseiteratee-4.7.0" = { name = "lodash._baseiteratee"; packageName = "lodash._baseiteratee"; @@ -17329,15 +16798,6 @@ let sha512 = "nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ=="; }; }; - "lodash._basetostring-3.0.1" = { - name = "lodash._basetostring"; - packageName = "lodash._basetostring"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"; - sha512 = "mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA=="; - }; - }; "lodash._basetostring-4.12.0" = { name = "lodash._basetostring"; packageName = "lodash._basetostring"; @@ -17356,15 +16816,6 @@ let sha512 = "Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A=="; }; }; - "lodash._basevalues-3.0.0" = { - name = "lodash._basevalues"; - packageName = "lodash._basevalues"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"; - sha512 = "H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg=="; - }; - }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -17374,42 +16825,6 @@ let sha512 = "GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA=="; }; }; - "lodash._getnative-3.9.1" = { - name = "lodash._getnative"; - packageName = "lodash._getnative"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha512 = "RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA=="; - }; - }; - "lodash._isiterateecall-3.0.9" = { - name = "lodash._isiterateecall"; - packageName = "lodash._isiterateecall"; - version = "3.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; - sha512 = "De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ=="; - }; - }; - "lodash._reescape-3.0.0" = { - name = "lodash._reescape"; - packageName = "lodash._reescape"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"; - sha512 = "Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ=="; - }; - }; - "lodash._reevaluate-3.0.0" = { - name = "lodash._reevaluate"; - packageName = "lodash._reevaluate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"; - sha512 = "OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w=="; - }; - }; "lodash._reinterpolate-3.0.0" = { name = "lodash._reinterpolate"; packageName = "lodash._reinterpolate"; @@ -17419,15 +16834,6 @@ let sha512 = "xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="; }; }; - "lodash._root-3.0.1" = { - name = "lodash._root"; - packageName = "lodash._root"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"; - sha512 = "O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ=="; - }; - }; "lodash._stringtopath-4.8.0" = { name = "lodash._stringtopath"; packageName = "lodash._stringtopath"; @@ -17491,15 +16897,6 @@ let sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="; }; }; - "lodash.escape-3.2.0" = { - name = "lodash.escape"; - packageName = "lodash.escape"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"; - sha512 = "n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ=="; - }; - }; "lodash.escaperegexp-4.1.2" = { name = "lodash.escaperegexp"; packageName = "lodash.escaperegexp"; @@ -17536,24 +16933,6 @@ let sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; - }; - }; - "lodash.isarray-3.0.4" = { - name = "lodash.isarray"; - packageName = "lodash.isarray"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha512 = "JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ=="; - }; - }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -17671,15 +17050,6 @@ let sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; }; }; - "lodash.keys-3.1.2" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha512 = "CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ=="; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -17725,15 +17095,6 @@ let sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; - "lodash.restparam-3.6.1" = { - name = "lodash.restparam"; - packageName = "lodash.restparam"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"; - sha512 = "L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw=="; - }; - }; "lodash.snakecase-4.1.1" = { name = "lodash.snakecase"; packageName = "lodash.snakecase"; @@ -17752,15 +17113,6 @@ let sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg=="; }; }; - "lodash.template-3.6.2" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"; - sha512 = "0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ=="; - }; - }; "lodash.template-4.5.0" = { name = "lodash.template"; packageName = "lodash.template"; @@ -17770,15 +17122,6 @@ let sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; }; }; - "lodash.templatesettings-3.1.1" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"; - sha512 = "TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ=="; - }; - }; "lodash.templatesettings-4.2.0" = { name = "lodash.templatesettings"; packageName = "lodash.templatesettings"; @@ -18364,15 +17707,6 @@ let sha512 = "PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A=="; }; }; - "mastodon-api-1.3.0" = { - name = "mastodon-api"; - packageName = "mastodon-api"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mastodon-api/-/mastodon-api-1.3.0.tgz"; - sha512 = "h1S0f3HzPtaNTaIBXu/3PVsXhKgZGk9DYrqp+bNZwp1wjYhJnEKggossj+DCCQ72+2y3Kcd7fNP2cEkp9jK6Ig=="; - }; - }; "math-intrinsics-1.1.0" = { name = "math-intrinsics"; packageName = "math-intrinsics"; @@ -20020,15 +19354,6 @@ let sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ=="; }; }; - "multipipe-0.1.2" = { - name = "multipipe"; - packageName = "multipipe"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"; - sha512 = "7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q=="; - }; - }; "mute-stdout-2.0.0" = { name = "mute-stdout"; packageName = "mute-stdout"; @@ -20038,15 +19363,6 @@ let sha512 = "32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ=="; }; }; - "mute-stream-0.0.5" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"; - sha512 = "EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg=="; - }; - }; "mute-stream-0.0.7" = { name = "mute-stream"; packageName = "mute-stream"; @@ -20309,15 +19625,6 @@ let sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="; }; }; - "next-tick-1.1.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"; - sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; - }; - }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -20417,15 +19724,6 @@ let sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; - "node-addon-api-1.7.2" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; - }; - }; "node-addon-api-4.3.0" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -20462,15 +19760,6 @@ let sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A=="; }; }; - "node-fetch-2.6.1" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; - }; - }; "node-fetch-2.6.7" = { name = "node-fetch"; packageName = "node-fetch"; @@ -21002,15 +20291,6 @@ let sha512 = "cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw=="; }; }; - "oauth-0.9.15" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.15"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; - sha512 = "a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA=="; - }; - }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -21020,15 +20300,6 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-assign-3.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; - sha512 = "jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ=="; - }; - }; "object-assign-4.1.1" = { name = "object-assign"; packageName = "object-assign"; @@ -21236,15 +20507,6 @@ let sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; - "onetime-1.1.0" = { - name = "onetime"; - packageName = "onetime"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; - sha512 = "GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A=="; - }; - }; "onetime-2.0.1" = { name = "onetime"; packageName = "onetime"; @@ -21416,15 +20678,6 @@ let sha512 = "snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g=="; }; }; - "optionator-0.8.3" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - }; "optionator-0.9.4" = { name = "optionator"; packageName = "optionator"; @@ -22010,15 +21263,6 @@ let sha512 = "TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw=="; }; }; - "parse-node-version-1.0.1" = { - name = "parse-node-version"; - packageName = "parse-node-version"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"; - sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; - }; - }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -22208,15 +21452,6 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "path-is-inside-1.0.2" = { - name = "path-is-inside"; - packageName = "path-is-inside"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="; - }; - }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -22658,15 +21893,6 @@ let sha512 = "4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg=="; }; }; - "pluralize-1.2.1" = { - name = "pluralize"; - packageName = "pluralize"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha512 = "TH+BeeL6Ct98C7as35JbZLf8lgsRzlNJb5gklRIGHKaPkGl1esOKBc5ALUMd+q08Sr6tiEKM+Icbsxg5vuhMKQ=="; - }; - }; "pluralize-8.0.0" = { name = "pluralize"; packageName = "pluralize"; @@ -22802,15 +22028,6 @@ let sha512 = "lEHd+yEm22jXdCphDrkvIJQU66EuLojPPtvZkpKIkiD+l0DMThF/niqZKJSoU8Vl7iuvtmzyMhir9LdVy5WMnA=="; }; }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - }; "prelude-ls-1.2.1" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -22964,15 +22181,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "progress-1.1.8" = { - name = "progress"; - packageName = "progress"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; - sha512 = "UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw=="; - }; - }; "progress-2.0.3" = { name = "progress"; packageName = "progress"; @@ -23837,24 +23045,6 @@ let sha512 = "GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg=="; }; }; - "readline-1.3.0" = { - name = "readline"; - packageName = "readline"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz"; - sha512 = "k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="; - }; - }; - "readline2-1.0.1" = { - name = "readline2"; - packageName = "readline2"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; - sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g=="; - }; - }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -24638,15 +23828,6 @@ let sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A=="; }; }; - "replace-ext-0.0.1" = { - name = "replace-ext"; - packageName = "replace-ext"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; - sha512 = "AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ=="; - }; - }; "replace-homedir-2.0.0" = { name = "replace-homedir"; packageName = "replace-homedir"; @@ -24656,15 +23837,6 @@ let sha512 = "bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw=="; }; }; - "request-2.88.0" = { - name = "request"; - packageName = "request"; - version = "2.88.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; - }; - }; "request-2.88.2" = { name = "request"; packageName = "request"; @@ -24728,15 +23900,6 @@ let sha512 = "uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q=="; }; }; - "require-uncached-1.0.3" = { - name = "require-uncached"; - packageName = "require-uncached"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; - sha512 = "Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w=="; - }; - }; "requirejs-2.3.7" = { name = "requirejs"; packageName = "requirejs"; @@ -24809,15 +23972,6 @@ let sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="; }; }; - "resolve-from-1.0.1" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; - sha512 = "kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg=="; - }; - }; "resolve-from-2.0.0" = { name = "resolve-from"; packageName = "resolve-from"; @@ -24899,15 +24053,6 @@ let sha512 = "Wj+p3Y+5KFv+bzb7X+4H+RKaITS7y84xhR8KH1BfytpX6K1mnUVDqq2Kp0/jk/awSDQrWrkLtf0gzWfsmT1zcg=="; }; }; - "restore-cursor-1.0.1" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha512 = "reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw=="; - }; - }; "restore-cursor-2.0.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -25142,15 +24287,6 @@ let sha512 = "jFvBgyRueGU0QVa7EqXZOkarkzrqEnF3VTCzATRcBkzxXJ4/+pzDf1iouqOqGsx6ZpnIIu5gvFDGnyzoX58ldQ=="; }; }; - "rss-parser-3.7.1" = { - name = "rss-parser"; - packageName = "rss-parser"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.1.tgz"; - sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ=="; - }; - }; "run-applescript-7.0.0" = { name = "run-applescript"; packageName = "run-applescript"; @@ -25160,15 +24296,6 @@ let sha512 = "9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A=="; }; }; - "run-async-0.1.0" = { - name = "run-async"; - packageName = "run-async"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; - sha512 = "qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw=="; - }; - }; "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; @@ -25232,15 +24359,6 @@ let sha512 = "CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug=="; }; }; - "rx-lite-3.1.2" = { - name = "rx-lite"; - packageName = "rx-lite"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; - sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ=="; - }; - }; "rxjs-5.5.12" = { name = "rxjs"; packageName = "rxjs"; @@ -25817,15 +24935,6 @@ let sha512 = "AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA=="; }; }; - "shelljs-0.7.8" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; - sha512 = "/YF5Uk8hcwi7ima04ppkbA4RaRMdPMBfwAvAf8sufYOxsJRtbdoBsT8vGvlb+799BrlGdYrd+oczIA2eN2JdWA=="; - }; - }; "shelljs-0.8.5" = { name = "shelljs"; packageName = "shelljs"; @@ -26474,15 +25583,6 @@ let sha512 = "PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q=="; }; }; - "sparkles-1.0.1" = { - name = "sparkles"; - packageName = "sparkles"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"; - sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="; - }; - }; "sparkles-2.1.0" = { name = "sparkles"; packageName = "sparkles"; @@ -27518,15 +26618,6 @@ let sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="; }; }; - "table-3.8.3" = { - name = "table"; - packageName = "table"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; - sha512 = "RZuzIOtzFbprLCE0AXhkI0Xi42ZJLZhCC+qkwuMLf/Vjz3maWpA8gz1qMdbmNoI9cOROT2Am/DxeRyXenrL11g=="; - }; - }; "table-6.9.0" = { name = "table"; packageName = "table"; @@ -27869,15 +26960,6 @@ let sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g=="; }; }; - "time-stamp-1.1.0" = { - name = "time-stamp"; - packageName = "time-stamp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; - sha512 = "gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw=="; - }; - }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -28076,15 +27158,6 @@ let sha512 = "F+3tYmXnpO2gyhZQ7o8yakELJH3FtKISI/FU0iWvchOWFUXiFnjbEBoumSzfcK1P71Qxzx2az4lVK4Dkq4KSew=="; }; }; - "tough-cookie-2.4.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; - }; - }; "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -28283,15 +27356,6 @@ let sha512 = "+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA=="; }; }; - "tumblr-0.4.1" = { - name = "tumblr"; - packageName = "tumblr"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tumblr/-/tumblr-0.4.1.tgz"; - sha512 = "MB/C4h4n43kq8SpHtwIL/DlUXJfTWR7lG9AUJVJsLeW38q0mTXHoHtlnAqt27CsLFZC864i9P508pRXW3fjkJA=="; - }; - }; "tunnel-agent-0.4.3" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -28319,33 +27383,6 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; - "twitter-1.7.1" = { - name = "twitter"; - packageName = "twitter"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/twitter/-/twitter-1.7.1.tgz"; - sha512 = "Do7l/WzFnUZC14ABtZfDiOHKl6M9Ft5tE4YF0ev9XLm4yh7m8R98D82rzeDAMjbjMZk2R/tb6sgXXb3sPKoaVw=="; - }; - }; - "type-2.7.3" = { - name = "type"; - packageName = "type"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.7.3.tgz"; - sha512 = "8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ=="; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - }; "type-check-0.4.0" = { name = "type-check"; packageName = "type-check"; @@ -29435,15 +28472,6 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha512 = "KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ=="; - }; - }; "utf-8-validate-5.0.10" = { name = "utf-8-validate"; packageName = "utf-8-validate"; @@ -30137,15 +29165,6 @@ let sha512 = "BOMkqUnIghW/SZEVOUKC3p5lUZ8QzavLksEEMKR9Yr7jBuu0noiQVfyB7csOStFVFgpWzx+ApcZjkyFHQkJjmQ=="; }; }; - "vinyl-0.5.3" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"; - sha512 = "P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA=="; - }; - }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -30749,15 +29768,6 @@ let sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; - "write-0.2.1" = { - name = "write"; - packageName = "write"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz"; - sha512 = "CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA=="; - }; - }; "write-file-atomic-2.4.3" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -39273,370 +38283,6 @@ in bypassCache = true; reconstructLock = true; }; - mastodon-bot = nodeEnv.buildNodePackage { - name = "mastodon-bot"; - packageName = "mastodon-bot"; - version = "1.13.8-20220129172727"; - src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.8-20220129172727.tgz"; - sha512 = "uBYlTnpHrVQ6+K9qQHaoLfvUKL8W5RLjdPmIzSC48+F0TSwDv+zAq19Sv5kx4Rxv4K+3c9j15xMI+mEs3bD7Lg=="; - }; - dependencies = [ - sources."acorn-5.7.4" - ( - sources."acorn-jsx-3.0.1" - // { - dependencies = [ - sources."acorn-3.3.0" - ]; - } - ) - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" - sources."ansi-escapes-1.4.0" - sources."ansi-gray-0.1.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."ansi-wrap-0.1.0" - sources."argparse-1.0.10" - sources."array-differ-1.0.0" - sources."array-uniq-1.0.3" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."babel-code-frame-6.26.0" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."beeper-1.1.1" - sources."bindings-1.5.0" - sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.2" - sources."bufferstreams-1.1.3" - sources."call-bind-1.0.8" - sources."call-bind-apply-helpers-1.0.2" - sources."call-bound-1.0.4" - sources."caller-path-0.1.0" - sources."callsites-0.2.0" - sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."circular-json-0.3.3" - sources."cli-cursor-1.0.2" - sources."cli-width-2.2.1" - sources."clone-1.0.4" - sources."clone-stats-0.0.1" - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.3" - sources."d-1.0.2" - sources."dashdash-1.14.1" - sources."dateformat-2.2.0" - sources."deasync-0.1.20" - sources."debug-2.6.9" - sources."deep-extend-0.5.1" - sources."deep-is-0.1.4" - sources."define-data-property-1.1.4" - sources."delayed-stream-1.0.0" - sources."doctrine-2.1.0" - sources."dunder-proto-1.0.1" - ( - sources."duplexer2-0.0.2" - // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - } - ) - sources."ecc-jsbn-0.1.2" - sources."entities-1.1.2" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."es5-ext-0.10.64" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" - sources."es6-set-0.1.6" - sources."es6-symbol-3.1.4" - sources."es6-weak-map-2.0.3" - sources."escape-string-regexp-1.0.5" - sources."escope-3.6.0" - sources."eslint-3.19.0" - sources."esniff-2.0.1" - sources."espree-3.5.4" - sources."esprima-4.0.1" - ( - sources."esquery-1.6.0" - // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - } - ) - ( - sources."esrecurse-4.3.0" - // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - } - ) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."event-emitter-0.3.5" - sources."exit-hook-1.1.1" - sources."ext-1.7.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fancy-log-1.3.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."figures-1.7.0" - sources."file-entry-cache-2.0.0" - sources."file-uri-to-path-1.0.0" - sources."flat-cache-1.3.4" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."generate-function-2.3.1" - sources."generate-object-property-1.2.0" - sources."get-intrinsic-1.3.0" - sources."get-proto-1.0.1" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."globals-9.18.0" - sources."glogg-1.0.2" - sources."gopd-1.2.0" - sources."graceful-fs-4.2.11" - sources."gulp-eslint-3.0.1" - ( - sources."gulp-util-3.0.8" - // { - dependencies = [ - sources."object-assign-3.0.0" - ]; - } - ) - sources."gulplog-1.0.0" - sources."har-schema-2.0.0" - ( - sources."har-validator-5.1.5" - // { - dependencies = [ - sources."ajv-6.12.6" - ]; - } - ) - sources."has-ansi-2.0.0" - sources."has-gulplog-0.1.0" - sources."has-property-descriptors-1.0.2" - sources."has-symbols-1.1.0" - sources."hasown-2.0.2" - sources."http-signature-1.2.0" - sources."ignore-3.3.10" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - ( - sources."inquirer-0.12.0" - // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - } - ) - sources."interpret-1.4.0" - sources."is-core-module-2.16.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-my-ip-valid-1.0.1" - sources."is-my-json-valid-2.20.6" - sources."is-property-1.0.2" - sources."is-resolvable-1.1.0" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."js-tokens-3.0.2" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - ( - sources."json-stable-stringify-1.2.1" - // { - dependencies = [ - sources."isarray-2.0.5" - ]; - } - ) - sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.1" - sources."jsonpointer-5.0.1" - sources."jsprim-1.4.2" - sources."levn-0.3.0" - sources."lodash-4.17.21" - sources."lodash._basecopy-3.0.1" - sources."lodash._basetostring-3.0.1" - sources."lodash._basevalues-3.0.0" - sources."lodash._getnative-3.9.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - sources."lodash._root-3.0.1" - sources."lodash.escape-3.2.0" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."lodash.keys-3.1.2" - sources."lodash.restparam-3.6.1" - sources."lodash.template-3.6.2" - sources."lodash.templatesettings-3.1.1" - sources."mastodon-api-1.3.0" - sources."math-intrinsics-1.1.0" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."multipipe-0.1.2" - sources."mute-stream-0.0.5" - sources."natural-compare-1.4.0" - sources."next-tick-1.1.0" - sources."node-addon-api-1.7.2" - sources."node-fetch-2.6.1" - sources."number-is-nan-1.0.1" - sources."oauth-0.9.15" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."object-keys-1.1.1" - sources."once-1.4.0" - sources."onetime-1.1.0" - sources."optionator-0.8.3" - sources."os-homedir-1.0.2" - sources."parse-node-version-1.0.1" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-parse-1.0.7" - sources."performance-now-2.1.0" - sources."pluralize-1.2.1" - sources."prelude-ls-1.1.2" - sources."process-nextick-args-2.0.1" - sources."progress-1.1.8" - ( - sources."psl-1.15.0" - // { - dependencies = [ - sources."punycode-2.3.1" - ]; - } - ) - sources."punycode-1.4.1" - sources."qs-6.5.3" - sources."readable-stream-2.3.8" - sources."readline-1.3.0" - ( - sources."readline2-1.0.1" - // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - ]; - } - ) - sources."rechoir-0.6.2" - sources."replace-ext-0.0.1" - sources."request-2.88.0" - sources."require-uncached-1.0.3" - sources."resolve-1.22.10" - sources."resolve-from-1.0.1" - sources."restore-cursor-1.0.1" - sources."rimraf-2.6.3" - sources."rss-parser-3.7.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - sources."set-function-length-1.2.2" - sources."shelljs-0.7.8" - sources."slice-ansi-0.0.4" - sources."sparkles-1.0.1" - sources."sprintf-js-1.0.3" - sources."sshpk-1.18.0" - ( - sources."string-width-2.1.1" - // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - } - ) - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."table-3.8.3" - sources."text-table-0.2.0" - sources."through-2.3.8" - sources."through2-2.0.5" - sources."time-stamp-1.1.0" - sources."tough-cookie-2.4.3" - sources."tumblr-0.4.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."twitter-1.7.1" - sources."type-2.7.3" - sources."type-check-0.3.2" - sources."typedarray-0.0.6" - ( - sources."uri-js-4.4.1" - // { - dependencies = [ - sources."punycode-2.3.1" - ]; - } - ) - sources."user-home-2.0.0" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - ( - sources."verror-1.10.0" - // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - } - ) - sources."vinyl-0.5.3" - sources."word-wrap-1.2.5" - sources."wrappy-1.0.2" - sources."write-0.2.1" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" - sources."xtend-4.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Bot to publish twitter, tumblr or rss posts to an mastodon account"; - homepage = "https://github.com/yogthos/mastodon-bot"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 87bdade1571e..42547aae966c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -998,6 +998,7 @@ mapAliases { marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27 marwaita-pop_os = throw "'marwaita-pop_os' has been renamed to/replaced by 'marwaita-yellow'"; # Converted to throw 2025-10-27 marwaita-ubuntu = throw "'marwaita-ubuntu' has been renamed to/replaced by 'marwaita-orange'"; # Converted to throw 2025-10-27 + mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07 material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09 matomo_5 = throw "'matomo_5' has been renamed to/replaced by 'matomo'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4db94cf2e714..8a0e82da8a9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11665,8 +11665,6 @@ with pkgs; shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; }; - mastodon-bot = nodePackages.mastodon-bot; - matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { }; From 7a42ab9d428ad5e414c6e9b018a3958d1446f9e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 03:36:29 +0000 Subject: [PATCH 1647/2279] bcachefs-tools: 1.31.12 -> 1.31.13 --- pkgs/by-name/bc/bcachefs-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 385ec6b5d620..338a0451683b 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.31.12"; + version = "1.31.13"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-gbSyybWTG38mI3r6kdOHFaEx7S82x25OMPEAWZql7Mo="; + hash = "sha256-IHc4tsEqXbxOLQXu75A3WtFqhv6NS0AlPsWt0pM8LdU="; }; cargoDeps = rustPlatform.fetchCargoVendor { From f878615421afffeecc6c799bcbf0f566cbc593b9 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 22:44:52 -0500 Subject: [PATCH 1648/2279] nodePackages.speed-test: drop Has a critical issue(https://github.com/sindresorhus/speed-test/issues/74) open with no resolution for many years now, so safe to remove since it doesn't even work(I confirmed this is still the case) --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 334 ------------------ 3 files changed, 1 insertion(+), 335 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 564ae2e7e67b..2c2c1e2af7a7 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -257,6 +257,7 @@ mapAliases { shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19 inherit (pkgs) snyk; # Added 2023-08-30 "socket.io" = throw "socket.io was removed because it provides no executable"; # added 2025-03-23 + speed-test = throw "'speed-test' has been removed because it was broken"; # Added 2025-11-07 inherit (pkgs) sql-formatter; # added 2024-06-29 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3bbfa908f887..0c23f5dc94de 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -78,7 +78,6 @@ , "semver" , "sloc" , "smartdc" -, "speed-test" , "svelte-check" , "tern" , "tiddlywiki" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5bff2d74950f..292adde37c5e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4251,15 +4251,6 @@ let sha512 = "QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA=="; }; }; - "agent-base-4.3.0" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; - sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; - }; - }; "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; @@ -5727,15 +5718,6 @@ let sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; - "bl-5.1.0" = { - name = "bl"; - packageName = "bl"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz"; - sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="; - }; - }; "blob-0.0.5" = { name = "blob"; packageName = "blob"; @@ -6609,15 +6591,6 @@ let sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; - "camelcase-keys-7.0.2" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz"; - sha512 = "Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg=="; - }; - }; "camelcase-keys-8.0.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -9877,15 +9850,6 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; - "draftlog-1.0.13" = { - name = "draftlog"; - packageName = "draftlog"; - version = "1.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/draftlog/-/draftlog-1.0.13.tgz"; - sha512 = "GeMWOpXERBpfVDK6v7m0x1hPg8+g8ZsZWqJl2T17wHqrm4h8fnjiZmXcnCrmwogAc6R3YTxFXax15wezfuyCUw=="; - }; - }; "dreamopt-0.8.0" = { name = "dreamopt"; packageName = "dreamopt"; @@ -10435,24 +10399,6 @@ let sha512 = "SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg=="; }; }; - "es6-promise-4.2.8" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; - sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha512 = "C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ=="; - }; - }; "esbuild-0.14.47" = { name = "esbuild"; packageName = "esbuild"; @@ -13675,15 +13621,6 @@ let sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; - "http-proxy-agent-2.1.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; - sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; - }; - }; "http-proxy-agent-7.0.2" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; @@ -13765,15 +13702,6 @@ let sha512 = "OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg=="; }; }; - "https-proxy-agent-3.0.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; - sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg=="; - }; - }; "https-proxy-agent-5.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; @@ -17248,15 +17176,6 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "log-symbols-5.1.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz"; - sha512 = "l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA=="; - }; - }; "log-symbols-6.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -17284,15 +17203,6 @@ let sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg=="; }; }; - "log-update-5.0.1" = { - name = "log-update"; - packageName = "log-update"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz"; - sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw=="; - }; - }; "log-update-6.1.0" = { name = "log-update"; packageName = "log-update"; @@ -18103,15 +18013,6 @@ let sha512 = "QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ=="; }; }; - "meow-10.1.5" = { - name = "meow"; - packageName = "meow"; - version = "10.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz"; - sha512 = "/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw=="; - }; - }; "meow-11.0.0" = { name = "meow"; packageName = "meow"; @@ -20714,15 +20615,6 @@ let sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; - "ora-6.3.1" = { - name = "ora"; - packageName = "ora"; - version = "6.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-6.3.1.tgz"; - sha512 = "ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ=="; - }; - }; "ora-8.2.0" = { name = "ora"; packageName = "ora"; @@ -22856,15 +22748,6 @@ let sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; }; }; - "read-pkg-6.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz"; - sha512 = "X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q=="; - }; - }; "read-pkg-7.1.0" = { name = "read-pkg"; packageName = "read-pkg"; @@ -22901,15 +22784,6 @@ let sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; }; }; - "read-pkg-up-8.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz"; - sha512 = "snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ=="; - }; - }; "read-pkg-up-9.1.0" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -24278,15 +24152,6 @@ let sha512 = "kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg=="; }; }; - "round-to-6.0.0" = { - name = "round-to"; - packageName = "round-to"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/round-to/-/round-to-6.0.0.tgz"; - sha512 = "jFvBgyRueGU0QVa7EqXZOkarkzrqEnF3VTCzATRcBkzxXJ4/+pzDf1iouqOqGsx6ZpnIIu5gvFDGnyzoX58ldQ=="; - }; - }; "run-applescript-7.0.0" = { name = "run-applescript"; packageName = "run-applescript"; @@ -25664,15 +25529,6 @@ let sha512 = "phdEoDlA6EUIVtzwq1UiNMXDUogczp204aYF/yfOhjNePWFfIpBJ1k5wLMuXQhEOOMjuTJEcc4vdZa+vuP+n/Q=="; }; }; - "speedtest-net-1.6.2" = { - name = "speedtest-net"; - packageName = "speedtest-net"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/speedtest-net/-/speedtest-net-1.6.2.tgz"; - sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA=="; - }; - }; "split-0.2.10" = { name = "split"; packageName = "split"; @@ -25907,15 +25763,6 @@ let sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; }; }; - "stdin-discarder-0.1.0" = { - name = "stdin-discarder"; - packageName = "stdin-discarder"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz"; - sha512 = "xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ=="; - }; - }; "stdin-discarder-0.2.2" = { name = "stdin-discarder"; packageName = "stdin-discarder"; @@ -29921,15 +29768,6 @@ let sha512 = "ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g=="; }; }; - "xml2js-0.4.23" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.4.23"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz"; - sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="; - }; - }; "xml2js-0.5.0" = { name = "xml2js"; packageName = "xml2js"; @@ -41352,178 +41190,6 @@ in bypassCache = true; reconstructLock = true; }; - speed-test = nodeEnv.buildNodePackage { - name = "speed-test"; - packageName = "speed-test"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/speed-test/-/speed-test-3.0.0.tgz"; - sha512 = "CIlLQsG8ffQ2B+2A/s3rXiaTXDWlEKBMya64ajzDcpDZ8bpB5dOyznWQJB+lyUn6/lJ8P+5xe4jKO60S6yLoMw=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@types/minimist-1.2.5" - sources."@types/normalize-package-data-2.4.4" - sources."agent-base-4.3.0" - sources."ansi-escapes-5.0.0" - sources."ansi-regex-6.1.0" - sources."ansi-styles-4.3.0" - sources."arrify-1.0.1" - sources."base64-js-1.5.1" - sources."bl-5.1.0" - sources."buffer-6.0.3" - sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.2" - sources."chalk-4.1.2" - sources."cli-cursor-4.0.0" - sources."cli-spinners-2.9.2" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."debug-3.1.0" - sources."decamelize-5.0.1" - ( - sources."decamelize-keys-1.1.1" - // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - } - ) - sources."defaults-1.0.4" - sources."draftlog-1.0.13" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."error-ex-1.3.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - sources."find-up-5.0.0" - sources."function-bind-1.1.2" - sources."hard-rejection-2.1.0" - sources."has-flag-4.0.0" - sources."hasown-2.0.2" - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-3.0.1" - sources."ieee754-1.2.1" - sources."indent-string-5.0.0" - sources."inherits-2.0.4" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.16.1" - sources."is-fullwidth-code-point-4.0.0" - sources."is-interactive-2.0.0" - sources."is-plain-obj-1.1.0" - sources."is-unicode-supported-1.3.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" - ( - sources."log-symbols-5.1.0" - // { - dependencies = [ - sources."chalk-5.4.1" - ]; - } - ) - sources."log-update-5.0.1" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - sources."meow-10.1.5" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - sources."minimist-options-4.1.0" - sources."ms-2.0.0" - sources."normalize-package-data-3.0.3" - sources."onetime-5.1.2" - ( - sources."ora-6.3.1" - // { - dependencies = [ - sources."chalk-5.4.1" - ]; - } - ) - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" - sources."picocolors-1.1.1" - sources."quick-lru-5.1.1" - sources."read-pkg-6.0.0" - sources."read-pkg-up-8.0.0" - sources."readable-stream-3.6.2" - sources."redent-4.0.0" - sources."restore-cursor-4.0.0" - sources."round-to-6.0.0" - sources."safe-buffer-5.2.1" - sources."sax-1.4.1" - sources."semver-7.7.1" - sources."signal-exit-3.0.7" - ( - sources."slice-ansi-5.0.0" - // { - dependencies = [ - sources."ansi-styles-6.2.1" - ]; - } - ) - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - ( - sources."speedtest-net-1.6.2" - // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - } - ) - sources."stdin-discarder-0.1.0" - sources."string-width-5.1.2" - sources."string_decoder-1.3.0" - sources."strip-ansi-7.1.0" - sources."strip-indent-4.0.0" - sources."supports-color-7.2.0" - sources."trim-newlines-4.1.1" - sources."type-fest-1.4.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."wcwidth-1.0.1" - ( - sources."wrap-ansi-8.1.0" - // { - dependencies = [ - sources."ansi-styles-6.2.1" - ]; - } - ) - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Test your internet connection speed and ping using speedtest.net from the CLI"; - homepage = "https://github.com/sindresorhus/speed-test#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; From eba630a08f3480533c4f4eba545eea017d70797a Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 22:53:18 -0500 Subject: [PATCH 1649/2279] nodePackages.tern: drop Upstream is unmaintained and it isn't clear if it will work with new ECMAScript versions(open issues upstream suggest it doesn't even support current ECMAScript), so drop it --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 112 ------------------ 3 files changed, 1 insertion(+), 113 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 2c2c1e2af7a7..4679a9e3b4ac 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -271,6 +271,7 @@ mapAliases { inherit (pkgs) tailwindcss; # added 2024-12-04 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09 + tern = throw "'tern' was removed because it has been unmaintained upstream for several years"; # Added 2025-11-07 inherit (pkgs) terser; # Added 2023-08-31 inherit (pkgs) textlint; # Added 2024-05-13 textlint-plugin-latex = throw "textlint-plugin-latex was removed because it is unmaintained for years. Please use textlint-plugin-latex2e instead."; # Added 2024-05-17 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 0c23f5dc94de..498da824ee90 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -79,7 +79,6 @@ , "sloc" , "smartdc" , "svelte-check" -, "tern" , "tiddlywiki" , "tsun" , "ts-node" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 292adde37c5e..fc39b02ff2f9 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4125,15 +4125,6 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "acorn-6.4.2" = { - name = "acorn"; - packageName = "acorn"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz"; - sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; - }; - }; "acorn-7.4.1" = { name = "acorn"; packageName = "acorn"; @@ -4170,15 +4161,6 @@ let sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; - "acorn-loose-6.1.0" = { - name = "acorn-loose"; - packageName = "acorn-loose"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-loose/-/acorn-loose-6.1.0.tgz"; - sha512 = "FHhXoiF0Uch3IqsrnPpWwCtiv5PYvipTpT1k9lDMgQVVYc9iDuSl5zdJV358aI8twfHCYMFBRVYvAVki9wC/ng=="; - }; - }; "acorn-node-1.8.2" = { name = "acorn-node"; packageName = "acorn-node"; @@ -4188,15 +4170,6 @@ let sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; }; }; - "acorn-walk-6.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; - sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; - }; - }; "acorn-walk-7.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; @@ -10219,15 +10192,6 @@ let sha512 = "HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q=="; }; }; - "enhanced-resolve-2.3.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; - sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q=="; - }; - }; "entities-1.1.2" = { name = "entities"; packageName = "entities"; @@ -18004,15 +17968,6 @@ let sha512 = "F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A=="; }; }; - "memory-fs-0.3.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha512 = "QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ=="; - }; - }; "meow-11.0.0" = { name = "meow"; packageName = "meow"; @@ -23846,15 +23801,6 @@ let sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="; }; }; - "resolve-from-2.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; - sha512 = "qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ=="; - }; - }; "resolve-from-4.0.0" = { name = "resolve-from"; packageName = "resolve-from"; @@ -26483,15 +26429,6 @@ let sha512 = "92YT2dpt671tFiHH/e1ok9D987N9fHD5VWoly1CdPD/Cd1HMglvZwP3nx2yTj2lbXDAHt8QssZkxTLCCTNL+xw=="; }; }; - "tapable-0.2.9" = { - name = "tapable"; - packageName = "tapable"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz"; - sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A=="; - }; - }; "tapable-2.2.1" = { name = "tapable"; packageName = "tapable"; @@ -41237,55 +41174,6 @@ in bypassCache = true; reconstructLock = true; }; - tern = nodeEnv.buildNodePackage { - name = "tern"; - packageName = "tern"; - version = "0.24.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tern/-/tern-0.24.3.tgz"; - sha512 = "Z8uvtdWIlFn1GWy0HW5FhZ8VDryZwoJUdnjZU25C7/PBOltLIn1uv+WF3rVq6S1761YbsmbZYRP/l0ZJBCkvrw=="; - }; - dependencies = [ - sources."acorn-6.4.2" - sources."acorn-loose-6.1.0" - sources."acorn-walk-6.2.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" - sources."enhanced-resolve-2.3.0" - sources."errno-0.1.8" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."isarray-1.0.0" - sources."memory-fs-0.3.0" - sources."minimatch-3.1.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."process-nextick-args-2.0.1" - sources."prr-1.0.1" - sources."readable-stream-2.3.8" - sources."resolve-from-2.0.0" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - sources."tapable-0.2.9" - sources."util-deprecate-1.0.2" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A JavaScript code analyzer for deep, cross-editor language support"; - homepage = "https://github.com/ternjs/tern#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; From 03a735459abb33b1d93c8757762bcd23621d196e Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 23:00:31 -0500 Subject: [PATCH 1650/2279] nodePackages.ts-node: drop Unmaintained per https://github.com/TypeStrong/ts-node/issues/2140, and as mentioned in the issue, NodeJS now has experimental type stripping support, so this shouldn't be needed in the future. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 45 ------------------- pkgs/development/node-packages/overrides.nix | 8 ---- 4 files changed, 1 insertion(+), 54 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4679a9e3b4ac..8002736da157 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -329,6 +329,7 @@ mapAliases { thelounge-theme-zenburn-sourcecodepro = throw "thelounge-theme-zenburn-sourcecodepro has been removed because thelounge was moved out of nodePackages"; # added 2025-03-12 three = throw "three was removed because it was no longer needed"; # Added 2023-09-08 triton = pkgs.triton; # Added 2023-05-06 + ts-node = throw "'ts-node' was removed because it is unmaintained, and since NodeJS 22.6.0+, experimental TypeScript support is built-in to NodeJS."; # Added 2025-11-07 typescript = pkgs.typescript; # Added 2023-06-21 inherit (pkgs) typescript-language-server; # added 2024-02-27 inherit (pkgs) uglify-js; # added 2024-06-15 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 498da824ee90..6803fe32bf9b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -81,7 +81,6 @@ , "svelte-check" , "tiddlywiki" , "tsun" -, "ts-node" , "ttf2eot" , "vega-cli" , "vercel" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fc39b02ff2f9..27f3fb47e91c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -41242,51 +41242,6 @@ in bypassCache = true; reconstructLock = true; }; - ts-node = nodeEnv.buildNodePackage { - name = "ts-node"; - packageName = "ts-node"; - version = "10.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz"; - sha512 = "f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ=="; - }; - dependencies = [ - sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.11.9" - sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.15" - sources."@swc/types-0.1.19" - sources."@swc/wasm-1.11.9" - sources."@tsconfig/node10-1.0.11" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/node-22.13.10" - sources."acorn-8.14.1" - sources."acorn-walk-8.3.4" - sources."arg-4.1.3" - sources."create-require-1.1.1" - sources."diff-4.0.2" - sources."make-error-1.3.6" - sources."tslib-2.8.1" - sources."typescript-5.8.2" - sources."undici-types-6.20.0" - sources."v8-compile-cache-lib-3.0.1" - sources."yn-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TypeScript execution environment and REPL for node.js, with source map support"; - homepage = "https://typestrong.org/ts-node"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 501cf9c62b88..2e68dbedfa34 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -115,14 +115,6 @@ final: prev: { name = "rush"; }; - ts-node = prev.ts-node.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/ts-node" \ - --prefix NODE_PATH : ${pkgs.typescript}/lib/node_modules - ''; - }; - tsun = prev.tsun.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' From 337b74b10f37f1d557f6296a7bb6d56bc59e5ce9 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 23:04:41 -0500 Subject: [PATCH 1651/2279] nodePackages.wring: drop Unmaintained in the last 9 years, and also relies on PhantomJS, which has ceased development and is archived. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8002736da157..ece40c1c57ba 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -354,6 +354,7 @@ mapAliases { webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05 webtorrent-cli = throw "webtorrent-cli has been removed because it was broken"; # added 2025-03-12 inherit (pkgs) wrangler; # added 2024-07-01 + wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07 inherit (pkgs) write-good; # added 2023-08-20 inherit (pkgs) yalc; # added 2024-06-29 inherit (pkgs) yaml-language-server; # added 2023-09-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6803fe32bf9b..5ca242ab9d0b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -85,6 +85,5 @@ , "vega-cli" , "vercel" , "wavedrom-cli" -, "wring" , "@yaegassy/coc-nginx" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 27f3fb47e91c..35904c330ad4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -41985,24 +41985,6 @@ in bypassCache = true; reconstructLock = true; }; - wring = nodeEnv.buildNodePackage { - name = "wring"; - packageName = "wring"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; - sha512 = "XoFoUf9gxnQkergF+FK+AuaI/iaSh9P0N1hqIGTTs1V3rjexH1ZZKuxuDUbdVGrwxvoTW4xpeZrNhBw6WJIIag=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Extract content from websites using CSS Selectors and XPath"; - homepage = "https://github.com/osener/wring#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { name = "_at_yaegassy_slash_coc-nginx"; packageName = "@yaegassy/coc-nginx"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42547aae966c..7b648852e189 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1615,6 +1615,7 @@ mapAliases { wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27 wrapGAppsHook = throw "'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'"; # Converted to throw 2025-10-27 wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02 + wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07 write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27 wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a0e82da8a9b..15d09eb83e9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4227,8 +4227,6 @@ with pkgs; wlroots = wlroots_0_19; }; - wring = nodePackages.wring; - wyrd = callPackage ../tools/misc/wyrd { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; From 62e04c237dafc315e71d53055dd921342f8c88a5 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 7 Nov 2025 23:11:53 -0500 Subject: [PATCH 1652/2279] texlab: 5.23.1 -> 5.24.0 https://github.com/latex-lsp/texlab/releases/tag/v5.24.0 --- pkgs/by-name/te/texlab/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix index 2b57e2308932..0a0cbb80a7b2 100644 --- a/pkgs/by-name/te/texlab/package.nix +++ b/pkgs/by-name/te/texlab/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.23.1"; + version = "5.24.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; tag = "v${version}"; - hash = "sha256-QGC2UFmbMCMr0i853M5mdXklqZFYy00fbqeLllpQ4Sg="; + hash = "sha256-gwF4cBlS43u2PfOQBxD7iq2JL9tUo8TPJqR0tWNdW9k="; }; - cargoHash = "sha256-hJDKzHrNUmN4jqp4P1Is3mYvRC5H3nnHtIW7xjDH+xo="; + cargoHash = "sha256-9sAurVJSpLNgQvJOG7kSXHIr38MHsw3BhGAaxi9xjUE="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.23.0/.github/workflows/publish.yml#L110-L114 + # https://github.com/latex-lsp/texlab/blob/v5.24.0/.github/workflows/publish.yml#L110-L114 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; From c2d1ffcc3d2412a279e8050b4108d783581422f0 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 23:26:09 -0500 Subject: [PATCH 1653/2279] go-away: fix updateScript --- pkgs/by-name/go/go-away/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix index 612fe330b962..55b31be7e04b 100644 --- a/pkgs/by-name/go/go-away/package.nix +++ b/pkgs/by-name/go/go-away/package.nix @@ -61,7 +61,10 @@ buildGoModule (finalAttrs: { passthru.updateScript = nix-update-script { # the main repository does not have the releases feed enabled, so use the # codeberg mirror - url = "https://codeberg.org/gone/go-away"; + extraArgs = [ + "--url" + "https://codeberg.org/gone/go-away" + ]; }; meta = { From 9953e93da15547d9e89fe1d04c114866051bae39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 04:31:20 +0000 Subject: [PATCH 1654/2279] hydrus: 644 -> 646 --- pkgs/by-name/hy/hydrus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index 3d166acf5ba5..e7ba489e65e3 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "hydrus"; - version = "644"; + version = "646"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; tag = "v${version}"; - hash = "sha256-dEYKei7wu0lOhA/10c1sTOo0HH0HturrW8dje89skis="; + hash = "sha256-0vnX39OcONN2j7Xyae/Hb1QhH4o5WlJ6serYIPrjBUk="; }; nativeBuildInputs = [ From 08f76cbad628fe6fbfca4d4e2efe15f108670750 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 04:36:08 +0000 Subject: [PATCH 1655/2279] terraform-providers.scaleway_scaleway: 2.61.0 -> 2.62.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 6b094731b9e2..ff684a272e72 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1174,13 +1174,13 @@ "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8=" }, "scaleway_scaleway": { - "hash": "sha256-E0nhKVAJavR7ZEz65p4fE2Iwtchmzs9Fu/UqrVFmnIA=", + "hash": "sha256-dZWoqco5C/QMBek+m+kLe1cl86NLe9EHMh6XV+TOFf4=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.61.0", + "rev": "v2.62.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-QzFIhUMJqslwir+fa50vMZvROJfp4j2SCUKjlXLTs8s=" + "vendorHash": "sha256-SUGyDQ23ZgRbf2yGm+ih3nwMp90ckadG6Zeu6Am/fU8=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From aaaa9a468d06ebd1191734544f41fe789d05db21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 04:38:09 +0000 Subject: [PATCH 1656/2279] python3Packages.types-pytz: 2025.2.0.20250809 -> 2025.2.0.20251108 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 0c5d3899ac7d..d55626637223 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2025.2.0.20250809"; + version = "2025.2.0.20251108"; pyproject = true; src = fetchPypi { pname = "types_pytz"; inherit version; - hash = "sha256-Ii4y5qKbsohx+INOh4XjgB8txEQccVzSCCsnHuy+IeU="; + hash = "sha256-/Kh5F4Nq6EPwcSlWe3TBkp8YcGEGgbTJLLhqPfWBe9s="; }; build-system = [ setuptools ]; From 56b5c8169e525bed665a22c5d52051246c46db6d Mon Sep 17 00:00:00 2001 From: Bazinga9000 Date: Fri, 7 Nov 2025 23:42:32 -0500 Subject: [PATCH 1657/2279] archipelago: 0.6.3 -> 0.6.4 --- pkgs/by-name/ar/archipelago/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix index 60e8c67760ab..01a345330bb9 100644 --- a/pkgs/by-name/ar/archipelago/package.nix +++ b/pkgs/by-name/ar/archipelago/package.nix @@ -17,10 +17,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "archipelago"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage"; - hash = "sha256-PetlGYsdhyvThIFqy+7wbPLAXDcgN2Kcl2WF3rta8PA="; + hash = "sha256-7yzRYLmrOuiubXOu/ljuBsWvphdJ+07v0LJD0Ae8BTQ="; }; dontUnpack = true; From 1530a2b5545d7f0994919eb31a8f76b4fb4c6524 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Nov 2025 23:54:56 -0500 Subject: [PATCH 1658/2279] python3Packages.aiolimiter: fix build --- pkgs/development/python-modules/aiolimiter/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index a76d3a3ec8d8..ecd905a39e6b 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -25,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo="; }; + # ERROR: '"session"' is not a valid asyncio_default_fixture_loop_scope. Valid scopes are: function, class, module, package, session. + # Post 1.2.1, the project switched from tox and is no longer affected, hence fixed in nixpkgs only. + postPatch = '' + substituteInPlace tox.ini --replace-fail \ + 'asyncio_default_fixture_loop_scope = "session"' \ + 'asyncio_default_fixture_loop_scope = session' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; From adf68b1ff7914f032cb89641ed420065c5642439 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Nov 2025 23:56:22 -0500 Subject: [PATCH 1659/2279] python3Packages.aiolimiter: modernize --- .../python-modules/aiolimiter/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix index ecd905a39e6b..9569cfb0d133 100644 --- a/pkgs/development/python-modules/aiolimiter/default.nix +++ b/pkgs/development/python-modules/aiolimiter/default.nix @@ -3,20 +3,16 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - importlib-metadata, pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, toml, }: buildPythonPackage rec { pname = "aiolimiter"; version = "1.2.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "mjpieters"; @@ -33,9 +29,7 @@ buildPythonPackage rec { 'asyncio_default_fixture_loop_scope = session' ''; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytest-asyncio @@ -46,11 +40,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiolimiter" ]; - meta = with lib; { + meta = { description = "Implementation of a rate limiter for asyncio"; homepage = "https://github.com/mjpieters/aiolimiter"; changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ fab ]; }; } From bcc277b70b33d0fe91948d19f288551678f91a43 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 23:58:45 -0500 Subject: [PATCH 1660/2279] coc-sumneko-lua: fix updateScript --- pkgs/by-name/co/coc-sumneko-lua/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-sumneko-lua/update.sh b/pkgs/by-name/co/coc-sumneko-lua/update.sh index 10b819ed9323..5634158b4792 100755 --- a/pkgs/by-name/co/coc-sumneko-lua/update.sh +++ b/pkgs/by-name/co/coc-sumneko-lua/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nodejs nix-update git curl +#!nix-shell -i bash -p bash nodejs nix-update git curl jq WORKDIR=$(mktemp -d) PACKAGE_DIR="$(realpath "$(dirname "$0")")" From 47f7f0d070d5ba31b62c904e00a82473ba0f4f29 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 23:59:05 -0500 Subject: [PATCH 1661/2279] gatsby-cli: fix updateScript --- pkgs/by-name/ga/gatsby-cli/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ga/gatsby-cli/package.nix b/pkgs/by-name/ga/gatsby-cli/package.nix index c1d7a6bbe4ef..e9779794caa0 100644 --- a/pkgs/by-name/ga/gatsby-cli/package.nix +++ b/pkgs/by-name/ga/gatsby-cli/package.nix @@ -68,8 +68,10 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ + # Fixes an error with having too many versions available + "--use-github-releases" "--version-regex" - "'gatsby-cli@(.*)'" + "gatsby@(.*)" ]; }; From 30bd6d8273b54ce6663b901452863b21e6394114 Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 7 Nov 2025 23:59:14 -0500 Subject: [PATCH 1662/2279] json-server: fix updateScript --- pkgs/by-name/js/json-server/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/js/json-server/package.nix b/pkgs/by-name/js/json-server/package.nix index 1ae45a94041b..01e8ed63c6e4 100644 --- a/pkgs/by-name/js/json-server/package.nix +++ b/pkgs/by-name/js/json-server/package.nix @@ -18,7 +18,7 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-HZmCxMKgxJ+ZiRDXh/iVmytNMbPoYzSuI0F8YmkcfZI="; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; From 16b135be85abfefb731ff2e5c5cd85135b77ef93 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 00:01:06 -0500 Subject: [PATCH 1663/2279] gitbeaker-cli: 43.7.0 -> 43.8.0 --- pkgs/by-name/gi/gitbeaker-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitbeaker-cli/package.nix b/pkgs/by-name/gi/gitbeaker-cli/package.nix index b57b3d596576..cfbb7ab038f3 100644 --- a/pkgs/by-name/gi/gitbeaker-cli/package.nix +++ b/pkgs/by-name/gi/gitbeaker-cli/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitbeaker-cli"; - version = "43.7.0"; + version = "43.8.0"; src = fetchFromGitHub { owner = "jdalrymple"; repo = "gitbeaker"; tag = finalAttrs.version; - hash = "sha256-3g8VNOCyXxDg2xpLA66L57ASMhf0kWUp0a7a7FZouF8="; + hash = "sha256-EVxDUEuxCnMiqqsKFs9JpRVJ86d9hW22K4a4we8eoJA="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-RwQ/Xi/BKZv6+tpIIZU9U9PZJXq3baZVEv3UNKyQ18o="; + hash = "sha256-WTxUoRPooea4CqpKnnrmvoWXoglCivVet+bUh0YG7gU="; }; buildPhase = '' From bf5600993b10ab4e1d2ad4f0b3b2d65df502ae38 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Nov 2025 23:38:15 -0500 Subject: [PATCH 1664/2279] python3Packages.protobuf: 6.32.1 -> 6.33.0 --- pkgs/development/python-modules/protobuf/6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index 88b571b65a3b..d3aa019da237 100644 --- a/pkgs/development/python-modules/protobuf/6.nix +++ b/pkgs/development/python-modules/protobuf/6.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "6.32.1"; + version = "6.33.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7iRp5KAhR0q5uq/qbNBw5b8nx9KUM1BN3qGk7lhQ9o0="; + hash = "sha256-FAMD1cjSA3cwxUj4x7k7ILsdwwG+KAw3i4K4iUWJyVQ="; }; build-system = [ setuptools ]; From 527a13b30ca5deda77dbee21050a474e7276b519 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 00:02:57 -0500 Subject: [PATCH 1665/2279] uppy-companion: 6.1.1 -> 6.2.0 --- pkgs/by-name/up/uppy-companion/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix index 94f986904b14..01791714fe0a 100644 --- a/pkgs/by-name/up/uppy-companion/package.nix +++ b/pkgs/by-name/up/uppy-companion/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uppy-companion"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "transloadit"; repo = "uppy"; tag = "@uppy/companion@${finalAttrs.version}"; - hash = "sha256-Z7u0Wrkg1/jZtOF86hUbwRVWWGHuv4ktcXx+gEcLYlQ="; + hash = "sha256-FF5I4D9obRVJqyjucemnxZiPcNHdQdo3S0z/h96Fe6c="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-5XLOyz1QowX08C0IBcg9Um1eY+1qwtPyqIFb83FPFz8="; + hash = "sha256-euKvBI3Y15SmBoVOEbS8GIJT/kIOhayLKGVSd8JztqI="; }; buildPhase = '' From 5fc1ba1943818c41d20e03c53b9d342ab0308569 Mon Sep 17 00:00:00 2001 From: Break Yang Date: Mon, 26 May 2025 09:24:31 -0700 Subject: [PATCH 1666/2279] temporal-ui-server: init at 2.43.2 --- .../by-name/te/temporal-ui-server/package.nix | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/te/temporal-ui-server/package.nix diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix new file mode 100644 index 000000000000..7546e44b7da0 --- /dev/null +++ b/pkgs/by-name/te/temporal-ui-server/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "temporal-ui-server"; + version = "2.43.2"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "ui-server"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Z7a/21whiCjiQiqKE8aDcptSFw+op82xnqXfzVjGw6o="; + }; + + vendorHash = "sha256-HmysULH81cYOuMyW9qZRsQhv7chDobD7PnWmu3uCvJw="; + + postInstall = '' + mv $out/bin/server $out/bin/temporal-ui-server + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/temporalio/ui-server/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/temporalio/ui-server"; + description = "Golang Server for Temporal Web UI"; + longDescription = '' + The Temporal Web UI provides users with Workflow Execution state and metadata + for debugging purposes. This golang server provides a binary that you can run + to serve the compiled temporal ui (https://github.com/temporalio/ui). + ''; + mainProgram = "temporal-ui-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ breakds ]; + }; +}) From 6c02c61c05ccbaf28580e76292489788ab8b747d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 05:17:43 +0000 Subject: [PATCH 1667/2279] cherry-studio: 1.6.5 -> 1.6.7 --- pkgs/by-name/ch/cherry-studio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 5e8bc1f788c4..d9fcf2e7ff8e 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.6.5"; + version = "1.6.7"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-9oEMnGaloY3tFY/qpjTlYbO7n1ORIK49s3N9SGSMvHE="; + hash = "sha256-F5TlgWorsBJ4B6/j+3WbbVMirtqCrDq+TrWW257MMek="; }; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-LstTTVKXVL6hIC5TiUKeBIcDFaRPdmEjO2LmvVXB7dQ="; + hash = "sha256-noZ3R4kxYw26z2qavaIb+iv7iFj5ID7O0V5fSVcAd48="; }; nativeBuildInputs = [ From 0334adbf01a54ec908e4365114061ef3d666ec0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 05:23:41 +0000 Subject: [PATCH 1668/2279] python3Packages.asteval: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/asteval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index bed12430810d..68aec3379bf4 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; tag = version; - hash = "sha256-DzLVe8TlWAPQXzai9CJlDAow6UTSmkA/DW3fT30YfZY="; + hash = "sha256-c+gVT947IpJC2gn1SWVth0ScOBh34m89dpgR5AikOHk="; }; build-system = [ setuptools-scm ]; From 56d0c9b875b1fd6fb6718cf4149d6ea0687b063f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 05:25:26 +0000 Subject: [PATCH 1669/2279] stargazer: 1.3.3 -> 1.3.4 --- pkgs/by-name/st/stargazer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix index 9253987b5589..16277889dffd 100644 --- a/pkgs/by-name/st/stargazer/package.nix +++ b/pkgs/by-name/st/stargazer/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-ZkJ0X++QmQIsDKBjLEHRHeWJxFLooqXBBijIwSF6dcQ="; + hash = "sha256-9JNOq9SV3sHDlVaPUnZRq/8WNPQ/iF3AdSvAoCEtg7k="; }; - cargoHash = "sha256-ufp9ib0wkehJcKHpt2yyV//000isY2+HaOzlPVMz50Y="; + cargoHash = "sha256-p1COGfMjHNZeAWYdVzCo/mHM75Tt5klxtYWn8tAuH0g="; passthru = { tests.basic-functionality = nixosTests.stargazer; From eee1a5507862367aad10bb6c61eb7a728149bffa Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Sun, 2 Nov 2025 09:06:15 -0300 Subject: [PATCH 1670/2279] backrest: fix build on darwin --- pkgs/by-name/ba/backrest/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 2ab3f13341b0..2a4f0b1a5f8b 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -93,6 +93,7 @@ buildGoModule { ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestBackup" # relies on ionice "TestCancelBackup" + "TestFirstRun" # e2e test requires networking ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; From 6b41514c760862a1fefd4d00683cb011f6b656d2 Mon Sep 17 00:00:00 2001 From: jaysa68 Date: Fri, 7 Nov 2025 21:42:14 -0800 Subject: [PATCH 1671/2279] python3Packages.mkdocs-material: 9.6.22 -> 9.6.23 Diff: https://github.com/squidfunk/mkdocs-material/compare/refs/tags/9.6.22...refs/tags/9.6.23 Changelog: https://github.com/squidfunk/mkdocs-material/blob/9.6.23/CHANGELOG --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 490a355a78ec..e94f596e43d4 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.6.22"; + version = "9.6.23"; pyproject = true; src = fetchFromGitHub { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-64+9cIxMA0Kloe0XEycWxjz+ghkcWYc6DZ+LuJN/5Tc="; + hash = "sha256-k9xoysCbmWqdu1hNUTbWbTvPCuo8gcyvXEDecHiOpEw="; }; build-system = [ From 4202814f8599c1b37c0aeeaf8d07824641469e04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 05:42:38 +0000 Subject: [PATCH 1672/2279] python3Packages.bosch-alarm-mode2: 0.4.6 -> 0.4.7 --- pkgs/development/python-modules/bosch-alarm-mode2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix index bbbf81d71d18..f5e833f1f844 100644 --- a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix +++ b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bosch-alarm-mode2"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; src = fetchFromGitHub { owner = "mag1024"; repo = "bosch-alarm-mode2"; tag = "v${version}"; - hash = "sha256-oTGkEguN4EFJI5+UhqxKBN1x2Ppf9wQ0AeYbiLi1fhk="; + hash = "sha256-3eb9Exhu3ME++m+JRCVNpiUVIE3QSb9NRmvi+wZf/QY="; }; build-system = [ From 971d873fd2c62c153780639afba789c984338fc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 05:44:25 +0000 Subject: [PATCH 1673/2279] llama-cpp: 6908 -> 6981 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 5aa3e6002e84..864ca4e10c8e 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -75,13 +75,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "6908"; + version = "6981"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-7zgeVK1dQLFy9rm6VsaVK9/vIadMst+RNry5Vf7yk+A="; + hash = "sha256-0WtiHDlMeb+m2XcMwkPFY1mtwVTwRJUoxQSwzpiRbts="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From bdd71b8cdf12c4ab4d536d04871471d75efbf5da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 05:44:53 +0000 Subject: [PATCH 1674/2279] python3Packages.disposable-email-domains: 0.0.145 -> 0.0.147 --- .../python-modules/disposable-email-domains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index 37b92dfff92c..ae8d406c4e2d 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "disposable-email-domains"; - version = "0.0.145"; + version = "0.0.147"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit version; - hash = "sha256-l8Il11KKgYUNKNCg9sDJ0Wsucaq+Hat5l7DnkTBjmzY="; + hash = "sha256-sbMQ9izDOzrQOoYKpSLWO/+W2/3bGMhlyFP34oOff5g="; }; build-system = [ From 19751496f4668dc6a35214ec0d2f756041f9a427 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sun, 19 Oct 2025 18:20:45 +0900 Subject: [PATCH 1675/2279] perlPackages.FinanceQuote: 1.66 -> 1.67 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index beba321f8b99..26a964e72138 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14233,10 +14233,10 @@ with self; FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.66"; + version = "1.67"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-GOkdcI+Ah6JvvL+zsKYe0UcdKks855jecwTzBIGkZ+k="; + hash = "sha256-uqip/AS5o4+nh77gAWvNTMMwHMmi8KbDeBGaNdre6zA="; }; buildInputs = [ DateManip From c8ecc1228eae290d6b15562d69fea191c70fa727 Mon Sep 17 00:00:00 2001 From: jaysa68 Date: Fri, 7 Nov 2025 22:00:01 -0800 Subject: [PATCH 1676/2279] maintainers: add jaysa68 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97aad0f32f0e..535ef1d43934 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11750,6 +11750,12 @@ githubId = 29395089; name = "Jay Rovacsek"; }; + jaysa68 = { + email = "gh@jaysa.net"; + github = "jaysa68"; + githubId = 114126812; + name = "Jaysa Maria Garcia"; + }; jb55 = { email = "jb55@jb55.com"; github = "jb55"; From 77b08002aa8fc43163bae985704dd06310015d8b Mon Sep 17 00:00:00 2001 From: jaysa68 Date: Fri, 7 Nov 2025 22:01:39 -0800 Subject: [PATCH 1677/2279] python3Packages.mkdocs-material: add jaysa68 to maintainers --- pkgs/development/python-modules/mkdocs-material/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index e94f596e43d4..47a5a2d005b5 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -89,6 +89,9 @@ buildPythonPackage rec { downloadPage = "https://github.com/squidfunk/mkdocs-material"; homepage = "https://squidfunk.github.io/mkdocs-material/"; license = licenses.mit; - maintainers = with maintainers; [ dandellion ]; + maintainers = with maintainers; [ + dandellion + jaysa68 + ]; }; } From 3a311db24692b09e1b3b9fc0dcc7ed673a322381 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 06:27:30 +0000 Subject: [PATCH 1678/2279] snakemake: 9.13.4 -> 9.13.7 --- pkgs/by-name/sn/snakemake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index b039621ce98a..d91a307ba777 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.13.4"; + version = "9.13.7"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-SNI9MS1rQ7G27HBeORQ83JOCaCNgp+6h5GeK6sXU2Lg="; + hash = "sha256-hYITdHXV5qRmxXOTHnUgkR9xVXOyqP470a8zOhlCoLo="; }; postPatch = '' From 90ac3ac6822a307f49344b35a76cdeda769592df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 06:45:01 +0000 Subject: [PATCH 1679/2279] youki: 0.5.5 -> 0.5.7 --- pkgs/by-name/yo/youki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 29ce3647255d..3c5ce7d2fed3 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.5.5"; + version = "0.5.7"; src = fetchFromGitHub { owner = "containers"; repo = "youki"; rev = "v${version}"; - hash = "sha256-r8/H/qTPBoNubg3f4+WC8lBkQXpdEE8Dapt2sGoFcTc="; + hash = "sha256-b2R9/ADoZfRSu1Qh7hImR1Y+ZX15Uhk7JFwD8ipec6o="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { "youki" ]; - cargoHash = "sha256-S2Cv7k4ine9/VbY2r8BSRwqVBtuqX55RYglm9W+LXvc="; + cargoHash = "sha256-R/1wE7twjMwlSns7ZV5nr8PZ/OzghcslvU+0Ic/oamQ="; meta = { description = "Container runtime written in Rust"; From 559becaabf0aa69a177b487aea5b9fe630467eec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 06:55:02 +0000 Subject: [PATCH 1680/2279] python3Packages.msticpy: 2.17.1 -> 2.17.2 --- pkgs/development/python-modules/msticpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msticpy/default.nix b/pkgs/development/python-modules/msticpy/default.nix index 2284c91ac90a..2f4fee074cca 100644 --- a/pkgs/development/python-modules/msticpy/default.nix +++ b/pkgs/development/python-modules/msticpy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pname = "msticpy"; - version = "2.17.1"; + version = "2.17.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -59,7 +59,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "msticpy"; tag = "v${version}"; - hash = "sha256-2p06WKqs0lApEjWhSrq2BL95OxbyBg0Jn2ziwxsNEEE="; + hash = "sha256-tzAfynPyIqvWHxzLZ67r/Q5hNBKZAJhllhEVJ69L43k="; }; pythonRelaxDeps = [ From c7155ef85e0b31c07cdb3e2e7f84a820f6d37636 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 07:12:08 +0000 Subject: [PATCH 1681/2279] rcon-cli: 1.7.2 -> 1.7.3 --- pkgs/by-name/rc/rcon-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix index 6afa73ae7fb9..575bfee0baa1 100644 --- a/pkgs/by-name/rc/rcon-cli/package.nix +++ b/pkgs/by-name/rc/rcon-cli/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "rcon-cli"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "itzg"; repo = "rcon-cli"; tag = finalAttrs.version; - hash = "sha256-wog4nnXITV5p2lzfuO9tB//B87nh8KGpsCfSalt8WvE="; + hash = "sha256-v9f367XTPKAocGdwwPe/dXsFK30THbqpQwuvSV/lWN4="; }; - vendorHash = "sha256-vD+i3vMInErO0MpIRgsVe0Fl6HuFIwUS8xKHdZ7lxVM="; + vendorHash = "sha256-TogEdy0rtOzywBCtJ9dw8jO25dzxygqDGFDCbCNwhz8="; subPackages = [ "." ]; passthru.updateScript = nix-update-script { }; From c2e7678ab108656915490899a847ea35f47dfaae Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sat, 8 Nov 2025 00:15:28 -0700 Subject: [PATCH 1682/2279] anubis: 1.23.0 -> 1.23.1 https://github.com/TecharoHQ/anubis/releases/tag/v1.23.1 Diff: https://github.com/TecharoHQ/anubis/compare/v1.23.0...v1.23.1 --- pkgs/by-name/an/anubis/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 6622627602a2..eb12f2b5b96f 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -15,21 +15,21 @@ buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-uuYPtkhHMP2WafV7iFMwuh8Bm39Mf7ww6H/io54dwCM="; + hash = "sha256-nE6LXB0+q313UatT3f4Cn/hbTxc4mSMHQnUm0xzTuvE="; }; - vendorHash = "sha256-0W3nBc4vu3hnQTDB561zmx/2rOYo7D+vo8jvx10cBUc="; + vendorHash = "sha256-45SQUDvTX2xc8jJ8NXerbqRkQhBv6xyOPypJQf+tExU="; npmDeps = fetchNpmDeps { name = "anubis-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-KEQYF+LTSw0g3+wF4e8u31ERYsNVHlOjTMdDH6Q2/hI="; + hash = "sha256-zlJD/Mv39bUHx+q+QSXpYWhELvbk7MCNWXLWcB4SP2A="; }; nativeBuildInputs = [ From e2d8a70246fb4fb955ebb333ebabd8d7900d0aa1 Mon Sep 17 00:00:00 2001 From: Shelvacu Date: Sun, 2 Nov 2025 09:39:23 -0800 Subject: [PATCH 1683/2279] copyparty: init at 1.19.20 This makes #422127 obselete --- .../co/copyparty-full-buggy/package.nix | 17 ++ pkgs/by-name/co/copyparty-min/package.nix | 17 ++ pkgs/by-name/co/copyparty-most/package.nix | 17 ++ pkgs/by-name/co/copyparty/package.nix | 174 ++++++++++++++++++ 4 files changed, 225 insertions(+) create mode 100644 pkgs/by-name/co/copyparty-full-buggy/package.nix create mode 100644 pkgs/by-name/co/copyparty-min/package.nix create mode 100644 pkgs/by-name/co/copyparty-most/package.nix create mode 100644 pkgs/by-name/co/copyparty/package.nix diff --git a/pkgs/by-name/co/copyparty-full-buggy/package.nix b/pkgs/by-name/co/copyparty-full-buggy/package.nix new file mode 100644 index 000000000000..d717d141a832 --- /dev/null +++ b/pkgs/by-name/co/copyparty-full-buggy/package.nix @@ -0,0 +1,17 @@ +{ copyparty }: +copyparty.override { + withHashedPasswords = true; + withCertgen = true; + withThumbnails = true; + withFastThumbnails = true; + withMediaProcessing = true; + withBasicAudioMetadata = true; + withZeroMQ = true; + withFTP = true; + withFTPS = true; + withTFTP = true; + withMagic = true; + withSMB = true; + nameSuffix = "-full-buggy"; + longDescription = "Full variant, all dependencies and features including those marked buggy"; +} diff --git a/pkgs/by-name/co/copyparty-min/package.nix b/pkgs/by-name/co/copyparty-min/package.nix new file mode 100644 index 000000000000..b2bd2b42ce53 --- /dev/null +++ b/pkgs/by-name/co/copyparty-min/package.nix @@ -0,0 +1,17 @@ +{ copyparty }: +copyparty.override { + withHashedPasswords = false; + withCertgen = false; + withThumbnails = false; + withFastThumbnails = false; + withMediaProcessing = false; + withBasicAudioMetadata = false; + withZeroMQ = false; + withFTP = false; + withFTPS = false; + withTFTP = false; + withSMB = false; + withMagic = false; + nameSuffix = "-min"; + longDescription = "Minimal variant, minimal dependencies and fewest features"; +} diff --git a/pkgs/by-name/co/copyparty-most/package.nix b/pkgs/by-name/co/copyparty-most/package.nix new file mode 100644 index 000000000000..6e8fa8e8b205 --- /dev/null +++ b/pkgs/by-name/co/copyparty-most/package.nix @@ -0,0 +1,17 @@ +{ copyparty }: +copyparty.override { + withHashedPasswords = true; + withCertgen = true; + withThumbnails = true; + withFastThumbnails = true; + withMediaProcessing = true; + withBasicAudioMetadata = true; + withZeroMQ = true; + withFTP = true; + withFTPS = true; + withTFTP = true; + withSMB = false; + withMagic = true; + nameSuffix = "-most"; + longDescription = "Almost-full variant, all dependencies and features except those marked buggy"; +} diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix new file mode 100644 index 000000000000..558b476480be --- /dev/null +++ b/pkgs/by-name/co/copyparty/package.nix @@ -0,0 +1,174 @@ +# partially sourced from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/copyparty/default.nix +{ + lib, + + fetchurl, + + python3Packages, + + # non-python deps + cfssl, + ffmpeg, + util-linux, + + # options + # use argon2id-hashed passwords in config files (sha2 is always available) + withHashedPasswords ? true, + + # generate TLS certificates on startup (pointless when reverse-proxied) + withCertgen ? true, + + # create thumbnails with Pillow; faster than FFmpeg / MediaProcessing + withThumbnails ? true, + + # create thumbnails with PyVIPS; even faster, uses more memory + # -- can be combined with Pillow to support more filetypes + withFastThumbnails ? false, + + # enable FFmpeg; thumbnails for most filetypes (also video and audio), extract audio metadata, transcode audio to opus + # -- possibly dangerous if you allow anonymous uploads, since FFmpeg has a huge attack surface + # -- can be combined with Thumbnails and/or FastThumbnails, since FFmpeg is slower than both + withMediaProcessing ? true, + + # if MediaProcessing is not enabled, you probably want this instead (less accurate, but much safer and faster) + withBasicAudioMetadata ? false, + + # send ZeroMQ messages from event-hooks + withZeroMQ ? true, + + # enable FTP server + withFTP ? true, + + # enable FTPS support in the FTP server + withFTPS ? false, + + # enable TFTP server + withTFTP ? false, + + # samba/cifs server; dangerous and buggy, enable if you really need it + withSMB ? false, + + # enables filetype detection for nameless uploads + withMagic ? false, + + # extra packages to add to the PATH + extraPackages ? [ ], + + # function that accepts a python packageset and returns a list of packages to + # be added to the python venv. useful for scripts and such that require + # additional dependencies + extraPythonPackages ? (_p: [ ]), + + nameSuffix ? "", + + # this goes directly into meta.longDescription + longDescription ? "Default build", +}: + +let + runtimeDeps = ([ util-linux ] ++ extraPackages ++ lib.optional withMediaProcessing ffmpeg); +in + +python3Packages.buildPythonApplication rec { + pname = "copyparty${nameSuffix}"; + version = "1.19.20"; + + src = fetchurl { + url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz"; + hash = "sha256-BQzMNFVOWSEKynpn2HoYbmmz9NvgE9XuLxGiLCWagqY="; + }; + + pyproject = true; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = + with python3Packages; + [ + jinja2 + fusepy + ] + ++ lib.optional withSMB impacket + ++ lib.optional withFTP pyftpdlib + ++ lib.optional withFTPS pyopenssl + ++ lib.optional withTFTP partftpy + ++ lib.optional withCertgen cfssl + ++ (lib.optionals withThumbnails [ + pillow + pillow-jpls + pillow-heif + rawpy + ]) + ++ lib.optional withFastThumbnails pyvips + ++ lib.optional withMediaProcessing ffmpeg + ++ lib.optional withBasicAudioMetadata mutagen + ++ lib.optional withHashedPasswords argon2-cffi + ++ lib.optional withZeroMQ pyzmq + ++ lib.optional withMagic magic + ++ (extraPythonPackages python3Packages); + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath runtimeDeps}" ]; + + meta = { + description = "turn almost any device into a file server over http(s), webdav, ftp(s), and tftp"; + inherit longDescription; + homepage = "https://github.com/9001/copyparty"; + license = + let + # list from https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile + includedLibraryLicenses = with lib.licenses; { + # https://github.com/openpgpjs/asmcrypto.js + asmcrypto = mit; + # https://github.com/markedjs/marked + marked = [ + # https://github.com/markedjs/marked/blob/master/LICENSE.md + mit + bsd3 + ]; + # https://github.com/Ionaru/easy-markdown-editor + easy-markdown-editor = lib.licenses.mit; + # https://github.com/codemirror/codemirror5 + codemirror = lib.licenses.mit; + # https://github.com/cure53/DOMPurify + dompurify = [ + asl20 # or + mpl20 + ]; + # https://github.com/FortAwesome/Font-Awesome + font-awesome = [ + cc-by-40 + ofl + mit + ]; + # https://github.com/PrismJS/prism/blob/v2/LICENSE + prism = mit; + # https://files.pythonhosted.org/packages/04/0b/4506cb2e831cea4b0214d3625430e921faaa05a7fb520458c75a2dbd2152/fusepy-3.0.1.tar.gz + # https://pypi.org/project/fusepy + # https://github.com/fusepy/fusepy + fusepy = isc; + }; + copypartyLicense = lib.licenses.mit; + res = lib.pipe includedLibraryLicenses [ + builtins.attrValues + (a: a ++ [ copypartyLicense ]) + lib.flatten + lib.unique + ]; + in + res; + sourceProvenance = with lib.sourceTypes; [ + fromSource + # the javascript deps come pre-built + # see https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile + binaryBytecode + binaryNativeCode + ]; + maintainers = with lib.maintainers; [ + shelvacu + ]; + mainProgram = "copyparty"; + platforms = lib.platforms.all; + }; +} From 37c9d409af76f6048fbf049b0d7969bafe18d242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 08:07:47 +0000 Subject: [PATCH 1684/2279] python3Packages.aiobtclientapi: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/aiobtclientapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix index 22926e017b13..6af43695037d 100644 --- a/pkgs/development/python-modules/aiobtclientapi/default.nix +++ b/pkgs/development/python-modules/aiobtclientapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobtclientapi"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; src = fetchFromGitea { @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "plotski"; repo = "aiobtclientapi"; tag = "v${version}"; - hash = "sha256-ZpUaMsJs1vdVGQOid7aJ+SJKaCbTtHfSw7cOwPTL0ss="; + hash = "sha256-ga3EyKhfdEKkjFktUlgLSX54QbTc/a48vmWjmRqa+4w="; }; pythonRelaxDeps = [ From d45681ecd01f862a3bfcf0f158c428252803f9e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 08:11:29 +0000 Subject: [PATCH 1685/2279] rapidcsv: 8.89 -> 8.90 --- pkgs/by-name/ra/rapidcsv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rapidcsv/package.nix b/pkgs/by-name/ra/rapidcsv/package.nix index 5f2c81bc0fe6..9277d3e3b8f9 100644 --- a/pkgs/by-name/ra/rapidcsv/package.nix +++ b/pkgs/by-name/ra/rapidcsv/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rapidcsv"; - version = "8.89"; + version = "8.90"; src = fetchFromGitHub { owner = "d99kris"; repo = "rapidcsv"; rev = "v${finalAttrs.version}"; - hash = "sha256-Xs9dNpOU6ZcbYX9AfkWkwMb/Bc7s2GTMUTDOBaO7VDM="; + hash = "sha256-0t2iURPBJpqt1Ndznuqg0qnnz574FtDAwyWTcYM1hBA="; }; nativeBuildInputs = [ From bf559bd45a91a7dbde66cc6c554d5d6588b55619 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 08:11:39 +0000 Subject: [PATCH 1686/2279] oneDNN: 3.9.1 -> 3.10 --- pkgs/by-name/on/oneDNN/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index e196a0acb4f9..f8365440bda8 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.9.1"; + version = "3.10"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-DbLW22LgG8wrBNMsxoUGlacHLcfIBwqyiv+HOmFDtxc="; + hash = "sha256-EII2EFCxU+ZnmfnRM8dfHa+sEi2z+7k2ikBbfpZafko="; }; outputs = [ From 09ad6013c68ecfb655bfe613b4ecb10acb32cca3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 6 Nov 2025 12:22:24 +0100 Subject: [PATCH 1687/2279] spandsp: backport additional memory safety fix This one caused a test failure on x86_64-unknown-linux-musl. Closes: https://github.com/NixOS/nixpkgs/issues/458398 See PR #459116 --- .../development/libraries/spandsp/default.nix | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 9720e110f7cf..87996abdeeb0 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -2,6 +2,8 @@ fetchurl, fetchpatch, callPackage, + lib, + stdenv, }: (callPackage ./common.nix { }) rec { @@ -11,11 +13,31 @@ sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; patches = [ - (fetchpatch { - url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch"; - includes = [ "spandsp-sim/g1050.c" ]; - hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ="; - }) + # FIXME: clean up rebuild avoidance on staging. + ( + if + lib.elem stdenv.hostPlatform.config [ + "arm64-apple-darwin" + "aarch64-unknown-linux-gnu" + "x86_64-apple-darwin" + "x86_64-unknown-linux-gnu" + ] + then + fetchpatch { + url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch"; + includes = [ "spandsp-sim/g1050.c" ]; + hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ="; + } + else + fetchpatch { + url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch"; + includes = [ + "spandsp-sim/g1050.c" + "spandsp-sim/test_utils.c" + ]; + hash = "sha256-2MmVgyMUK0Zn+mL7IX57Y7brYpgmt4GVlis5/NstuNM="; + } + ) (fetchpatch { url = "https://github.com/freeswitch/spandsp/commit/f47bcdc301fbddad44e918939eed1b361882f740.patch"; hash = "sha256-O+lIC3V92GVFoiHsUQOXkoTN2hJ7v5+LQP7RrAhvwlY="; From 8c51e99b96d8cf75782e63341be41805167cbe28 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Sat, 24 May 2025 19:13:31 +0200 Subject: [PATCH 1688/2279] nixos/step-ca: Allow not configuring the intermediatePasswordFile It is not necessary for the intermediate certificate to have a password set, but currently the intermediatePasswordFile value is always accessed to load the credential. --- nixos/modules/services/security/step-ca.nix | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index d7ed2acf7664..746d3c0b3839 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -55,10 +55,13 @@ in ''; }; intermediatePasswordFile = lib.mkOption { - type = lib.types.pathWith { - inStore = false; - absolute = true; - }; + type = lib.types.nullOr ( + lib.types.pathWith { + inStore = false; + absolute = true; + } + ); + default = null; example = "/run/keys/smallstep-password"; description = '' Path to the file containing the password for the intermediate @@ -104,11 +107,18 @@ in ReadWritePaths = ""; # override upstream # LocalCredential handles file permission problems arising from the use of DynamicUser. - LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}"; + LoadCredential = lib.mkIf ( + cfg.intermediatePasswordFile != null + ) "intermediate_password:${cfg.intermediatePasswordFile}"; ExecStart = [ "" # override upstream - "${cfg.package}/bin/step-ca /etc/smallstep/ca.json --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password" + ( + "${cfg.package}/bin/step-ca /etc/smallstep/ca.json" + + lib.optionalString ( + cfg.intermediatePasswordFile != null + ) " --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password" + ) ]; # ProtectProc = "invisible"; # not supported by upstream yet From 958321447e73493e12c6df455b73e9dd70e8ab95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 09:00:16 +0000 Subject: [PATCH 1689/2279] koboldcpp: 1.101 -> 1.101.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 949081fc8774..72cd7a7bbae9 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -41,13 +41,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.101"; + version = "1.101.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-WwTl+u7FJ4E+x+jjwh0wmPM7fjsPxu7+TrEwKQQfyLA="; + hash = "sha256-gPbvzbbgm13HjXISPY5hpcCgUejQ5OHkmMu2zCwm/sQ="; }; enableParallelBuilding = true; From 55fd45273a60fa488c934092d8f7bb13e503a1e7 Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Sat, 8 Nov 2025 10:35:29 +0100 Subject: [PATCH 1690/2279] qwen-code: 0.1.4 -> 0.2.0 --- pkgs/by-name/qw/qwen-code/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index 9b8245cbf7c2..e2424f9b31d7 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-go5fjs5aSG6wqxw3y2/OrhPSWGawUjpq+ZxAnVW7Xe8="; + hash = "sha256-nav99mAXwgJfyHr8dLGjUMAJMmyWhjt4TN9IVGHSyJs="; }; - npmDepsHash = "sha256-UP1pV1CAwGspzUzhHw8yWxIBb7D5jHFdCn7DH4KjdO4="; + npmDepsHash = "sha256-gWGPrbHzWfH6bwHXySbDN6EzxULQZ3eWPaFBKsa5JUk="; nativeBuildInputs = [ jq From 727314ed78a954f24f122bbd10ff10561bb722f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 8 Nov 2025 09:18:09 +0100 Subject: [PATCH 1691/2279] python3Packages.protobuf: check version compatibility Let's avoid situations from #459656 early, e.g. log https://hydra.nixos.org/build/312538974/nixlog/1/tail Note that python3Packages.protobuf is in protobuf.tests, so that we should notice when updating protobuf in particular. --- pkgs/development/python-modules/protobuf/6.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index d3aa019da237..f5ce6a82e716 100644 --- a/pkgs/development/python-modules/protobuf/6.nix +++ b/pkgs/development/python-modules/protobuf/6.nix @@ -23,8 +23,12 @@ buildPythonPackage rec { protobuf ]; - # the pypi source archive does not ship tests - doCheck = false; + doCheck = + # https://protobuf.dev/support/cross-version-runtime-guarantee/#backwards + # The non-python protobuf provides the protoc binary which must not be newer. + assert lib.versionAtLeast version ("6." + protobuf.version); + # the pypi source archive does not ship tests + false; pythonImportsCheck = [ "google.protobuf" @@ -45,7 +49,9 @@ buildPythonPackage rec { meta = { description = "Protocol Buffers are Google's data interchange format"; homepage = "https://developers.google.com/protocol-buffers/"; - changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}"; + changelog = "https://github.com/protocolbuffers/protobuf/releases/v${ + builtins.substring 2 (-1) version + }"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From deb8005a343261bf351b2f423e6fef83429f1418 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 09:59:48 +0000 Subject: [PATCH 1692/2279] vimPlugins.vim-stationeers-ic10-syntax: 0-unstable-2025-10-09 -> 0-unstable-2025-11-02 --- .../non-generated/vim-stationeers-ic10-syntax/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix index dc81b884361d..8d628bdd7767 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix @@ -6,13 +6,13 @@ }: vimUtils.buildVimPlugin { pname = "vim-ic10"; - version = "0-unstable-2025-10-09"; + version = "0-unstable-2025-11-02"; src = fetchFromGitLab { owner = "LittleMorph"; repo = "vim-ic10"; - rev = "7e9cb3bf91f692e26e899a6d513fcee7dd60bf72"; - hash = "sha256-7mQ8PEbqQS4E8Kg6nU+uTj9Nyke80FEcLpmV46B7GFA="; + rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4"; + hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys="; }; passthru.updateScript = nix-update-script { From 7e0359f671eadec6fdd61613807a57f934653754 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 10:12:47 +0000 Subject: [PATCH 1693/2279] bashunit: 0.25.0 -> 0.26.0 --- pkgs/by-name/ba/bashunit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index 2a02ddd9d390..bce78ee9efeb 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bashunit"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "TypedDevs"; repo = "bashunit"; tag = finalAttrs.version; - hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y="; + hash = "sha256-cZ2fcm4OxA3Ly8QRkOQSjaSZW80/Pu2z10+iN4pDFOs="; forceFetchGit = true; # needed to include the tests directory for the check phase }; From 7a8f7f8e7cc5596e46b6037b9b904f32dde48f50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 10:37:05 +0000 Subject: [PATCH 1694/2279] ast-grep: 0.39.7 -> 0.39.9 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 94c1cc3909fd..108bc700447c 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.39.7"; + version = "0.39.9"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-D/fdy2oMwlXVMzoSCcYSz1fiazVCypvj4X3G6vBWBUw="; + hash = "sha256-OzDx1/U4uZuMGanTaDi1Bu3ueMaf83jJIqy+20+cX0g="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm .cargo/config.toml ''; - cargoHash = "sha256-AuVD3n+T9UNLw6+IuM9l2AoMb7eEFhr+ZlktYZQYI80="; + cargoHash = "sha256-YtukqwUvpAQf8Dxf0rhowylt8h1VhN9PcnF+QiB8WmA="; nativeBuildInputs = [ installShellFiles ]; From fa5ab239989ff614b526e62761e7edcd79a2b413 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 11:45:54 +0100 Subject: [PATCH 1695/2279] python3Packages.pyopen-wakeword: mark broken on darwin Fails automatic application of patchelf. Waiting for a source-built libtflite. --- pkgs/development/python-modules/pyopen-wakeword/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyopen-wakeword/default.nix b/pkgs/development/python-modules/pyopen-wakeword/default.nix index 79114e2b493a..2f5255d364c5 100644 --- a/pkgs/development/python-modules/pyopen-wakeword/default.nix +++ b/pkgs/development/python-modules/pyopen-wakeword/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, autoPatchelfHook, buildPythonPackage, fetchFromGitHub, @@ -45,6 +46,8 @@ buildPythonPackage rec { ]; meta = { + # elftools.common.exceptions.ELFError: Magic number does not match + broken = stdenv.hostPlatform.isDarwin; description = "Alternative Python library for openWakeWord"; homepage = "https://github.com/rhasspy/pyopen-wakeword"; changelog = "https://github.com/rhasspy/pyopen-wakeword/blob/${src.tag}/CHANGELOG.md"; From bc3b386ab4121f59ea963a075fec4129de5188c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 11:50:45 +0100 Subject: [PATCH 1696/2279] python3Packages.python-u2flib-server: drop Broken leaf package and archived upstream. --- .../python-u2flib-server/default.nix | 54 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/python-modules/python-u2flib-server/default.nix diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix deleted file mode 100644 index fa93cb83fce8..000000000000 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # propagates - cryptography, - six, - - # optional - webob, - - # tests - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "python-u2flib-server"; - version = "5.0.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "Yubico"; - repo = "python-u2flib-server"; - rev = version; - hash = "sha256-ginP9u+aHcdaWpwcFYJWu0Ghf7+nDZq9i3TVAacIPhg="; - }; - - patches = [ ./cryptography-37-compat.patch ]; - - propagatedBuildInputs = [ - cryptography - six - ]; - - optional-dependencies = { - u2f_server = [ webob ]; - }; - - pythonImportsCheck = [ - "u2flib_server" - "u2flib_server.u2f" - ]; - - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server; - - meta = with lib; { - description = "Python based U2F server library"; - homepage = "https://github.com/Yubico/python-u2flib-server"; - changelog = "https://github.com/Yubico/python-u2flib-server/blob/${src.rev}/NEWS"; - license = licenses.bsd2; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bd55bef928de..3e414d290a60 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -364,6 +364,7 @@ mapAliases { python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29 python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26 python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29 + python-u2flib-server = throw "'python-u2flib-server' has been removed, since it was broken and archived upstream"; # added 2025-11-08 python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25 python_docs_theme = throw "'python_docs_theme' has been renamed to/replaced by 'python-docs-theme'"; # Converted to throw 2025-10-29 python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecc31ff35bc8..8a1afebd819d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15312,8 +15312,6 @@ self: super: with self; { python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; - python-u2flib-server = callPackage ../development/python-modules/python-u2flib-server { }; - python-uinput = callPackage ../development/python-modules/python-uinput { }; python-ulid = callPackage ../development/python-modules/python-ulid { }; From f5f8aab9648946d152652b19bdf52222f97ba8ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 11:54:37 +0100 Subject: [PATCH 1697/2279] servo: mark broken on darwin = note: Undefined symbols for architecture arm64: "typeinfo for js::BaseProxyHandler", referenced from: typeinfo for ForwardingProxyHandler in libmozjs_sys-aaa8b4d8213d86fd.rlib(702045c0c9daef17-jsglue.o) "typeinfo for js::Wrapper", referenced from: typeinfo for WrapperProxyHandler in libmozjs_sys-aaa8b4d8213d86fd.rlib(702045c0c9daef17-jsglue.o) ld: symbol(s) not found for architecture arm64 clang: error: linker command failed with exit code 1 (use -v to see invocation) --- pkgs/by-name/se/servo/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 1a17596d64f5..6ec0104350f5 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -180,6 +180,8 @@ rustPlatform.buildRustPackage { }; meta = { + # undefined libmozjs_sys symbols during linking + broken = stdenv.hostPlatform.isDarwin; description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine"; homepage = "https://servo.org"; license = lib.licenses.mpl20; From 2f72afeaadf3af84c329692d00cd0a9efe60dad9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 11:02:37 +0000 Subject: [PATCH 1698/2279] python3Packages.hcloud: 2.9.0 -> 2.10.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 98e8494cd0a2..8f01aef21a2b 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "hcloud"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MkYvojUd20ehps6whNcMg1hRgiTkS04Bl/LlwPZ62O8="; + hash = "sha256-EIO8s47temWK/pgm/8Gi2xgQyoOQoi9LjEN4cTjosbo="; }; build-system = [ setuptools ]; From a4b571cbcdf462092d393da2066e7ba1a033c386 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 8 Nov 2025 11:50:23 +0100 Subject: [PATCH 1699/2279] gimp2: apply security fixes Fixes CVE-2025-10934 Fixes CVE-2025-10922 Fixes CVE-2025-48797 Fixes CVE-2025-48798 Fixes CVE-2025-2760 Fixes CVE-2025-2761 Fixes CVE-2025-5473 Fixes CVE-2025-6035 --- .../graphics/gimp/2.0/default.nix | 69 ++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix index 90a9061d52f9..c68a0b03d6a3 100644 --- a/pkgs/applications/graphics/gimp/2.0/default.nix +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, replaceVars, autoreconfHook, pkg-config, @@ -88,6 +89,70 @@ stdenv.mkDerivation (finalAttrs: { # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) ./force-enable-libheif.patch + (fetchurl { + name = "CVE-2025-2760.patch"; + # https://gitlab.gnome.org/GNOME/gimp/-/commit/c17b324910204a47828d6fbb542bdcefbd66bcc1 + url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-2760.patch"; + hash = "sha256-BH5cCyg0IjfamHPchZ0HBe8EAPrWeHINQ6r7FHaz0qw="; + }) + (fetchpatch { + name = "CVE-2025-2761.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/0806bc76ca74543d20e1307ccf6aebd26395c56c.patch"; + hash = "sha256-I5dyD3gLbVdk5bTft3TveTWgBN7RouNpIByKbCYmGbo="; + }) + (fetchpatch { + name = "CVE-2025-5473.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/c855d1df60ebaf5ef8d02807d448eb088f147a2b.patch"; + hash = "sha256-QO8u5XQD3XR+sUN//LsvWpTxHe0i9m4VvdnsUGnor/0="; + }) + (fetchurl { + name = "CVE-2025-6035.patch"; + # https://gitlab.gnome.org/GNOME/gimp/-/commit/548bc3a46d54711d974aae9ce1bce291376c0436 + url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-6035.patch"; + hash = "sha256-cbALgUEUO8k5jaN5Y7jUR/dHJ9rHF06m9zEM/AOcFDk="; + }) + (fetchpatch { + name = "CVE-2025-48797_1.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/8d309dd0385fdd298520b69148542375f56ef977.patch"; + hash = "sha256-/JAUhbPko0EdHGSCnZIWVqPcXpdvRML5Fqx5w/B3P8k="; + }) + (fetchpatch { + name = "CVE-2025-48797_2.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/97f8c2e468cffce70c6772e74cbff8eda4e8c180.patch"; + hash = "sha256-tNG2fpZ0iRk0thrcxjZqb/zgvf4ctmXEy8iSOz5ufCo="; + }) + (fetchpatch { + name = "CVE-2025-48797_3.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/d7f0829ae995ca7ca9c64851a1ed03b11702ef1c.patch"; + hash = "sha256-Byvc0i8TS33ZAKONxkrS0iFdWTXZP2w8Ma+k15DGVkw="; + }) + (fetchpatch { + name = "CVE-2025-48797_4.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/ffb7cad1a402377927bc2dc62dad324ae03cec92.patch"; + hash = "sha256-PZvP4B3U+YalxWwmLhXyTZRacTtkG289JUWsQtZW4BE="; + }) + (fetchpatch { + name = "CVE-2025-48798_1.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/ebf0b569a63f15b5dc7532f16936104af1e09f02.patch"; + hash = "sha256-VyPbSyRTo+sYg2JkAH3h5exYHDMqIEHc9gYRcM/8wzg="; + }) + (fetchpatch { + name = "CVE-2025-48798_2.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/e7523ed41271e48a909011b8598d496c1be642e2.patch"; + hash = "sha256-ACoxobr2ySpH9VJVdJyWxQpZXOTSEs1me4Q0Rq3bDaE="; + }) + (fetchurl { + name = "CVE-2025-10922.patch"; + # https://gitlab.gnome.org/GNOME/gimp/-/commit/0f309f9a8d82f43fa01383bc5a5c41d28727d9e3 + url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-10922.patch"; + hash = "sha256-xkhmlOqk2QiOi4Le7v6e9PdTNxVHpSmuZJTTqKdThUo="; + }) + (fetchurl { + name = "CVE-2025-10934.patch"; + # https://gitlab.gnome.org/GNOME/gimp/-/commit/5c3e2122d53869599d77ef0f1bdece117b24fd7c + url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-10934.patch"; + hash = "sha256-MmYdh74cky/dF3UTHC0xpDW6+aa8Vzh+4ADHCDtIDzo="; + }) ]; # error: possibly undefined macro: AM_NLS @@ -181,7 +246,9 @@ stdenv.mkDerivation (finalAttrs: { env = { NIX_CFLAGS_COMPILE = toString ( - [ ] + [ + "-Wno-error=int-conversion" # Needed for CVE-2025-10934 patch + ] ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ] ); From 27d375fe0c579f7106e8d81e7905d88676a54a9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 11:10:55 +0000 Subject: [PATCH 1700/2279] terraform-providers.checkly_checkly: 1.15.0 -> 1.16.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 cc611a0c2f23..91d65c3c54dd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -145,13 +145,13 @@ "vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E=" }, "checkly_checkly": { - "hash": "sha256-UfaiZe5qSbnoyoYx1E1yXG8cQyBbG+wbJiBXR7jm0bE=", + "hash": "sha256-V5k+UdniG7v8obDXAtvRxTHgJa4I9rbjDsG/QrCxYTo=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.15.0", + "rev": "v1.16.0", "spdx": null, - "vendorHash": "sha256-Puf8Rex1o3P1XAO+LIXBWx9MTUUsaD+iJQkFLjqVJA0=" + "vendorHash": "sha256-E0XnwBMCfyP6sbBFkh+ulNa3fSaAGa5lSUD/PIfKvhE=" }, "ciscodevnet_aci": { "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=", From 16608c6329b6f52a29c801cb648adfa4ad5eff43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 11:25:01 +0000 Subject: [PATCH 1701/2279] SDL_image: 1.2.12-unstable-2025-06-15 -> 1.2.12-unstable-2025-11-06 --- pkgs/by-name/sd/SDL_image/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index a2311c7bbf65..83d867e72b3a 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL_image"; - version = "1.2.12-unstable-2025-06-15"; + version = "1.2.12-unstable-2025-11-06"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL_image"; - rev = "bb266d29e19493fa48bda9bbc56c26363099372f"; - hash = "sha256-I8TqZX3249/bcZtfwrJd545E5h9d9HmRy8GGDH9S+kU="; + rev = "7c6ea40bb75262740cd07f7658bc543f13c65b3c"; + hash = "sha256-V8d9En6fJArslFLIaeCdfVD5YoHPbKjOpR79Va8w8js="; }; configureFlags = [ From 1690f91c4c4d3d5490bc64b3239650d69d4b4ea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 11:39:49 +0000 Subject: [PATCH 1702/2279] cwltool: 3.1.20250925164626 -> 3.1.20251031082601 --- pkgs/by-name/cw/cwltool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix index 847d3484f7cf..d70d708e2fc6 100644 --- a/pkgs/by-name/cw/cwltool/package.nix +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20250925164626"; + version = "3.1.20251031082601"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; tag = version; - hash = "sha256-esY/p7wm0HvLiX+jZENBye4NblYveYAXevYRQxk+u44="; + hash = "sha256-avRNOdL4Ig2cYQWh8SqX/KWfgXyVg0TVfVFrlqzUCLA="; }; postPatch = '' From 7e8ad0e785058bffbfa09df4512a62c58d34f581 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 8 Nov 2025 12:39:36 +0100 Subject: [PATCH 1703/2279] opentoonz: drop --- pkgs/by-name/op/opentoonz/package.nix | 147 -------------------------- 1 file changed, 147 deletions(-) delete mode 100644 pkgs/by-name/op/opentoonz/package.nix diff --git a/pkgs/by-name/op/opentoonz/package.nix b/pkgs/by-name/op/opentoonz/package.nix deleted file mode 100644 index bf02ff0c8914..000000000000 --- a/pkgs/by-name/op/opentoonz/package.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - boost, - cmake, - fetchFromGitHub, - libglut, - freetype, - glew, - libsForQt5, - libjpeg, - libmypaint, - libpng, - libusb1, - lz4, - xz, - lzo, - openblas, - opencv, - pkg-config, - lib, - stdenv, - superlu, - libtiff, - zlib, -}: -let - libtiff-ver = "4.0.3"; # The version in thirdparty/tiff-* - opentoonz-ver = "1.7.1"; - - src = fetchFromGitHub { - owner = "opentoonz"; - repo = "opentoonz"; - rev = "v${opentoonz-ver}"; - hash = "sha256-5iXOvh4QTv+G0fjEHU62u7QCee+jbvKhK0+fQXbdJis="; - }; - - opentoonz-opencv = opencv.override { - inherit libtiff; - }; - - opentoonz-libtiff = stdenv.mkDerivation { - pname = "libtiff"; - version = "${libtiff-ver}-opentoonz"; - - inherit src; - outputs = [ - "bin" - "dev" - "out" - "man" - "doc" - ]; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ - zlib - libjpeg - xz - ]; - - postUnpack = '' - sourceRoot="$sourceRoot/thirdparty/tiff-${libtiff-ver}" - ''; - - # opentoonz uses internal libtiff headers - postInstall = '' - cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include - ''; - - meta = libtiff.meta // { - knownVulnerabilities = [ - '' - Do not open untrusted files with Opentoonz: - Opentoonz uses an old custom fork of tibtiff from 2012 that is known to - be affected by at least these 50 vulnerabilities: - CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 - CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 - CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 - CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 - CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 - CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 - CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 - CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 - CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 - CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 - CVE-2020-35523 CVE-2020-35524 - More info at https://github.com/opentoonz/opentoonz/issues/4193 - '' - ]; - maintainers = with lib.maintainers; [ chkno ]; - }; - }; -in -stdenv.mkDerivation { - inherit src; - - pname = "opentoonz"; - version = opentoonz-ver; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - boost - libglut - freetype - glew - libjpeg - libmypaint - libpng - opentoonz-libtiff - libusb1 - lz4 - xz - lzo - openblas - opentoonz-opencv - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.qtscript - libsForQt5.qtserialport - superlu - ]; - - postUnpack = "sourceRoot=$sourceRoot/toonz"; - - cmakeDir = "../sources"; - cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DTIFF_INCLUDE_DIR=${opentoonz-libtiff.dev}/include" - "-DTIFF_LIBRARY=${opentoonz-libtiff.out}/lib/libtiff.so" - (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) - ]; - - postInstall = '' - sed -i '/cp -r .*stuff/a\ chmod -R u+w $HOME/.config/OpenToonz/stuff' $out/bin/opentoonz - ''; - - meta = { - description = "Full-featured 2D animation creation software"; - homepage = "https://opentoonz.github.io/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ chkno ]; - }; -} From 5c3e75c4eebdbf3d8e6928c55a79f1e988d02273 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 8 Nov 2025 11:50:15 +0000 Subject: [PATCH 1704/2279] bun: 1.3.1 -> 1.3.2 Changelog: https://bun.com/blog/bun-v1.3.2 --- pkgs/by-name/bu/bun/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 9311c7f83886..63e6d45e381c 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "bun"; src = @@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ronylWETMwdRWqPdpdXv3R6dJod+yFtPGAABNDGqmO0="; + hash = "sha256-2FhHmC21dFGBMKRVgrzxTY4r6WELZstQRsIDSFeLD+I="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-ZWZqGEOeiR5XUbZmED/lkahRnxG2bsS9hlTFUV1P/4o="; + hash = "sha256-/jjBO2trRQr05PD7jgSyLspT+c1xBo0dHuv09KRPAvs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-pILjoY8BpW13NvpuQXjbNdoeVr3cgjJa10jhXKAdigs="; + hash = "sha256-LW3aLD9Xp6m7qFJdUcQAbj2M7MS2rTP/ae4HZgbBN7w="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-QAgkyCv8wIVDZbytoRz1PXOE7LHiw9oOLAosalJ9Vik="; + hash = "sha256-DLVqRIS9d2Sj7vm55nq0V4QJgSh7RnlJdNHmYSy/Zwk="; }; }; updateScript = writeShellScript "update-bun" '' From 05b2e6f67e983542c0022fb72bd8dfe33fcd27c0 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Nov 2025 13:01:58 +0100 Subject: [PATCH 1705/2279] python3Packages.gpapi: drop --- .../python-modules/gpapi/default.nix | 57 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/development/python-modules/gpapi/default.nix diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix deleted file mode 100644 index 9399e547a050..000000000000 --- a/pkgs/development/python-modules/gpapi/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - buildPythonPackage, - cryptography, - fetchPypi, - lib, - protobuf, - pycryptodome, - requests, - protobuf_27, - setuptools, -}: - -buildPythonPackage rec { - version = "0.4.4"; - pname = "gpapi"; - pyproject = true; - - src = fetchPypi { - inherit version pname; - sha256 = "sha256-HA06ie25ny7AXI7AvZgezvowfZ3ExalY8HDkk7betyo="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace-fail 'PROTOC_EXEC = "protoc"' 'PROTOC_EXEC = "${lib.getExe protobuf_27}"' - ''; - - build-system = [ setuptools ]; - - buildInputs = [ - protobuf_27 - ]; - - dependencies = [ - cryptography - protobuf - pycryptodome - requests - ]; - - preBuild = '' - export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION="python" - ''; - - # package doesn't contain unit tests - # scripts in ./test require networking - doCheck = false; - - pythonImportsCheck = [ "gpapi.googleplay" ]; - - meta = { - homepage = "https://github.com/NoMore201/googleplay-api"; - license = lib.licenses.gpl3Only; - description = "Google Play Unofficial Python API"; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3e414d290a60..6b3194c085e7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -183,6 +183,7 @@ mapAliases { GitPython = throw "'GitPython' has been renamed to/replaced by 'gitpython'"; # Converted to throw 2025-10-29 google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29 googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2025-10-29 + gpapi = throw "'gpapi' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09 gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29 grappelli_safe = throw "'grappelli_safe' has been renamed to/replaced by 'grappelli-safe'"; # Converted to throw 2025-10-29 groestlcoin_hash = throw "'groestlcoin_hash' has been renamed to/replaced by 'groestlcoin-hash'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a1afebd819d..cac114a540cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6286,8 +6286,6 @@ self: super: with self; { gower = callPackage ../development/python-modules/gower { }; - gpapi = callPackage ../development/python-modules/gpapi { }; - gpaw = callPackage ../development/python-modules/gpaw { }; gpgme = callPackage ../development/python-modules/gpgme { inherit (pkgs) gpgme; }; From d2fc2752f535c0bb7b2fec2db336fba1dbbf7434 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Nov 2025 13:02:19 +0100 Subject: [PATCH 1706/2279] python3Packages.gplaycli: drop --- .../python-modules/gplaycli/default.nix | 75 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 pkgs/development/python-modules/gplaycli/default.nix diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix deleted file mode 100644 index 9a726833c0a7..000000000000 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - args, - buildPythonPackage, - clint, - fetchFromGitHub, - libffi, - matlink-gpapi, - ndg-httpsclient, - protobuf, - pyasn1, - pyaxmlparser, - pytestCheckHook, - pythonOlder, - requests, - setuptools, -}: - -buildPythonPackage rec { - pname = "gplaycli"; - version = "3.29"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "matlink"; - repo = "gplaycli"; - tag = version; - hash = "sha256-uZBrIxnDSaJDOPcD7J4SCPr9nvecDDR9h+WnIjIP7IE="; - }; - - propagatedBuildInputs = [ - libffi - pyasn1 - clint - ndg-httpsclient - protobuf - requests - args - matlink-gpapi - pyaxmlparser - setuptools - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "gplaycli" ]; - - preCheck = '' - export PATH="$PATH:$out/bin"; - ''; - - disabledTests = [ - "test_alter_token" - "test_another_device" - "test_connection_credentials" - "test_connection_token" - "test_download_additional_files" - "test_download_focus" - "test_download_version" - "test_download" - "test_search" - "test_update" - ]; - - meta = with lib; { - description = "Google Play Downloader via Command line"; - mainProgram = "gplaycli"; - homepage = "https://github.com/matlink/gplaycli"; - changelog = "https://github.com/matlink/gplaycli/releases/tag/${version}"; - license = licenses.agpl3Plus; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6b3194c085e7..28174c5f29ed 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -184,6 +184,7 @@ mapAliases { google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29 googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2025-10-29 gpapi = throw "'gpapi' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09 + gplaycli = throw "'gplaycli' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09 gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29 grappelli_safe = throw "'grappelli_safe' has been renamed to/replaced by 'grappelli-safe'"; # Converted to throw 2025-10-29 groestlcoin_hash = throw "'groestlcoin_hash' has been renamed to/replaced by 'groestlcoin-hash'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cac114a540cc..5cf93bd4c6cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6296,8 +6296,6 @@ self: super: with self; { gpiozero = callPackage ../development/python-modules/gpiozero { }; - gplaycli = callPackage ../development/python-modules/gplaycli { }; - gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; gps3 = callPackage ../development/python-modules/gps3 { }; From 7296134da14e6b4a5a289047dbc9cab930e2bfe7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 12:02:52 +0000 Subject: [PATCH 1707/2279] nemorosa: 0.3.0 -> 0.4.0 --- pkgs/by-name/ne/nemorosa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nemorosa/package.nix b/pkgs/by-name/ne/nemorosa/package.nix index 11f772be2daf..113ec322d796 100644 --- a/pkgs/by-name/ne/nemorosa/package.nix +++ b/pkgs/by-name/ne/nemorosa/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "nemorosa"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "KyokoMiki"; repo = "nemorosa"; tag = version; - hash = "sha256-UBvtff5fU3kH/+Kw426+yyoyJ3aASBIYDPX+X5jqkA8="; + hash = "sha256-qirdikSJ5APEmPnRwGCEuc8E+J3AOd4uHO68VtmkDRA="; }; # Upstream uses overly strict, fresh version specifiers From d5769673b5e128d44961e8a4d44a8c97b238c91c Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 8 Nov 2025 11:54:42 +0000 Subject: [PATCH 1708/2279] codex: 0.55.0 -> 0.56.0 Changelog: https://github.com/openai/codex/releases/tag/rust-v0.56.0 --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index d00b2d09dc18..0a2afc4c8aab 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-gtYLMqQ3szUJMN1Jdcy2BPrJN8bxvrt0nVShcC2/JAA="; + hash = "sha256-CIKoOfqZwCCCDFXnRdU7haxfiyvrgGD3vSwXZpE9DUU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-1Wj6+CY9PwsOQ39dywepnaQvycg0jqq6iYYXnLgH1dw="; + cargoHash = "sha256-FN20afqRVdGl17+fbzNoXqF8BY+dPtGi1lvwB6w+ieE="; nativeBuildInputs = [ installShellFiles From d70fa33278d4c848e7c05f8f2bdda9a9732d236f Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Nov 2025 13:05:11 +0100 Subject: [PATCH 1709/2279] python3Packages.matlink-gpapi: drop --- .../python-modules/matlink-gpapi/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/python-modules/matlink-gpapi/default.nix diff --git a/pkgs/development/python-modules/matlink-gpapi/default.nix b/pkgs/development/python-modules/matlink-gpapi/default.nix deleted file mode 100644 index 3df24acd72a4..000000000000 --- a/pkgs/development/python-modules/matlink-gpapi/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - buildPythonPackage, - cryptography, - fetchPypi, - lib, - protobuf, - pycryptodome, - requests, -}: - -buildPythonPackage rec { - version = "0.4.4.5"; - format = "setuptools"; - pname = "matlink-gpapi"; - - src = fetchPypi { - inherit version pname; - sha256 = "0s45yb2xiq3pc1fh4bygfgly0fsjk5fkc4wckbckn3ddl7v7vz8c"; - }; - - # package doesn't contain unit tests - # scripts in ./test require networking - doCheck = false; - - pythonImportsCheck = [ "gpapi.googleplay" ]; - - propagatedBuildInputs = [ - cryptography - protobuf - pycryptodome - requests - ]; - - meta = with lib; { - homepage = "https://github.com/NoMore201/googleplay-api"; - license = licenses.gpl3Only; - description = "Google Play Unofficial Python API"; - maintainers = with maintainers; [ schnusch ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 28174c5f29ed..6a5f33f02284 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -250,6 +250,7 @@ mapAliases { Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29 Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29 mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 + matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09 MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29 MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29 memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cf93bd4c6cf..7445001618c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9145,8 +9145,6 @@ self: super: with self; { mathutils = callPackage ../development/python-modules/mathutils { }; - matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { }; - matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.hostPlatform.isDarwin then pkgs.clangStdenv else pkgs.stdenv; }; From 3c90b5d72a6259a2c54810239a19d3f93fbd82e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 12:21:29 +0000 Subject: [PATCH 1710/2279] xfel: 1.3.3 -> 1.3.4 --- pkgs/by-name/xf/xfel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xf/xfel/package.nix b/pkgs/by-name/xf/xfel/package.nix index 7eecffcbc3bc..17e7e0e17170 100644 --- a/pkgs/by-name/xf/xfel/package.nix +++ b/pkgs/by-name/xf/xfel/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xfel"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "xboot"; repo = "xfel"; tag = "v${finalAttrs.version}"; - hash = "sha256-5Io2qOIeGovDpbxSlmqtGMrGMxUjMu/e1304euTEtJc="; + hash = "sha256-3eWVIPfUpa8ZJjce2F6eLdLttmoBI47VQ0IheSSgGmU="; }; postPatch = '' From dc84194c7f1dd21c102c7639bf26ef6cf6442491 Mon Sep 17 00:00:00 2001 From: daimond113 Date: Tue, 4 Nov 2025 20:35:57 +0000 Subject: [PATCH 1711/2279] coredns: fix compile errors with externalPlugins --- pkgs/by-name/co/coredns/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index dc2618a6bc7f..fe8733125926 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -77,6 +77,7 @@ buildGoModule (finalAttrs: { diff -u plugin.cfg.orig plugin.cfg || true for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done GOOS= GOARCH= go generate + go mod tidy go mod vendor ''; From ed09228baeedcb2db0911a9557a45efeccf2e1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 12:30:02 +0000 Subject: [PATCH 1712/2279] pv: 1.9.44 -> 1.10.0 --- pkgs/by-name/pv/pv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index b612e525a7e8..35611cd72ff6 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.9.44"; + version = "1.10.0"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - hash = "sha256-4TDJ4Ysebp4u+VvsYRfHLLm+J6G4/+l/ynh+TI4BRWI="; + hash = "sha256-mY5xdBnALuc1rqC41X+cvhES9A9LlHo5uiYRpBW2TaA="; }; meta = { From 8dc52c844c5dcdf385a267f00ca422baeeeeacf5 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 8 Nov 2025 13:45:47 +0100 Subject: [PATCH 1713/2279] SDL_image: remove pointer-types workaround --- pkgs/by-name/sd/SDL_image/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix index 83d867e72b3a..b1595498d106 100644 --- a/pkgs/by-name/sd/SDL_image/package.nix +++ b/pkgs/by-name/sd/SDL_image/package.nix @@ -49,10 +49,6 @@ stdenv.mkDerivation (finalAttrs: { libwebp ]; - env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - }; - outputs = [ "out" "dev" From 237843684513162e73f642df94a7a77aa3235039 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Sat, 8 Nov 2025 06:48:34 -0600 Subject: [PATCH 1714/2279] knossosnet: add desktop file --- pkgs/by-name/kn/knossosnet/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 5024caa554e4..3b016a4583a8 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -4,6 +4,8 @@ lib, openal, dotnetCorePackages, + copyDesktopItems, + makeDesktopItem, }: buildDotnetModule rec { @@ -25,6 +27,23 @@ buildDotnetModule rec { runtimeDeps = [ openal ]; + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "knossos"; + exec = "Knossos.NET"; + icon = "knossos"; + desktopName = "Knossos.NET"; + comment = "Multi-platform launcher for Freespace 2 Open"; + categories = [ "Game" ]; + }) + ]; + + postInstall = '' + install -Dm644 $src/packaging/linux/knossos-512.png $out/share/icons/hicolor/512x512/apps/knossos.png + ''; + meta = with lib; { homepage = "https://github.com/KnossosNET/Knossos.NET"; description = "Multi-platform launcher for Freespace 2 Open"; From a7b46a9bd9a7dd23f450b52a193892cda351a655 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 8 Nov 2025 14:07:33 +0100 Subject: [PATCH 1715/2279] wordpressPackages.themes.geist: drop Building the theme fails now for a while. --- .../web-apps/wordpress/packages/thirdparty.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix index 62b2cf19103a..9ae93f6a4691 100644 --- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix +++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix @@ -21,17 +21,6 @@ meta.license = lib.licenses.agpl3Only; }; themes = { - geist = stdenv.mkDerivation rec { - pname = "geist"; - version = "2.0.3"; - src = fetchzip { - inherit version; - name = pname; - url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip"; - hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU="; - }; - meta.license = lib.licenses.gpl2Only; - }; proton = stdenv.mkDerivation rec { pname = "proton"; version = "1.0.1"; From eedef221341c734136bc4bc97c4b3cdcdd859a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 8 Nov 2025 10:15:53 -0300 Subject: [PATCH 1716/2279] lxqt.obconf-qt: 0.16.5 -> 0.16.6 Diff: https://github.com/lxqt/obconf-qt/compare/0.16.5...0.16.6 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index d813f05fef2b..00a3b1a10c10 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "obconf-qt"; - version = "0.16.5"; + version = "0.16.6"; src = fetchFromGitHub { owner = "lxqt"; repo = "obconf-qt"; rev = version; - hash = "sha256-C7s312DeLiustPBBY4OdjYvN7X6noktLA8LuhlOaVRo="; + hash = "sha256-Qd8vIfYjY/etv2IXEqQQM1ni0eS6Vuk/MnqtuLh4Mow="; }; nativeBuildInputs = [ From 3137ea162853059f50baa75a8e1994fe6473f885 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 13:16:47 +0000 Subject: [PATCH 1717/2279] weblate: 5.14 -> 5.14.3 Diff: https://github.com/WeblateOrg/weblate/compare/weblate-5.14...weblate-5.14.3 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.14.3 --- pkgs/by-name/we/weblate/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 8a34ea867162..10f23f721c9b 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -22,7 +22,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.14"; + version = "5.14.3"; pyproject = true; @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-XIaVM9bsgv6qJ1Q/6wzfO7D04WsUEkxNnJlyLd5+bY4="; + hash = "sha256-DwoJ24yGLJt+bItN/9SW0ruf+Lz3A9JxvD4QjlKaqzw="; }; build-system = with python.pkgs; [ setuptools ]; @@ -176,5 +176,6 @@ python.pkgs.buildPythonApplication rec { ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ erictapen ]; + mainProgram = "weblate"; }; } From b457b664547055b3552b8189019d7648e0f0408d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 13:17:09 +0000 Subject: [PATCH 1718/2279] pomsky: 0.11 -> 0.12.0 --- pkgs/by-name/po/pomsky/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix index 34664008b532..c017fc9a9146 100644 --- a/pkgs/by-name/po/pomsky/package.nix +++ b/pkgs/by-name/po/pomsky/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pomsky"; - version = "0.11"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pomsky-lang"; repo = "pomsky"; rev = "v${version}"; - hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c="; + hash = "sha256-0rLY0WZj8p9D834SqHogV77GLHLesyPPxMGszDmkB9U="; }; - cargoHash = "sha256-/tJwJ/xF5a2NEP5A/3swq75wCk9qxgbp7ilH1PqcWJY="; + cargoHash = "sha256-zUK8v96/jHaprrfbym23X7e/ZRoDwfNyDt+GIcd7BmY="; nativeBuildInputs = [ pkg-config From 7b02a3ef06133c9e72c5390a8bc4c45b78b41942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 13:20:28 +0000 Subject: [PATCH 1719/2279] terraform-providers.linode_linode: 3.5.0 -> 3.5.1 --- .../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 cc611a0c2f23..306afcfc4a30 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -832,11 +832,11 @@ "vendorHash": "sha256-b9+0YLuv9AVszGDQ2v+VbYameN16PCdE3jUhL9efK6M=" }, "linode_linode": { - "hash": "sha256-DMvmTryqgZyhuaDL3cslwMhMnj1x8iNsE5yyhehhANo=", + "hash": "sha256-t6vHW9t3MWsPsGUh44OXvYTfHa03qiH3lveKK0dit9Q=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.5.0", + "rev": "v3.5.1", "spdx": "MPL-2.0", "vendorHash": "sha256-8LbFq29JvQX3Trn81fr3YMjFwW+OTWAyK6OVAkh0I3A=" }, From 21861636298936d3c72b913c7a2cbc12910a5f37 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 8 Nov 2025 08:40:41 -0500 Subject: [PATCH 1720/2279] erlang_26: 26.2.5.15 -> 26.2.5.16 Changelog: https://github.com/erlang/otp/releases/tag/OTP-26.2.5.16 --- pkgs/development/interpreters/erlang/26.nix | 4 ++-- pkgs/development/interpreters/erlang/generic-builder.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index c5b66de84d69..dca49d4fba01 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "26.2.5.15"; - hash = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE="; + version = "26.2.5.16"; + hash = "sha256-3WxURI1o/CqN0KK+voUMk6al2mtsrqoniBJpDxKpxPo="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 4b38d0d1ed20..1ab41c655cad 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -164,6 +164,7 @@ stdenv.mkDerivation { homepage = "https://www.erlang.org/"; downloadPage = "https://www.erlang.org/download.html"; description = "Programming language used for massively scalable soft real-time systems"; + changelog = "https://github.com/erlang/otp/releases/tag/OTP-${version}"; longDescription = '' Erlang is a programming language used to build massively scalable From 841fb3a98c55ce90cab95852daa2d03816ee256b Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 8 Nov 2025 08:43:22 -0500 Subject: [PATCH 1721/2279] erlang_27: 27.3.4.4 -> 27.3.4.5 Changelog: https://github.com/erlang/otp/releases/tag/OTP-27.3.4.5 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index fd4acce3596b..7d220ff7aa65 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "27.3.4.4"; - hash = "sha256-iHpEYXzaso1ZK9XLrT04t+BoX2Y6nSbT9rNjY1JoHPM="; + version = "27.3.4.5"; + hash = "sha256-6kFixIy74ACvNBhPWoUQDCH6N2KJ++5xAEqPQ9jvJ8o="; } From fea46bdb0affbf9aedd507a015441be6fabeda0e Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 8 Nov 2025 16:12:11 +1000 Subject: [PATCH 1722/2279] stacer: drop --- pkgs/tools/system/stacer/default.nix | 54 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/tools/system/stacer/default.nix diff --git a/pkgs/tools/system/stacer/default.nix b/pkgs/tools/system/stacer/default.nix deleted file mode 100644 index 05303b472ac9..000000000000 --- a/pkgs/tools/system/stacer/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - qtcharts, - qttools, - wrapQtAppsHook, -}: - -stdenv.mkDerivation rec { - pname = "stacer"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "oguzhaninan"; - repo = pname; - rev = "v${version}"; - sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd"; - }; - - postPatch = '' - substituteInPlace stacer/Managers/app_manager.cpp \ - --replace 'qApp->applicationDirPath() + "/translations"' \ - 'QStandardPaths::locate(QStandardPaths::AppDataLocation, "translations", QStandardPaths::LocateDirectory)' - ''; - - buildInputs = [ - qtcharts - qttools - ]; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - preConfigure = '' - lrelease stacer/stacer.pro - ''; - - postInstall = '' - install -Dm644 ../translations/*.qm -t $out/share/stacer/translations - ''; - - meta = with lib; { - description = "Linux System Optimizer and Monitoring"; - homepage = "https://github.com/oguzhaninan/stacer"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ dit7ya ]; - platforms = platforms.linux; - mainProgram = "stacer"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7b648852e189..1fd200bc81c2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1426,6 +1426,7 @@ mapAliases { springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16 sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11 ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27 + stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08 starpls-bin = throw "'starpls-bin' has been renamed to/replaced by 'starpls'"; # Converted to throw 2025-10-27 station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16 steam-run-native = throw "'steam-run-native' has been renamed to/replaced by 'steam-run'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bcd7a5976d6..d85806a7e511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3982,8 +3982,6 @@ with pkgs; openssl = openssl.override { withZlib = true; }; }; - stacer = libsForQt5.callPackage ../tools/system/stacer { }; - staticjinja = with python3.pkgs; toPythonApplication staticjinja; stoken = callPackage ../tools/security/stoken (config.stoken or { }); From b6aa2c52af563809a526e0066ccf788af850c971 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 13:48:39 +0000 Subject: [PATCH 1723/2279] netbird-relay: 0.59.10 -> 0.59.12 --- pkgs/by-name/ne/netbird/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index cc9f217885c5..9ea91be21be2 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -68,16 +68,16 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.59.10"; + version = "0.59.12"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-TsDeDHLbgnKKCROn+nih9Ne0/cRQ2noLCXiyysC9uG4="; + hash = "sha256-w+zKuvbKp7d1zoEmkE0Tm34wYns9MHKFYe1BArotl+4="; }; - vendorHash = "sha256-t4uXuT6soKXxpv3Li9YhXHFMHPzbl1vPx5jcc7TR2pY="; + vendorHash = "sha256-zPXk3sjWnGBgzc9kjq9yUy6Ufg4G2armdIQ4hvm7Uf0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; From 55890046f759afb2af8172c598cdaeb99a5d8b0f Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 25 Apr 2025 23:48:59 -0400 Subject: [PATCH 1724/2279] nixos/tests/incus: migrate test suite to runTest modules --- nixos/tests/all-tests.nix | 11 +- nixos/tests/incus/default.nix | 71 +-- nixos/tests/incus/incus-tests-module.nix | 56 ++ nixos/tests/incus/incus-tests.nix | 773 +++++++++++------------ nixos/tests/incus/ui.nix | 146 +++-- 5 files changed, 548 insertions(+), 509 deletions(-) create mode 100644 nixos/tests/incus/incus-tests-module.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bcb00f3b067f..21bb0ab51454 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -743,12 +743,17 @@ in immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix; incron = runTest ./incron.nix; incus = recurseIntoAttrs ( - handleTest ./incus { + import ./incus { + inherit runTest; lts = false; - inherit system pkgs; } ); - incus-lts = recurseIntoAttrs (handleTest ./incus { inherit system pkgs; }); + incus-lts = recurseIntoAttrs ( + import ./incus { + inherit runTest; + lts = true; + } + ); influxdb = runTest ./influxdb.nix; influxdb2 = runTest ./influxdb2.nix; initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 5a3b7b30a872..9159bb78c9cd 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -1,51 +1,44 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, + runTest, lts ? true, ... }: let - incusTest = import ./incus-tests.nix; + incusTest = + config: + runTest { + imports = [ + ./incus-tests-module.nix + ./incus-tests.nix + ]; + + tests.incus = { + inherit lts; + } + // config; + }; in { - all = incusTest { - inherit lts pkgs system; - allTests = true; - }; - - container = incusTest { - inherit lts pkgs system; - instanceContainer = true; - }; - - lvm = incusTest { - inherit lts pkgs system; - storageLvm = true; - }; - - openvswitch = incusTest { - inherit lts pkgs system; - networkOvs = true; - }; - - ui = import ./ui.nix { - inherit lts pkgs system; - }; - - virtual-machine = incusTest { - inherit lts pkgs system; - instanceVm = true; - }; - - zfs = incusTest { - inherit lts pkgs system; - storageZfs = true; - }; + all = incusTest { all = true; }; appArmor = incusTest { - inherit lts pkgs system; + all = true; appArmor = true; - allTests = true; }; + + container = incusTest { instance.container = true; }; + + lvm = incusTest { storage.lvm = true; }; + + openvswitch = incusTest { network.ovs = true; }; + + ui = runTest { + imports = [ ./ui.nix ]; + + _module.args = { inherit lts; }; + }; + + virtual-machine = incusTest { instance.virtual-machine = true; }; + + zfs = incusTest { storage.zfs = true; }; } diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix new file mode 100644 index 000000000000..a382d6f1034f --- /dev/null +++ b/nixos/tests/incus/incus-tests-module.nix @@ -0,0 +1,56 @@ +{ config, lib, ... }: +let + cfg = config.tests.incus; +in +{ + options.tests.incus = { + lts = lib.mkEnableOption "LTS package testing"; + + all = lib.mkEnableOption "All tests"; + appArmor = lib.mkEnableOption "AppArmor during tests"; + + feature.user = lib.mkEnableOption "Validate incus user access feature"; + + init = { + legacy = lib.mkEnableOption "Validate non-systemd init"; + systemd = lib.mkEnableOption "Validate systemd init"; + }; + + instance = { + container = lib.mkEnableOption "Validate container functionality"; + virtual-machine = lib.mkEnableOption "Validate virtual machine functionality"; + }; + + network.ovs = lib.mkEnableOption "Validate OVS network integration"; + + storage = { + lvm = lib.mkEnableOption "Validate LVM storage integration"; + zfs = lib.mkEnableOption "Validate ZFS storage integration"; + }; + }; + + config = { + tests.incus = { + lts = lib.mkDefault true; + + feature.user = lib.mkDefault cfg.all; + + init = { + legacy = lib.mkDefault cfg.all; + systemd = lib.mkDefault true; + }; + + instance = { + container = lib.mkDefault cfg.all; + virtual-machine = lib.mkDefault cfg.all; + }; + + network.ovs = lib.mkDefault cfg.all; + + storage = { + lvm = lib.mkDefault cfg.all; + zfs = lib.mkDefault cfg.all; + }; + }; + }; +} diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index fe8aed457bb5..2ed66bda4de5 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -1,500 +1,487 @@ -import ../make-test-python.nix ( - { - pkgs, - lib, +{ + config, + pkgs, + lib, + ... +}: - lts ? true, +let + cfg = config.tests.incus; - allTests ? false, + releases = + init: + import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; - appArmor ? false, - featureUser ? allTests, - initLegacy ? true, - initSystemd ? true, - instanceContainer ? allTests, - instanceVm ? allTests, - networkOvs ? allTests, - storageLvm ? allTests, - storageZfs ? allTests, - ... - }: + boot.initrd.systemd.enable = init == "systemd"; - let - releases = - init: - import ../../release.nix { - configuration = { - # Building documentation makes the test unnecessarily take a longer time: - documentation.enable = lib.mkForce false; + # Arbitrary sysctl modification to ensure containers can update sysctl + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + }; + }; - boot.initrd.systemd.enable = init == "systemd"; + images = init: { + container = { + metadata = + (releases init).incusContainerMeta.${pkgs.stdenv.hostPlatform.system} + + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz"; - # Arbitrary sysctl modification to ensure containers can update sysctl - boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + rootfs = + (releases init).incusContainerImage.${pkgs.stdenv.hostPlatform.system} + + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs"; + }; + + virtual-machine = { + metadata = + (releases init).incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system} + "/*/*.tar.xz"; + disk = (releases init).incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system} + "/nixos.qcow2"; + }; + }; + + initVariants = + lib.optionals cfg.init.legacy [ "legacy" ] ++ lib.optionals cfg.init.systemd [ "systemd" ]; + + canTestVm = cfg.instance.virtual-machine && pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64; +in +{ + name = "incus" + lib.optionalString cfg.lts "-lts"; + + meta = { + maintainers = lib.teams.lxc.members; + }; + + nodes.machine = { + virtualisation = { + cores = 2; + memorySize = 4096; + diskSize = 12 * 1024; + emptyDiskImages = [ + # vdb for zfs + 2048 + # vdc for lvm + 2048 + ]; + + incus = { + enable = true; + package = if cfg.lts then pkgs.incus-lts else pkgs.incus; + + preseed = { + networks = [ + { + name = "incusbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.10.1/24"; + "ipv4.nat" = "true"; + }; + } + ] + ++ lib.optionals cfg.network.ovs [ + { + name = "ovsbr0"; + type = "bridge"; + config = { + "bridge.driver" = "openvswitch"; + "ipv4.address" = "10.0.20.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "default"; + devices = { + eth0 = { + name = "eth0"; + network = "incusbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "default"; + driver = "dir"; + } + ]; }; }; - images = init: { - container = { - metadata = - (releases init).incusContainerMeta.${pkgs.stdenv.hostPlatform.system} - + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz"; - - rootfs = - (releases init).incusContainerImage.${pkgs.stdenv.hostPlatform.system} - + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs"; - }; - - virtual-machine = { - metadata = - (releases init).incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system} + "/*/*.tar.xz"; - disk = (releases init).incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system} + "/nixos.qcow2"; - }; + vswitch.enable = cfg.network.ovs; }; - initVariants = lib.optionals initLegacy [ "legacy" ] ++ lib.optionals initSystemd [ "systemd" ]; + boot.supportedFilesystems = { inherit (cfg.storage) zfs; }; + boot.zfs.forceImportRoot = false; - canTestVm = instanceVm && pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64; - in - { - name = "incus" + lib.optionalString lts "-lts"; + environment.systemPackages = [ pkgs.parted ]; - meta = { - maintainers = lib.teams.lxc.members; + networking.hostId = "01234567"; + networking.firewall.trustedInterfaces = [ "incusbr0" ]; + networking.nftables.enable = true; + + security.apparmor.enable = cfg.appArmor; + services.dbus.apparmor = (if cfg.appArmor then "enabled" else "disabled"); + + services.lvm = { + boot.thin.enable = cfg.storage.lvm; + dmeventd.enable = cfg.storage.lvm; }; - nodes.machine = { - virtualisation = { - cores = 2; - memorySize = 2048; - diskSize = 12 * 1024; - emptyDiskImages = [ - # vdb for zfs - 2048 - # vdc for lvm - 2048 - ]; - - incus = { - enable = true; - package = if lts then pkgs.incus-lts else pkgs.incus; - - preseed = { - networks = [ - { - name = "incusbr0"; - type = "bridge"; - config = { - "ipv4.address" = "10.0.10.1/24"; - "ipv4.nat" = "true"; - }; - } - ] - ++ lib.optionals networkOvs [ - { - name = "ovsbr0"; - type = "bridge"; - config = { - "bridge.driver" = "openvswitch"; - "ipv4.address" = "10.0.20.1/24"; - "ipv4.nat" = "true"; - }; - } - ]; - profiles = [ - { - name = "default"; - devices = { - eth0 = { - name = "eth0"; - network = "incusbr0"; - type = "nic"; - }; - root = { - path = "/"; - pool = "default"; - size = "35GiB"; - type = "disk"; - }; - }; - } - ]; - storage_pools = [ - { - name = "default"; - driver = "dir"; - } - ]; - }; - }; - - vswitch.enable = networkOvs; - }; - - boot.supportedFilesystems = lib.optionals storageZfs [ "zfs" ]; - boot.zfs.forceImportRoot = false; - - environment.systemPackages = [ pkgs.parted ]; - - networking.hostId = "01234567"; - networking.firewall.trustedInterfaces = [ "incusbr0" ]; - - security.apparmor.enable = appArmor; - services.dbus.apparmor = (if appArmor then "enabled" else "disabled"); - - services.lvm = { - boot.thin.enable = storageLvm; - dmeventd.enable = storageLvm; - }; - - networking.nftables.enable = true; - - users.users.testuser = { - isNormalUser = true; - shell = pkgs.bashInteractive; - group = "incus"; - uid = 1000; - }; + users.users.testuser = { + isNormalUser = true; + shell = pkgs.bashInteractive; + group = "incus"; + uid = 1000; }; + }; - testScript = # python - '' - import json + testScript = # python + '' + import json - def wait_for_instance(name: str, project: str = "default"): - machine.wait_until_succeeds(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- /run/current-system/sw/bin/systemctl is-system-running") + def wait_for_instance(name: str, project: str = "default"): + machine.wait_until_succeeds(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- /run/current-system/sw/bin/systemctl is-system-running") - def wait_incus_exec_success(name: str, command: str, timeout: int = 900, project: str = "default"): - def check_command(_) -> bool: - status, _ = machine.execute(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}") - return status == 0 + def wait_incus_exec_success(name: str, command: str, timeout: int = 900, project: str = "default"): + def check_command(_) -> bool: + status, _ = machine.execute(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}") + return status == 0 - with machine.nested(f"Waiting for successful exec: {command}"): - retry(check_command, timeout) + with machine.nested(f"Waiting for successful exec: {command}"): + retry(check_command, timeout) - def set_config(name: str, config: str, restart: bool = False, unset: bool = False): - if restart: - machine.succeed(f"incus stop {name}") + def set_config(name: str, config: str, restart: bool = False, unset: bool = False): + if restart: + machine.succeed(f"incus stop {name}") - if unset: - machine.succeed(f"incus config unset {name} {config}") - else: - machine.succeed(f"incus config set {name} {config}") + if unset: + machine.succeed(f"incus config unset {name} {config}") + else: + machine.succeed(f"incus config set {name} {config}") - if restart: - machine.succeed(f"incus start {name}") - wait_for_instance(name) - else: - # give a moment to settle - machine.sleep(1) + if restart: + machine.succeed(f"incus start {name}") + wait_for_instance(name) + else: + # give a moment to settle + machine.sleep(1) - def cleanup(): - # avoid conflict between preseed and cleanup operations - machine.execute("systemctl kill incus-preseed.service") + def cleanup(): + # avoid conflict between preseed and cleanup operations + machine.execute("systemctl kill incus-preseed.service") - instances = json.loads(machine.succeed("incus list --format json --all-projects")) - with subtest("Stopping all running instances"): - for instance in [a for a in instances if a['status'] == 'Running']: - machine.execute(f"incus stop --force {instance['name']} --project {instance['project']}") - machine.execute(f"incus delete --force {instance['name']} --project {instance['project']}") + instances = json.loads(machine.succeed("incus list --format json --all-projects")) + with subtest("Stopping all running instances"): + for instance in [a for a in instances if a['status'] == 'Running']: + machine.execute(f"incus stop --force {instance['name']} --project {instance['project']}") + machine.execute(f"incus delete --force {instance['name']} --project {instance['project']}") - def check_sysctl(name: str): - with subtest("systemd sysctl settings are applied"): - machine.succeed(f"incus exec {name} -- systemctl status systemd-sysctl") - sysctl = machine.succeed(f"incus exec {name} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1] - assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" + def check_sysctl(name: str): + with subtest("systemd sysctl settings are applied"): + machine.succeed(f"incus exec {name} -- systemctl status systemd-sysctl") + sysctl = machine.succeed(f"incus exec {name} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1] + assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" - with subtest("Wait for startup"): - machine.wait_for_unit("incus.service") - machine.wait_for_unit("incus-preseed.service") + with subtest("Wait for startup"): + machine.wait_for_unit("incus.service") + machine.wait_for_unit("incus-preseed.service") - with subtest("Verify preseed resources created"): - machine.succeed("incus profile show default") - machine.succeed("incus network info incusbr0") - machine.succeed("incus storage show default") + with subtest("Verify preseed resources created"): + machine.succeed("incus profile show default") + machine.succeed("incus network info incusbr0") + machine.succeed("incus storage show default") - '' - + lib.optionalString appArmor '' - with subtest("Verify AppArmor service is started without issue"): - # restart AppArmor service since the Incus AppArmor folders are - # created after AA service is started - machine.systemctl("restart apparmor.service") - machine.succeed("systemctl --no-pager -l status apparmor.service") - machine.wait_for_unit("apparmor.service") - '' - + lib.optionalString instanceContainer ( - lib.foldl ( - acc: variant: - acc - # python - + '' - metadata = "${(images variant).container.metadata}" - rootfs = "${(images variant).container.rootfs}" - alias = "nixos/container/${variant}" - variant = "${variant}" + '' + + lib.optionalString cfg.appArmor '' + with subtest("Verify AppArmor service is started without issue"): + # restart AppArmor service since the Incus AppArmor folders are + # created after AA service is started + machine.systemctl("restart apparmor.service") + machine.succeed("systemctl --no-pager -l status apparmor.service") + machine.wait_for_unit("apparmor.service") + '' + + lib.optionalString cfg.instance.container ( + lib.foldl ( + acc: variant: + acc + # python + + '' + metadata = "${(images variant).container.metadata}" + rootfs = "${(images variant).container.rootfs}" + alias = "nixos/container/${variant}" + variant = "${variant}" - with subtest("container image can be imported"): - machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") + with subtest("container image can be imported"): + machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") - with subtest("container can be launched and managed"): - machine.succeed(f"incus launch {alias} container-{variant}1") - wait_for_instance(f"container-{variant}1") + with subtest("container can be launched and managed"): + machine.succeed(f"incus launch {alias} container-{variant}1") + wait_for_instance(f"container-{variant}1") - with subtest("container mounts lxcfs overlays"): - machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") - machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") + with subtest("container mounts lxcfs overlays"): + machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") + machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - with subtest("container CPU limits can be managed"): - set_config(f"container-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) + with subtest("container CPU limits can be managed"): + set_config(f"container-{variant}1", "limits.cpu 1", restart=True) + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) - with subtest("container CPU limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) + with subtest("container CPU limits can be hotplug changed"): + set_config(f"container-{variant}1", "limits.cpu 2") + wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) - with subtest("container memory limits can be managed"): - set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) + with subtest("container memory limits can be managed"): + set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) - with subtest("container memory limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.memory 256MB") - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) + with subtest("container memory limits can be hotplug changed"): + set_config(f"container-{variant}1", "limits.memory 256MB") + wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) - with subtest("container software tpm can be configured"): - machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") - machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") - machine.succeed(f"incus config device remove container-{variant}1 vtpm") - machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") + with subtest("container software tpm can be configured"): + machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") + machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") + machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") + machine.succeed(f"incus config device remove container-{variant}1 vtpm") + machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - with subtest("container lxc-generator compatibility"): - with subtest("lxc-container generator configures plain container"): - # default container is plain - machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + with subtest("container lxc-generator compatibility"): + with subtest("lxc-container generator configures plain container"): + # default container is plain + machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - check_sysctl(f"container-{variant}1") + check_sysctl(f"container-{variant}1") - with subtest("lxc-container generator configures nested container"): - set_config(f"container-{variant}1", "security.nesting=true", restart=True) + with subtest("lxc-container generator configures nested container"): + set_config(f"container-{variant}1", "security.nesting=true", restart=True) - machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() - assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" + machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() + assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" - check_sysctl(f"container-{variant}1") + check_sysctl(f"container-{variant}1") - with subtest("lxc-container generator configures privileged container"): - # Create a new instance for a clean state - machine.succeed(f"incus launch {alias} container-{variant}2") - wait_for_instance(f"container-{variant}2") + with subtest("lxc-container generator configures privileged container"): + # Create a new instance for a clean state + machine.succeed(f"incus launch {alias} container-{variant}2") + wait_for_instance(f"container-{variant}2") - machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - check_sysctl(f"container-{variant}2") + check_sysctl(f"container-{variant}2") - with subtest("container supports per-instance lxcfs"): - machine.succeed(f"incus stop container-{variant}1") - machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + with subtest("container supports per-instance lxcfs"): + machine.succeed(f"incus stop container-{variant}1") + machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - machine.succeed("incus config set instances.lxcfs.per_instance=true") + machine.succeed("incus config set instances.lxcfs.per_instance=true") - machine.succeed(f"incus start container-{variant}1") - wait_for_instance(f"container-{variant}1") - machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + machine.succeed(f"incus start container-{variant}1") + wait_for_instance(f"container-{variant}1") + machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - with subtest("container can successfully restart"): - machine.succeed(f"incus restart container-{variant}1") - wait_for_instance(f"container-{variant}1") + with subtest("container can successfully restart"): + machine.succeed(f"incus restart container-{variant}1") + wait_for_instance(f"container-{variant}1") - with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): - pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus") - machine.succeed(f"ps {pid}") - machine.succeed("systemctl start incus") + with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): + pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") + machine.succeed("systemctl start incus") - with subtest("containers stop with incus-startup.service"): - pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus-startup.service") - machine.wait_until_fails(f"ps {pid}", timeout=120) - machine.succeed("systemctl start incus-startup.service") + with subtest("containers stop with incus-startup.service"): + pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") - cleanup() - '' - ) "" initVariants - ) - + lib.optionalString canTestVm ( - (lib.foldl ( - acc: variant: - acc - # python - + '' - metadata = "${(images variant).virtual-machine.metadata}" - disk = "${(images variant).virtual-machine.disk}" - alias = "nixos/virtual-machine/${variant}" - variant = "${variant}" + cleanup() + '' + ) "" initVariants + ) + + lib.optionalString canTestVm ( + (lib.foldl ( + acc: variant: + acc + # python + + '' + metadata = "${(images variant).virtual-machine.metadata}" + disk = "${(images variant).virtual-machine.disk}" + alias = "nixos/virtual-machine/${variant}" + variant = "${variant}" - with subtest("virtual-machine image can be imported"): - machine.succeed(f"incus image import {metadata} {disk} --alias {alias}") + with subtest("virtual-machine image can be imported"): + machine.succeed(f"incus image import {metadata} {disk} --alias {alias}") - with subtest("virtual-machine can be created"): - machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") + with subtest("virtual-machine can be created"): + machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") - with subtest("virtual-machine software tpm can be configured"): - machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") + with subtest("virtual-machine software tpm can be configured"): + machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") - with subtest("virtual-machine can be launched and become available"): - machine.succeed(f"incus start vm-{variant}1") - wait_for_instance(f"vm-{variant}1") + with subtest("virtual-machine can be launched and become available"): + machine.succeed(f"incus start vm-{variant}1") + wait_for_instance(f"vm-{variant}1") - with subtest("virtual-machine incus-agent is started"): - machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") + with subtest("virtual-machine incus-agent is started"): + machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") - with subtest("virtual-machine incus-agent has a valid path"): - machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") + with subtest("virtual-machine incus-agent has a valid path"): + machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") - with subtest("virtual-machine CPU limits can be managed"): - set_config(f"vm-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) + with subtest("virtual-machine CPU limits can be managed"): + set_config(f"vm-{variant}1", "limits.cpu 1", restart=True) + wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) - with subtest("virtual-machine CPU limits can be hotplug changed"): - set_config(f"vm-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) + with subtest("virtual-machine CPU limits can be hotplug changed"): + set_config(f"vm-{variant}1", "limits.cpu 2") + wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) - with subtest("virtual-machine can successfully restart"): - machine.succeed(f"incus restart vm-{variant}1") - wait_for_instance(f"vm-{variant}1") + with subtest("virtual-machine can successfully restart"): + machine.succeed(f"incus restart vm-{variant}1") + wait_for_instance(f"vm-{variant}1") - with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): - pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus") - machine.succeed(f"ps {pid}") - machine.succeed("systemctl start incus") + with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): + pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") + machine.succeed("systemctl start incus") - with subtest("virtual-machines stop with incus-startup.service"): - pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus-startup.service") - machine.wait_until_fails(f"ps {pid}", timeout=120) - machine.succeed("systemctl start incus-startup.service") + with subtest("virtual-machines stop with incus-startup.service"): + pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") - cleanup() - '' - ) "" initVariants) - + - # python - '' - with subtest("virtual-machine can launch CSM (BIOS)"): - machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") - machine.succeed("incus start csm") - - - cleanup() - '' - ) + cleanup() + '' + ) "" initVariants) + - lib.optionalString featureUser # python - '' - with subtest("incus-user allows restricted access for users"): - machine.fail("incus project show user-1000") - machine.succeed("su - testuser bash -c 'incus list'") - # a project is created dynamically for the user - machine.succeed("incus project show user-1000") - # users shouldn't be able to list storage pools - machine.fail("su - testuser bash -c 'incus storage list'") + # python + '' + with subtest("virtual-machine can launch CSM (BIOS)"): + machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") + machine.succeed("incus start csm") - with subtest("incus-user allows users to launch instances"): - machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") - machine.succeed("su - testuser bash -c 'incus launch nixos instance2'") - wait_for_instance("instance2", "user-1000") - - cleanup() - '' - + - lib.optionalString networkOvs # python - '' - with subtest("Verify openvswitch bridge"): - machine.succeed("incus network info ovsbr0") + cleanup() + '' + ) + + + lib.optionalString cfg.feature.user # python + '' + with subtest("incus-user allows restricted access for users"): + machine.fail("incus project show user-1000") + machine.succeed("su - testuser bash -c 'incus list'") + # a project is created dynamically for the user + machine.succeed("incus project show user-1000") + # users shouldn't be able to list storage pools + machine.fail("su - testuser bash -c 'incus storage list'") - with subtest("Verify openvswitch bridge"): - machine.succeed("ovs-vsctl br-exists ovsbr0") - '' + with subtest("incus-user allows users to launch instances"): + machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") + machine.succeed("su - testuser bash -c 'incus launch nixos instance2'") + wait_for_instance("instance2", "user-1000") - + - lib.optionalString storageZfs # python - '' - with subtest("Verify zfs pool created and usable"): - machine.succeed( - "zpool status", - "parted --script /dev/vdb mklabel gpt", - "zpool create zfs_pool /dev/vdb", - ) + cleanup() + '' + + + lib.optionalString cfg.network.ovs # python + '' + with subtest("Verify openvswitch bridge"): + machine.succeed("incus network info ovsbr0") - machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus") - machine.succeed("zfs list zfs_pool/incus") - machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem") - machine.succeed("incus storage volume create zfs_pool test_vol --type block") + with subtest("Verify openvswitch bridge"): + machine.succeed("ovs-vsctl br-exists ovsbr0") + '' - machine.succeed("incus storage show zfs_pool") - machine.succeed("incus storage volume list zfs_pool") - machine.succeed("incus storage volume show zfs_pool test_fs") - machine.succeed("incus storage volume show zfs_pool test_vol") + + + lib.optionalString cfg.storage.zfs # python + '' + with subtest("Verify zfs pool created and usable"): + machine.succeed( + "zpool status", + "parted --script /dev/vdb mklabel gpt", + "zpool create zfs_pool /dev/vdb", + ) - machine.succeed("incus create zfs1 --empty --storage zfs_pool") - machine.succeed("incus list zfs1") - '' + machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus") + machine.succeed("zfs list zfs_pool/incus") - + - lib.optionalString storageLvm # python - '' - with subtest("Verify lvm pool created and usable"): - machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool") - machine.succeed("vgs incus_pool") + machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem") + machine.succeed("incus storage volume create zfs_pool test_vol --type block") - machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem") - machine.succeed("incus storage volume create lvm_pool test_vol --type block") + machine.succeed("incus storage show zfs_pool") + machine.succeed("incus storage volume list zfs_pool") + machine.succeed("incus storage volume show zfs_pool test_fs") + machine.succeed("incus storage volume show zfs_pool test_vol") - machine.succeed("incus storage show lvm_pool") + machine.succeed("incus create zfs1 --empty --storage zfs_pool") + machine.succeed("incus list zfs1") + '' - machine.succeed("incus storage volume list lvm_pool") - machine.succeed("incus storage volume show lvm_pool test_fs") - machine.succeed("incus storage volume show lvm_pool test_vol") + + + lib.optionalString cfg.storage.lvm # python + '' + with subtest("Verify lvm pool created and usable"): + machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool") + machine.succeed("vgs incus_pool") - machine.succeed("incus create lvm1 --empty --storage lvm_pool") - machine.succeed("incus list lvm1") - ''; - } -) + machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem") + machine.succeed("incus storage volume create lvm_pool test_vol --type block") + + machine.succeed("incus storage show lvm_pool") + + machine.succeed("incus storage volume list lvm_pool") + machine.succeed("incus storage volume show lvm_pool test_fs") + machine.succeed("incus storage volume show lvm_pool test_vol") + + machine.succeed("incus create lvm1 --empty --storage lvm_pool") + machine.succeed("incus list lvm1") + ''; +} diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix index 300388a19f93..49702cb325c3 100644 --- a/nixos/tests/incus/ui.nix +++ b/nixos/tests/incus/ui.nix @@ -1,84 +1,82 @@ -import ../make-test-python.nix ( - { - pkgs, - lib, - lts ? true, - ... - }: - { - name = "incus-ui"; +{ + pkgs, + lib, + lts ? true, + ... +}: +{ + name = "incus-ui"; - meta = { - maintainers = lib.teams.lxc.members; - }; + meta = { + maintainers = lib.teams.lxc.members; + }; - nodes.machine = - { lib, ... }: - { + nodes.machine = + { lib, ... }: + { - virtualisation.incus = { - enable = true; - package = if lts then pkgs.incus-lts else pkgs.incus; + virtualisation.incus = { + enable = true; + package = if lts then pkgs.incus-lts else pkgs.incus; - preseed.config."core.https_address" = ":8443"; - ui.enable = true; - }; - - networking.nftables.enable = true; - - environment.systemPackages = - let - seleniumScript = - pkgs.writers.writePython3Bin "selenium-script" - { - libraries = with pkgs.python3Packages; [ selenium ]; - } - '' - from selenium import webdriver - from selenium.webdriver.common.by import By - from selenium.webdriver.firefox.options import Options - from selenium.webdriver.support.ui import WebDriverWait - - options = Options() - options.add_argument("--headless") - service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 - - driver = webdriver.Firefox(options=options, service=service) - driver.implicitly_wait(10) - driver.get("https://localhost:8443/ui") - - wait = WebDriverWait(driver, 60) - - assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0 - assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0 - - driver.close() - ''; - in - with pkgs; - [ - curl - firefox-unwrapped - geckodriver - seleniumScript - ]; + preseed.config."core.https_address" = ":8443"; + ui.enable = true; }; - testScript = '' - machine.wait_for_unit("incus.service") - machine.wait_for_unit("incus-preseed.service") + networking.nftables.enable = true; - # Check that the INCUS_UI environment variable is populated in the systemd unit - machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'") + environment.systemPackages = + let + seleniumScript = + pkgs.writers.writePython3Bin "selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } + '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait - # Ensure the endpoint returns an HTML page with 'Incus UI' in the title - machine.succeed("curl -kLs https://localhost:8443/ui | grep 'Incus UI'") + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 - # Ensure the documentation is rendering correctly - machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep 'Incus documentation'") + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("https://localhost:8443/ui") - # Ensure the application is actually rendered by the Javascript - machine.succeed("PYTHONUNBUFFERED=1 selenium-script") - ''; - } -) + wait = WebDriverWait(driver, 60) + + assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0 + assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0 + + driver.close() + ''; + in + with pkgs; + [ + curl + firefox-unwrapped + geckodriver + seleniumScript + ]; + }; + + testScript = '' + machine.wait_for_unit("incus.service") + machine.wait_for_unit("incus-preseed.service") + + # Check that the INCUS_UI environment variable is populated in the systemd unit + machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'") + + # Ensure the endpoint returns an HTML page with 'Incus UI' in the title + machine.succeed("curl -kLs https://localhost:8443/ui | grep 'Incus UI'") + + # Ensure the documentation is rendering correctly + machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep 'Incus documentation'") + + # Ensure the application is actually rendered by the Javascript + machine.succeed("PYTHONUNBUFFERED=1 selenium-script") + ''; +} From 83aa672156aab6ed42470e47642d3ecc23d80e49 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 8 Aug 2025 14:48:36 -0400 Subject: [PATCH 1725/2279] nixos/tests/incus: use child class --- nixos/tests/all-tests.nix | 20 +- nixos/tests/incus/default.nix | 17 +- nixos/tests/incus/incus-tests.nix | 586 +++++++++++++---------------- nixos/tests/incus/incus_machine.py | 92 +++++ 4 files changed, 373 insertions(+), 342 deletions(-) create mode 100644 nixos/tests/incus/incus_machine.py diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 21bb0ab51454..cac691e092f9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -742,18 +742,14 @@ in immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix; incron = runTest ./incron.nix; - incus = recurseIntoAttrs ( - import ./incus { - inherit runTest; - lts = false; - } - ); - incus-lts = recurseIntoAttrs ( - import ./incus { - inherit runTest; - lts = true; - } - ); + incus = import ./incus { + inherit runTest; + lts = false; + }; + incus-lts = import ./incus { + inherit runTest; + lts = true; + }; influxdb = runTest ./influxdb.nix; influxdb2 = runTest ./influxdb2.nix; initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 9159bb78c9cd..02ce0587d548 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -1,10 +1,9 @@ { runTest, lts ? true, - ... }: let - incusTest = + incusRunTest = config: runTest { imports = [ @@ -19,18 +18,18 @@ let }; in { - all = incusTest { all = true; }; + all = incusRunTest { all = true; }; - appArmor = incusTest { + appArmor = incusRunTest { all = true; appArmor = true; }; - container = incusTest { instance.container = true; }; + container = incusRunTest { instance.container = true; }; - lvm = incusTest { storage.lvm = true; }; + lvm = incusRunTest { storage.lvm = true; }; - openvswitch = incusTest { network.ovs = true; }; + openvswitch = incusRunTest { network.ovs = true; }; ui = runTest { imports = [ ./ui.nix ]; @@ -38,7 +37,7 @@ in _module.args = { inherit lts; }; }; - virtual-machine = incusTest { instance.virtual-machine = true; }; + virtual-machine = incusRunTest { instance.virtual-machine = true; }; - zfs = incusTest { storage.zfs = true; }; + zfs = incusRunTest { storage.zfs = true; }; } diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 2ed66bda4de5..251a77985156 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -145,343 +145,287 @@ in }; }; - testScript = # python - '' - import json - - def wait_for_instance(name: str, project: str = "default"): - machine.wait_until_succeeds(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- /run/current-system/sw/bin/systemctl is-system-running") - - - def wait_incus_exec_success(name: str, command: str, timeout: int = 900, project: str = "default"): - def check_command(_) -> bool: - status, _ = machine.execute(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}") - return status == 0 - - with machine.nested(f"Waiting for successful exec: {command}"): - retry(check_command, timeout) - - - def set_config(name: str, config: str, restart: bool = False, unset: bool = False): - if restart: - machine.succeed(f"incus stop {name}") - - if unset: - machine.succeed(f"incus config unset {name} {config}") - else: - machine.succeed(f"incus config set {name} {config}") - - if restart: - machine.succeed(f"incus start {name}") - wait_for_instance(name) - else: - # give a moment to settle - machine.sleep(1) - - - def cleanup(): - # avoid conflict between preseed and cleanup operations - machine.execute("systemctl kill incus-preseed.service") - - instances = json.loads(machine.succeed("incus list --format json --all-projects")) - with subtest("Stopping all running instances"): - for instance in [a for a in instances if a['status'] == 'Running']: - machine.execute(f"incus stop --force {instance['name']} --project {instance['project']}") - machine.execute(f"incus delete --force {instance['name']} --project {instance['project']}") - - - def check_sysctl(name: str): - with subtest("systemd sysctl settings are applied"): - machine.succeed(f"incus exec {name} -- systemctl status systemd-sysctl") - sysctl = machine.succeed(f"incus exec {name} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1] - assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" - - - with subtest("Wait for startup"): - machine.wait_for_unit("incus.service") - machine.wait_for_unit("incus-preseed.service") - - - with subtest("Verify preseed resources created"): - machine.succeed("incus profile show default") - machine.succeed("incus network info incusbr0") - machine.succeed("incus storage show default") - - '' - + lib.optionalString cfg.appArmor '' - with subtest("Verify AppArmor service is started without issue"): - # restart AppArmor service since the Incus AppArmor folders are - # created after AA service is started - machine.systemctl("restart apparmor.service") - machine.succeed("systemctl --no-pager -l status apparmor.service") - machine.wait_for_unit("apparmor.service") - '' - + lib.optionalString cfg.instance.container ( - lib.foldl ( - acc: variant: - acc - # python - + '' - metadata = "${(images variant).container.metadata}" - rootfs = "${(images variant).container.rootfs}" - alias = "nixos/container/${variant}" - variant = "${variant}" - - with subtest("container image can be imported"): - machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") - - - with subtest("container can be launched and managed"): - machine.succeed(f"incus launch {alias} container-{variant}1") - wait_for_instance(f"container-{variant}1") - - - with subtest("container mounts lxcfs overlays"): - machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") - machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - - - with subtest("container CPU limits can be managed"): - set_config(f"container-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) - - - with subtest("container CPU limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) - - - with subtest("container memory limits can be managed"): - set_config(f"container-{variant}1", "limits.memory 128MB", restart=True) - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) - - - with subtest("container memory limits can be hotplug changed"): - set_config(f"container-{variant}1", "limits.memory 256MB") - wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) - - - with subtest("container software tpm can be configured"): - machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") - machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") - machine.succeed(f"incus config device remove container-{variant}1 vtpm") - machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - - - with subtest("container lxc-generator compatibility"): - with subtest("lxc-container generator configures plain container"): - # default container is plain - machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - - check_sysctl(f"container-{variant}1") - - with subtest("lxc-container generator configures nested container"): - set_config(f"container-{variant}1", "security.nesting=true", restart=True) - - machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() - assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" - - check_sysctl(f"container-{variant}1") - - with subtest("lxc-container generator configures privileged container"): - # Create a new instance for a clean state - machine.succeed(f"incus launch {alias} container-{variant}2") - wait_for_instance(f"container-{variant}2") - - machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - - check_sysctl(f"container-{variant}2") - - with subtest("container supports per-instance lxcfs"): - machine.succeed(f"incus stop container-{variant}1") - machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - - machine.succeed("incus config set instances.lxcfs.per_instance=true") - - machine.succeed(f"incus start container-{variant}1") - wait_for_instance(f"container-{variant}1") - machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - - - with subtest("container can successfully restart"): - machine.succeed(f"incus restart container-{variant}1") - wait_for_instance(f"container-{variant}1") - - - with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): - pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus") - machine.succeed(f"ps {pid}") - machine.succeed("systemctl start incus") - - with subtest("containers stop with incus-startup.service"): - pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus-startup.service") - machine.wait_until_fails(f"ps {pid}", timeout=120) - machine.succeed("systemctl start incus-startup.service") - - - cleanup() - '' - ) "" initVariants - ) - + lib.optionalString canTestVm ( - (lib.foldl ( - acc: variant: - acc - # python - + '' - metadata = "${(images variant).virtual-machine.metadata}" - disk = "${(images variant).virtual-machine.disk}" - alias = "nixos/virtual-machine/${variant}" - variant = "${variant}" - - with subtest("virtual-machine image can be imported"): - machine.succeed(f"incus image import {metadata} {disk} --alias {alias}") - - - with subtest("virtual-machine can be created"): - machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") - - - with subtest("virtual-machine software tpm can be configured"): - machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") - - - with subtest("virtual-machine can be launched and become available"): - machine.succeed(f"incus start vm-{variant}1") - wait_for_instance(f"vm-{variant}1") - - - with subtest("virtual-machine incus-agent is started"): - machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") - - - with subtest("virtual-machine incus-agent has a valid path"): - machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") - - - with subtest("virtual-machine CPU limits can be managed"): - set_config(f"vm-{variant}1", "limits.cpu 1", restart=True) - wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) - - - with subtest("virtual-machine CPU limits can be hotplug changed"): - set_config(f"vm-{variant}1", "limits.cpu 2") - wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) - - - with subtest("virtual-machine can successfully restart"): - machine.succeed(f"incus restart vm-{variant}1") - wait_for_instance(f"vm-{variant}1") - - - with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): - pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus") - machine.succeed(f"ps {pid}") - machine.succeed("systemctl start incus") - - - with subtest("virtual-machines stop with incus-startup.service"): - pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus-startup.service") - machine.wait_until_fails(f"ps {pid}", timeout=120) - machine.succeed("systemctl start incus-startup.service") - - - cleanup() - '' - ) "" initVariants) + testScript = + lib.readFile ./incus_machine.py + # python '' - with subtest("virtual-machine can launch CSM (BIOS)"): - machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") - machine.succeed("incus start csm") - - - cleanup() + server = IncusHost(machine) '' - ) - + - lib.optionalString cfg.feature.user # python - '' - with subtest("incus-user allows restricted access for users"): - machine.fail("incus project show user-1000") - machine.succeed("su - testuser bash -c 'incus list'") - # a project is created dynamically for the user - machine.succeed("incus project show user-1000") - # users shouldn't be able to list storage pools - machine.fail("su - testuser bash -c 'incus storage list'") + + lib.optionalString cfg.appArmor '' + with subtest("Verify AppArmor service is started without issue"): + # restart AppArmor service since the Incus AppArmor folders are + # created after AA service is started + machine.systemctl("restart apparmor.service") + machine.succeed("systemctl --no-pager -l status apparmor.service") + machine.wait_for_unit("apparmor.service") + '' + + lib.optionalString cfg.instance.container ( + lib.foldl ( + acc: variant: + acc + # python + + '' + metadata = "${(images variant).container.metadata}" + rootfs = "${(images variant).container.rootfs}" + alias = "nixos/container/${variant}" + variant = "${variant}" + + with subtest("container image can be imported"): + machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") - with subtest("incus-user allows users to launch instances"): - machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") - machine.succeed("su - testuser bash -c 'incus launch nixos instance2'") - wait_for_instance("instance2", "user-1000") - - cleanup() - '' - + - lib.optionalString cfg.network.ovs # python - '' - with subtest("Verify openvswitch bridge"): - machine.succeed("incus network info ovsbr0") + with subtest("container can be launched and managed"): + machine.succeed(f"incus launch {alias} container-{variant}1") + machine.wait_for_instance(f"container-{variant}1") - with subtest("Verify openvswitch bridge"): - machine.succeed("ovs-vsctl br-exists ovsbr0") - '' + with subtest("container mounts lxcfs overlays"): + machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") + machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - + - lib.optionalString cfg.storage.zfs # python - '' - with subtest("Verify zfs pool created and usable"): - machine.succeed( - "zpool status", - "parted --script /dev/vdb mklabel gpt", - "zpool create zfs_pool /dev/vdb", - ) - machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus") - machine.succeed("zfs list zfs_pool/incus") + with subtest("container CPU limits can be managed"): + machine.set_instance_config(f"container-{variant}1", "limits.cpu 1", restart=True) + machine.wait_instance_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) - machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem") - machine.succeed("incus storage volume create zfs_pool test_vol --type block") - machine.succeed("incus storage show zfs_pool") - machine.succeed("incus storage volume list zfs_pool") - machine.succeed("incus storage volume show zfs_pool test_fs") - machine.succeed("incus storage volume show zfs_pool test_vol") + with subtest("container CPU limits can be hotplug changed"): + machine.set_instance_config(f"container-{variant}1", "limits.cpu 2") + machine.wait_instance_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) - machine.succeed("incus create zfs1 --empty --storage zfs_pool") - machine.succeed("incus list zfs1") - '' - + - lib.optionalString cfg.storage.lvm # python - '' - with subtest("Verify lvm pool created and usable"): - machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool") - machine.succeed("vgs incus_pool") + with subtest("container memory limits can be managed"): + machine.set_instance_config(f"container-{variant}1", "limits.memory 128MB", restart=True) + machine.wait_instance_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) - machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem") - machine.succeed("incus storage volume create lvm_pool test_vol --type block") - machine.succeed("incus storage show lvm_pool") + with subtest("container memory limits can be hotplug changed"): + machine.set_instance_config(f"container-{variant}1", "limits.memory 256MB") + machine.wait_instance_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) - machine.succeed("incus storage volume list lvm_pool") - machine.succeed("incus storage volume show lvm_pool test_fs") - machine.succeed("incus storage volume show lvm_pool test_vol") - machine.succeed("incus create lvm1 --empty --storage lvm_pool") - machine.succeed("incus list lvm1") - ''; + with subtest("container software tpm can be configured"): + machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") + machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") + machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") + machine.succeed(f"incus config device remove container-{variant}1 vtpm") + machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") + + + with subtest("container lxc-generator compatibility"): + with subtest("lxc-container generator configures plain container"): + # default container is plain + machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + + machine.check_instance_sysctl(f"container-{variant}1") + + with subtest("lxc-container generator configures nested container"): + machine.set_instance_config(f"container-{variant}1", "security.nesting=true", restart=True) + + machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() + assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" + + machine.check_instance_sysctl(f"container-{variant}1") + + with subtest("lxc-container generator configures privileged container"): + # Create a new instance for a clean state + machine.succeed(f"incus launch {alias} container-{variant}2") + machine.wait_for_instance(f"container-{variant}2") + + machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + + machine.check_instance_sysctl(f"container-{variant}2") + + with subtest("container supports per-instance lxcfs"): + machine.succeed(f"incus stop container-{variant}1") + machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + + machine.succeed("incus config set instances.lxcfs.per_instance=true") + + machine.succeed(f"incus start container-{variant}1") + machine.wait_for_instance(f"container-{variant}1") + machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + + + with subtest("container can successfully restart"): + machine.succeed(f"incus restart container-{variant}1") + machine.wait_for_instance(f"container-{variant}1") + + + with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): + pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") + machine.succeed("systemctl start incus") + + with subtest("containers stop with incus-startup.service"): + pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") + + + machine.cleanup() + '' + ) "" initVariants + ) + + lib.optionalString canTestVm ( + (lib.foldl ( + acc: variant: + acc + # python + + '' + metadata = "${(images variant).virtual-machine.metadata}" + disk = "${(images variant).virtual-machine.disk}" + alias = "nixos/virtual-machine/${variant}" + variant = "${variant}" + + with subtest("virtual-machine image can be imported"): + machine.succeed(f"incus image import {metadata} {disk} --alias {alias}") + + + with subtest("virtual-machine can be created"): + machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") + + + with subtest("virtual-machine software tpm can be configured"): + machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") + + + with subtest("virtual-machine can be launched and become available"): + machine.succeed(f"incus start vm-{variant}1") + machine.wait_for_instance(f"vm-{variant}1") + + + with subtest("virtual-machine incus-agent is started"): + machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") + + + with subtest("virtual-machine incus-agent has a valid path"): + machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") + + + with subtest("virtual-machine CPU limits can be managed"): + machine.set_instance_config(f"vm-{variant}1", "limits.cpu 1", restart=True) + machine.wait_instance_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) + + + with subtest("virtual-machine CPU limits can be hotplug changed"): + machine.set_instance_config(f"vm-{variant}1", "limits.cpu 2") + machine.wait_instance_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) + + + with subtest("virtual-machine can successfully restart"): + machine.succeed(f"incus restart vm-{variant}1") + machine.wait_for_instance(f"vm-{variant}1") + + + with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): + pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus") + machine.succeed(f"ps {pid}") + machine.succeed("systemctl start incus") + + + with subtest("virtual-machines stop with incus-startup.service"): + pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() + machine.succeed(f"ps {pid}") + machine.succeed("systemctl stop incus-startup.service") + machine.wait_until_fails(f"ps {pid}", timeout=120) + machine.succeed("systemctl start incus-startup.service") + + + machine.cleanup() + '' + ) "" initVariants) + + + # python + '' + with subtest("virtual-machine can launch CSM (BIOS)"): + machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") + machine.succeed("incus start csm") + + + machine.cleanup() + '' + ) + + + lib.optionalString cfg.feature.user # python + '' + with subtest("incus-user allows restricted access for users"): + machine.fail("incus project show user-1000") + machine.succeed("su - testuser bash -c 'incus list'") + # a project is created dynamically for the user + machine.succeed("incus project show user-1000") + # users shouldn't be able to list storage pools + machine.fail("su - testuser bash -c 'incus storage list'") + + + with subtest("incus-user allows users to launch instances"): + machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") + machine.succeed("su - testuser bash -c 'incus launch nixos instance2'") + machine.wait_for_instance("instance2", "user-1000") + + machine.cleanup() + '' + + + lib.optionalString cfg.network.ovs # python + '' + with subtest("Verify openvswitch bridge"): + machine.succeed("incus network info ovsbr0") + + + with subtest("Verify openvswitch bridge"): + machine.succeed("ovs-vsctl br-exists ovsbr0") + '' + + + + lib.optionalString cfg.storage.zfs # python + '' + with subtest("Verify zfs pool created and usable"): + machine.succeed( + "zpool status", + "parted --script /dev/vdb mklabel gpt", + "zpool create zfs_pool /dev/vdb", + ) + + machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus") + machine.succeed("zfs list zfs_pool/incus") + + machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem") + machine.succeed("incus storage volume create zfs_pool test_vol --type block") + + machine.succeed("incus storage show zfs_pool") + machine.succeed("incus storage volume list zfs_pool") + machine.succeed("incus storage volume show zfs_pool test_fs") + machine.succeed("incus storage volume show zfs_pool test_vol") + + machine.succeed("incus create zfs1 --empty --storage zfs_pool") + machine.succeed("incus list zfs1") + '' + + + + lib.optionalString cfg.storage.lvm # python + '' + with subtest("Verify lvm pool created and usable"): + machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool") + machine.succeed("vgs incus_pool") + + machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem") + machine.succeed("incus storage volume create lvm_pool test_vol --type block") + + machine.succeed("incus storage show lvm_pool") + + machine.succeed("incus storage volume list lvm_pool") + machine.succeed("incus storage volume show lvm_pool test_fs") + machine.succeed("incus storage volume show lvm_pool test_vol") + + machine.succeed("incus create lvm1 --empty --storage lvm_pool") + machine.succeed("incus list lvm1") + ''; } diff --git a/nixos/tests/incus/incus_machine.py b/nixos/tests/incus/incus_machine.py new file mode 100644 index 000000000000..8c28abf0081e --- /dev/null +++ b/nixos/tests/incus/incus_machine.py @@ -0,0 +1,92 @@ +import json + + +class IncusHost(Machine): + def __init__(self, base): + with subtest("Wait for startup"): + base.wait_for_unit("incus.service") + base.wait_for_unit("incus-preseed.service") + + with subtest("Verify preseed resources created"): + base.succeed("incus profile show default") + base.succeed("incus network info incusbr0") + base.succeed("incus storage show default") + + self._parent = base + + # delegate attribute access to the parent + def __getattr__(self, name): + return getattr(self._parent, name) + + def instance_exec(self, name: str, command: str, project: str = "default"): + return super().execute( + f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}" + ) + + def instance_succeed(self, name: str, command: str, project: str = "default"): + return super().succeed( + f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}" + ) + + def wait_for_instance(self, name: str, project: str = "default"): + self.wait_instance_exec_success( + name, + "/run/current-system/sw/bin/systemctl is-system-running", + project=project, + ) + + def wait_instance_exec_success( + self, name: str, command: str, timeout: int = 900, project: str = "default" + ): + def check_command(_) -> bool: + status, _ = self.instance_exec(name, command, project) + return status == 0 + + with super().nested( + f"Waiting for successful instance exec, instance={name}, project={project}, command={command}" + ): + retry(check_command, timeout) + + def set_instance_config( + self, name: str, config: str, restart: bool = False, unset: bool = False + ): + if restart: + super().succeed(f"incus stop {name}") + + if unset: + super().succeed(f"incus config unset {name} {config}") + else: + super().succeed(f"incus config set {name} {config}") + + if restart: + super().succeed(f"incus start {name}") + self.wait_for_instance(name) + else: + # give a moment to settle + super().sleep(1) + + def cleanup(self): + # avoid conflict between preseed and cleanup operations + super().execute("systemctl kill incus-preseed.service") + + instances = json.loads( + super().succeed("incus list --format json --all-projects") + ) + for instance in [a for a in instances if a["status"] == "Running"]: + super().execute( + f"incus stop --force {instance['name']} --project {instance['project']}" + ) + super().execute( + f"incus delete --force {instance['name']} --project {instance['project']}" + ) + + def check_instance_sysctl(self, name: str, project: str = "default"): + self.instance_succeed(name, "systemctl status systemd-sysctl", project) + sysctl = ( + self.instance_succeed(name, "sysctl net.ipv4.ip_forward", project) + .strip() + .split(" ")[-1] + ) + assert ( + "1" == sysctl + ), f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" From 099cd0e1fbb20d65e640158b227a845b4a9e01b0 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 29 Aug 2025 22:40:31 -0400 Subject: [PATCH 1726/2279] nixos/tests/incus: present instances as a submodule --- .../virtualisation/incus-virtual-machine.nix | 2 +- .../virtualisation/lxc-instance-common.nix | 4 +- nixos/tests/all-tests.nix | 4 +- nixos/tests/incus/default.nix | 34 +- nixos/tests/incus/incus-tests-module.nix | 273 ++++++++++++-- nixos/tests/incus/incus-tests.nix | 348 ++++-------------- nixos/tests/incus/incus_machine.py | 6 +- nixos/tests/incus/ui.nix | 4 +- 8 files changed, 331 insertions(+), 344 deletions(-) diff --git a/nixos/modules/virtualisation/incus-virtual-machine.nix b/nixos/modules/virtualisation/incus-virtual-machine.nix index d51e251aaba9..8899fc34bb85 100644 --- a/nixos/modules/virtualisation/incus-virtual-machine.nix +++ b/nixos/modules/virtualisation/incus-virtual-machine.nix @@ -25,7 +25,7 @@ in partitionTableType = "efi"; format = "qcow2-compressed"; - copyChannel = true; + copyChannel = config.system.installer.channel.enable; }; fileSystems = { diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix index 6449952f2a75..d589ad8028dc 100644 --- a/nixos/modules/virtualisation/lxc-instance-common.nix +++ b/nixos/modules/virtualisation/lxc-instance-common.nix @@ -27,7 +27,7 @@ services.openssh.startWhenNeeded = lib.mkDefault true; # As this is intended as a standalone image, undo some of the minimal profile stuff - documentation.enable = true; - documentation.nixos.enable = true; + documentation.enable = lib.mkDefault true; + documentation.nixos.enable = lib.mkDefault true; services.logrotate.enable = true; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cac691e092f9..382d84fd6df1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -744,11 +744,11 @@ in incron = runTest ./incron.nix; incus = import ./incus { inherit runTest; - lts = false; + package = pkgs.incus; }; incus-lts = import ./incus { inherit runTest; - lts = true; + package = pkgs.incus-lts; }; influxdb = runTest ./influxdb.nix; influxdb2 = runTest ./influxdb2.nix; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 02ce0587d548..04d2fa4d4299 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -1,6 +1,6 @@ { + package, runTest, - lts ? true, }: let incusRunTest = @@ -12,32 +12,40 @@ let ]; tests.incus = { - inherit lts; + inherit package; } // config; }; in { - all = incusRunTest { all = true; }; + # appArmor = incusRunTest { + # all = true; + # appArmor = true; + # }; - appArmor = incusRunTest { - all = true; - appArmor = true; + container = incusRunTest { + instances.c1 = { + type = "container"; + }; }; - container = incusRunTest { instance.container = true; }; - - lvm = incusRunTest { storage.lvm = true; }; - - openvswitch = incusRunTest { network.ovs = true; }; + # lvm = incusRunTest { storage.lvm = true; }; + # + # openvswitch = incusRunTest { network.ovs = true; }; ui = runTest { imports = [ ./ui.nix ]; - _module.args = { inherit lts; }; + _module.args = { inherit package; }; }; - virtual-machine = incusRunTest { instance.virtual-machine = true; }; + virtual-machine = incusRunTest { + instances = { + vm1 = { + type = "virtual-machine"; + }; + }; + }; zfs = incusRunTest { storage.zfs = true; }; } diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix index a382d6f1034f..4f8df4d08c2a 100644 --- a/nixos/tests/incus/incus-tests-module.nix +++ b/nixos/tests/incus/incus-tests-module.nix @@ -1,26 +1,248 @@ -{ config, lib, ... }: +{ + lib, + pkgs, + ... +}: let - cfg = config.tests.incus; + jsonFormat = pkgs.formats.json { }; in { options.tests.incus = { - lts = lib.mkEnableOption "LTS package testing"; + package = lib.mkPackageOption pkgs "incus" { }; + + preseed = lib.mkOption { + description = "configuration provided to incus preseed. https://linuxcontainers.org/incus/docs/main/howto/initialize/#non-interactive-configuration"; + type = lib.types.submodule { + freeformType = jsonFormat.type; + }; + }; + + instances = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule ( + { name, config, ... }: + { + options = { + name = lib.mkOption { + type = lib.types.str; + default = name; + }; + + type = lib.mkOption { + type = lib.types.enum [ + "container" + "virtual-machine" + ]; + + }; + + imageAlias = lib.mkOption { + type = lib.types.str; + description = "name of image when imported"; + default = "nixos/${name}/${config.type}"; + }; + + nixosConfig = lib.mkOption { + type = lib.types.attrsOf lib.types.anything; + default = { }; + }; + + incusConfig = lib.mkOption { + type = lib.types.submodule { + freeformType = jsonFormat.type; + }; + description = "incus configuration provided at launch"; + default = { }; + }; + + testScript = lib.mkOption { + type = lib.types.str; + description = "final script provided to test runner"; + readOnly = true; + }; + }; + config = + let + releases = import ../../release.nix { + configuration = config.nixosConfig; + }; + + images = { + container = { + metadata = + releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system} + + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz"; + + root = + releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system} + + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs"; + }; + + virtual-machine = { + metadata = releases.incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system} + "/*/*.tar.xz"; + root = releases.incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system} + "/nixos.qcow2"; + }; + }; + + root = images.${config.type}.root; + metadata = images.${config.type}.metadata; + + image_id = "${config.type}/${config.name}"; + in + { + incusConfig = lib.optionalAttrs (config.type == "virtual-machine") { + config."security.secureboot" = false; + }; + + nixosConfig = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + documentation.nixos.enable = lib.mkForce false; + # including a channel forces images to be rebuilt on any changes + system.installer.channel.enable = lib.mkForce false; + + environment.etc."nix/registry.json".text = lib.mkForce "{}"; + + # Arbitrary sysctl setting changed from nixos default + # used for verifying `distrobuilder.generator` properly allows + # for containers to modify sysctl + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + }; + + testScript = # python + '' + with subtest("[${image_id}] image can be imported"): + server.succeed("incus image import ${metadata} ${root} --alias ${config.imageAlias}") + + with subtest("[${image_id}] can be launched and managed"): + instance_name = server.succeed("incus launch ${config.imageAlias}${ + lib.optionalString (config.type == "virtual-machine") " --vm" + } --quiet < ${jsonFormat.generate "${config.name}.json" config.incusConfig}").split(":")[1].strip() + server.wait_for_instance(instance_name) + + with subtest("[${image_id}] can successfully restart"): + server.succeed(f"incus restart {instance_name}") + server.wait_for_instance(instance_name) + + with subtest("[${image_id}] remains running when softDaemonRestart is enabled and service is stopped"): + pid = server.succeed(f"incus info {instance_name} | grep 'PID'").split(":")[1].strip() + server.succeed(f"ps {pid}") + server.succeed("systemctl stop incus") + server.succeed(f"ps {pid}") + server.succeed("systemctl start incus") + + with subtest("[${image_id}] CPU limits can be managed"): + server.set_instance_config(instance_name, "limits.cpu 1", restart=True) + server.wait_instance_exec_success(instance_name, "nproc | grep '^1$'", timeout=90) + + with subtest("[${image_id}] CPU limits can be hotplug changed"): + server.set_instance_config(instance_name, "limits.cpu 2") + server.wait_instance_exec_success(instance_name, "nproc | grep '^2$'", timeout=90) + + with subtest("[${image_id}] exec has a valid path"): + server.succeed(f"incus exec {instance_name} -- bash -c 'true'") + + with subtest("[${image_id}] software tpm can be configured"): + # this can be hot added to containers, but stopping for vm + server.succeed(f"incus stop {instance_name}") + server.succeed(f"incus config device add {instance_name} vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") + server.succeed(f"incus start {instance_name}") + server.wait_for_instance(instance_name) + + server.succeed(f"incus exec {instance_name} -- test -e /dev/tpm0") + server.succeed(f"incus exec {instance_name} -- test -e /dev/tpmrm0") + '' + # + # container specific + # + + + lib.optionalString (config.type == "container") + # python + '' + # TODO troubleshoot VM hot memory resizing which was introduced in 6.12 + with subtest("[${image_id}] memory limits can be hotplug changed"): + server.set_instance_config(instance_name, "limits.memory 512MB") + # can't use lsmem since it sees the host's memory size + server.wait_instance_exec_success(instance_name, "grep 'MemTotal:[[:space:]]*500000 kB' /proc/meminfo", timeout=1) + + # verify the patched container systemd generator from `pkgs.distrobuilder.generator` + with subtest("[${image_id}] lxc-generator compatibility"): + with subtest("[${image_id}] lxc-container generator configures plain container"): + # default container is plain + server.succeed(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + + server.check_instance_sysctl(instance_name) + + with subtest("[${image_id}] lxc-container generator configures nested container"): + server.set_instance_config(instance_name, "security.nesting=true", restart=True) + + server.fail(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + target = server.succeed(f"incus exec {instance_name} readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() + assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" + + server.check_instance_sysctl(instance_name) + + with subtest("[${image_id}] lxcfs"): + with subtest("[${image_id}] mounts lxcfs overlays"): + server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") + server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") + + with subtest("[${image_id}] supports per-instance lxcfs"): + server.succeed(f"incus stop {instance_name}") + server.fail(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'") + + server.succeed("incus config set instances.lxcfs.per_instance=true") + + server.succeed(f"incus start {instance_name}") + server.wait_for_instance(instance_name) + server.succeed(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'") + '' + + # + # virtual-machine specific + # + + + lib.optionalString (config.type == "virtual-machine") + # python + '' + with subtest("[${image_id}] memory limits can be managed"): + server.set_instance_config(instance_name, "limits.memory 384MB", restart=True) + lsmem = json.loads(server.instance_succeed(instance_name, "lsmem --json")) + memsize = lsmem["memory"][0]["size"] + assert memsize == "384M", f"failed to manage memory limit. {memsize} != 384M" + + with subtest("[${image_id}] incus-agent is started"): + server.succeed(f"incus exec {instance_name} systemctl is-active incus-agent") + '' + + + + # + # finalize + # + # python + '' + # this will leave the instances stopped + with subtest("[${image_id}] stop with incus-startup.service"): + pid = server.succeed(f"incus info {instance_name} | grep 'PID'").split(":")[1].strip() + server.succeed(f"ps {pid}") + server.succeed("systemctl stop incus-startup.service") + server.wait_until_fails(f"ps {pid}", timeout=120) + server.succeed("systemctl start incus-startup.service") + + ''; + + }; + } + ) + ); + description = ""; + default = { }; + }; - all = lib.mkEnableOption "All tests"; appArmor = lib.mkEnableOption "AppArmor during tests"; feature.user = lib.mkEnableOption "Validate incus user access feature"; - init = { - legacy = lib.mkEnableOption "Validate non-systemd init"; - systemd = lib.mkEnableOption "Validate systemd init"; - }; - - instance = { - container = lib.mkEnableOption "Validate container functionality"; - virtual-machine = lib.mkEnableOption "Validate virtual machine functionality"; - }; - network.ovs = lib.mkEnableOption "Validate OVS network integration"; storage = { @@ -30,27 +252,6 @@ in }; config = { - tests.incus = { - lts = lib.mkDefault true; - - feature.user = lib.mkDefault cfg.all; - - init = { - legacy = lib.mkDefault cfg.all; - systemd = lib.mkDefault true; - }; - - instance = { - container = lib.mkDefault cfg.all; - virtual-machine = lib.mkDefault cfg.all; - }; - - network.ovs = lib.mkDefault cfg.all; - - storage = { - lvm = lib.mkDefault cfg.all; - zfs = lib.mkDefault cfg.all; - }; - }; + tests.incus = { }; }; } diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 251a77985156..619a40a25b72 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -5,58 +5,33 @@ ... }: +# TODO aarch64 vm filter +# TODO CSM +# with subtest("incus-user allows users to create instances"): +# server.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") +# server.succeed("su - testuser bash -c 'incus launch nixos instance2'") +# server.wait_for_instance("instance2", "user-1000") +# let cfg = config.tests.incus; - releases = - init: - import ../../release.nix { - configuration = { - # Building documentation makes the test unnecessarily take a longer time: - documentation.enable = lib.mkForce false; - - boot.initrd.systemd.enable = init == "systemd"; - - # Arbitrary sysctl modification to ensure containers can update sysctl - boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; - }; - }; - - images = init: { - container = { - metadata = - (releases init).incusContainerMeta.${pkgs.stdenv.hostPlatform.system} - + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz"; - - rootfs = - (releases init).incusContainerImage.${pkgs.stdenv.hostPlatform.system} - + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs"; - }; - - virtual-machine = { - metadata = - (releases init).incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system} + "/*/*.tar.xz"; - disk = (releases init).incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system} + "/nixos.qcow2"; - }; - }; - - initVariants = - lib.optionals cfg.init.legacy [ "legacy" ] ++ lib.optionals cfg.init.systemd [ "systemd" ]; - - canTestVm = cfg.instance.virtual-machine && pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64; + instanceScript = lib.foldlAttrs ( + acc: name: instance: + acc + instance.testScript + ) "" cfg.instances; in { - name = "incus" + lib.optionalString cfg.lts "-lts"; + name = cfg.package.name; meta = { maintainers = lib.teams.lxc.members; }; - nodes.machine = { + nodes.server = { virtualisation = { cores = 2; memorySize = 4096; - diskSize = 12 * 1024; + diskSize = 20 * 1024; emptyDiskImages = [ # vdb for zfs 2048 @@ -66,7 +41,7 @@ in incus = { enable = true; - package = if cfg.lts then pkgs.incus-lts else pkgs.incus; + package = cfg.package; preseed = { networks = [ @@ -152,280 +127,83 @@ in '' server = IncusHost(machine) '' - + lib.optionalString cfg.appArmor '' - with subtest("Verify AppArmor service is started without issue"): - # restart AppArmor service since the Incus AppArmor folders are - # created after AA service is started - machine.systemctl("restart apparmor.service") - machine.succeed("systemctl --no-pager -l status apparmor.service") - machine.wait_for_unit("apparmor.service") - '' - + lib.optionalString cfg.instance.container ( - lib.foldl ( - acc: variant: - acc - # python - + '' - metadata = "${(images variant).container.metadata}" - rootfs = "${(images variant).container.rootfs}" - alias = "nixos/container/${variant}" - variant = "${variant}" - - with subtest("container image can be imported"): - machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}") - - - with subtest("container can be launched and managed"): - machine.succeed(f"incus launch {alias} container-{variant}1") - machine.wait_for_instance(f"container-{variant}1") - - - with subtest("container mounts lxcfs overlays"): - machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'") - machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'") - - - with subtest("container CPU limits can be managed"): - machine.set_instance_config(f"container-{variant}1", "limits.cpu 1", restart=True) - machine.wait_instance_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90) - - - with subtest("container CPU limits can be hotplug changed"): - machine.set_instance_config(f"container-{variant}1", "limits.cpu 2") - machine.wait_instance_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90) - - - with subtest("container memory limits can be managed"): - machine.set_instance_config(f"container-{variant}1", "limits.memory 128MB", restart=True) - machine.wait_instance_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90) - - - with subtest("container memory limits can be hotplug changed"): - machine.set_instance_config(f"container-{variant}1", "limits.memory 256MB") - machine.wait_instance_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90) - - - with subtest("container software tpm can be configured"): - machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0") - machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0") - machine.succeed(f"incus config device remove container-{variant}1 vtpm") - machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0") - - - with subtest("container lxc-generator compatibility"): - with subtest("lxc-container generator configures plain container"): - # default container is plain - machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - - machine.check_instance_sysctl(f"container-{variant}1") - - with subtest("lxc-container generator configures nested container"): - machine.set_instance_config(f"container-{variant}1", "security.nesting=true", restart=True) - - machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() - assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" - - machine.check_instance_sysctl(f"container-{variant}1") - - with subtest("lxc-container generator configures privileged container"): - # Create a new instance for a clean state - machine.succeed(f"incus launch {alias} container-{variant}2") - machine.wait_for_instance(f"container-{variant}2") - - machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") - - machine.check_instance_sysctl(f"container-{variant}2") - - with subtest("container supports per-instance lxcfs"): - machine.succeed(f"incus stop container-{variant}1") - machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - - machine.succeed("incus config set instances.lxcfs.per_instance=true") - - machine.succeed(f"incus start container-{variant}1") - machine.wait_for_instance(f"container-{variant}1") - machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") - - - with subtest("container can successfully restart"): - machine.succeed(f"incus restart container-{variant}1") - machine.wait_for_instance(f"container-{variant}1") - - - with subtest("container remains running when softDaemonRestart is enabled and service is stopped"): - pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus") - machine.succeed(f"ps {pid}") - machine.succeed("systemctl start incus") - - with subtest("containers stop with incus-startup.service"): - pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus-startup.service") - machine.wait_until_fails(f"ps {pid}", timeout=120) - machine.succeed("systemctl start incus-startup.service") - - - machine.cleanup() - '' - ) "" initVariants - ) - + lib.optionalString canTestVm ( - (lib.foldl ( - acc: variant: - acc - # python - + '' - metadata = "${(images variant).virtual-machine.metadata}" - disk = "${(images variant).virtual-machine.disk}" - alias = "nixos/virtual-machine/${variant}" - variant = "${variant}" - - with subtest("virtual-machine image can be imported"): - machine.succeed(f"incus image import {metadata} {disk} --alias {alias}") - - - with subtest("virtual-machine can be created"): - machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false") - - - with subtest("virtual-machine software tpm can be configured"): - machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0") - - - with subtest("virtual-machine can be launched and become available"): - machine.succeed(f"incus start vm-{variant}1") - machine.wait_for_instance(f"vm-{variant}1") - - - with subtest("virtual-machine incus-agent is started"): - machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent") - - - with subtest("virtual-machine incus-agent has a valid path"): - machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'") - - - with subtest("virtual-machine CPU limits can be managed"): - machine.set_instance_config(f"vm-{variant}1", "limits.cpu 1", restart=True) - machine.wait_instance_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90) - - - with subtest("virtual-machine CPU limits can be hotplug changed"): - machine.set_instance_config(f"vm-{variant}1", "limits.cpu 2") - machine.wait_instance_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90) - - - with subtest("virtual-machine can successfully restart"): - machine.succeed(f"incus restart vm-{variant}1") - machine.wait_for_instance(f"vm-{variant}1") - - - with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"): - pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus") - machine.succeed(f"ps {pid}") - machine.succeed("systemctl start incus") - - - with subtest("virtual-machines stop with incus-startup.service"): - pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip() - machine.succeed(f"ps {pid}") - machine.succeed("systemctl stop incus-startup.service") - machine.wait_until_fails(f"ps {pid}", timeout=120) - machine.succeed("systemctl start incus-startup.service") - - - machine.cleanup() - '' - ) "" initVariants) - + - # python - '' - with subtest("virtual-machine can launch CSM (BIOS)"): - machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false") - machine.succeed("incus start csm") - - - machine.cleanup() - '' - ) - + - lib.optionalString cfg.feature.user # python - '' - with subtest("incus-user allows restricted access for users"): - machine.fail("incus project show user-1000") - machine.succeed("su - testuser bash -c 'incus list'") - # a project is created dynamically for the user - machine.succeed("incus project show user-1000") - # users shouldn't be able to list storage pools - machine.fail("su - testuser bash -c 'incus storage list'") - - - with subtest("incus-user allows users to launch instances"): - machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") - machine.succeed("su - testuser bash -c 'incus launch nixos instance2'") - machine.wait_for_instance("instance2", "user-1000") - - machine.cleanup() - '' + lib.optionalString cfg.network.ovs # python '' with subtest("Verify openvswitch bridge"): - machine.succeed("incus network info ovsbr0") + server.succeed("incus network info ovsbr0") with subtest("Verify openvswitch bridge"): - machine.succeed("ovs-vsctl br-exists ovsbr0") + server.succeed("ovs-vsctl br-exists ovsbr0") '' + lib.optionalString cfg.storage.zfs # python '' with subtest("Verify zfs pool created and usable"): - machine.succeed( + server.succeed( "zpool status", "parted --script /dev/vdb mklabel gpt", "zpool create zfs_pool /dev/vdb", ) - machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus") - machine.succeed("zfs list zfs_pool/incus") + server.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus") + server.succeed("zfs list zfs_pool/incus") - machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem") - machine.succeed("incus storage volume create zfs_pool test_vol --type block") + server.succeed("incus storage volume create zfs_pool test_fs --type filesystem") + server.succeed("incus storage volume create zfs_pool test_vol --type block") - machine.succeed("incus storage show zfs_pool") - machine.succeed("incus storage volume list zfs_pool") - machine.succeed("incus storage volume show zfs_pool test_fs") - machine.succeed("incus storage volume show zfs_pool test_vol") + server.succeed("incus storage show zfs_pool") + server.succeed("incus storage volume list zfs_pool") + server.succeed("incus storage volume show zfs_pool test_fs") + server.succeed("incus storage volume show zfs_pool test_vol") - machine.succeed("incus create zfs1 --empty --storage zfs_pool") - machine.succeed("incus list zfs1") + server.succeed("incus create zfs1 --empty --storage zfs_pool") + server.succeed("incus list zfs1") '' + lib.optionalString cfg.storage.lvm # python '' with subtest("Verify lvm pool created and usable"): - machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool") - machine.succeed("vgs incus_pool") + server.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool") + server.succeed("vgs incus_pool") - machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem") - machine.succeed("incus storage volume create lvm_pool test_vol --type block") + server.succeed("incus storage volume create lvm_pool test_fs --type filesystem") + server.succeed("incus storage volume create lvm_pool test_vol --type block") - machine.succeed("incus storage show lvm_pool") + server.succeed("incus storage show lvm_pool") - machine.succeed("incus storage volume list lvm_pool") - machine.succeed("incus storage volume show lvm_pool test_fs") - machine.succeed("incus storage volume show lvm_pool test_vol") + server.succeed("incus storage volume list lvm_pool") + server.succeed("incus storage volume show lvm_pool test_fs") + server.succeed("incus storage volume show lvm_pool test_vol") - machine.succeed("incus create lvm1 --empty --storage lvm_pool") - machine.succeed("incus list lvm1") - ''; + server.succeed("incus create lvm1 --empty --storage lvm_pool") + server.succeed("incus list lvm1") + '' + + + lib.optionalString cfg.appArmor # python + '' + with subtest("Verify AppArmor service is started without issue"): + # restart AppArmor service since the Incus AppArmor folders are + # created after AA service is started + server.systemctl("restart apparmor.service") + server.succeed("systemctl --no-pager -l status apparmor.service") + server.wait_for_unit("apparmor.service") + '' + + + lib.optionalString cfg.feature.user # python + '' + with subtest("incus-user allows restricted access for users"): + server.fail("incus project show user-1000") + server.succeed("su - testuser bash -c 'incus list'") + # a project is created dynamically for the user + server.succeed("incus project show user-1000") + # users shouldn't be able to list storage pools + server.fail("su - testuser bash -c 'incus storage list'") + + + '' + + instanceScript; } diff --git a/nixos/tests/incus/incus_machine.py b/nixos/tests/incus/incus_machine.py index 8c28abf0081e..c25a7804b871 100644 --- a/nixos/tests/incus/incus_machine.py +++ b/nixos/tests/incus/incus_machine.py @@ -87,6 +87,6 @@ class IncusHost(Machine): .strip() .split(" ")[-1] ) - assert ( - "1" == sysctl - ), f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" + assert "1" == sysctl, ( + f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" + ) diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix index 49702cb325c3..ca7b8c4cd0fa 100644 --- a/nixos/tests/incus/ui.nix +++ b/nixos/tests/incus/ui.nix @@ -1,7 +1,7 @@ { pkgs, lib, - lts ? true, + package, ... }: { @@ -17,7 +17,7 @@ virtualisation.incus = { enable = true; - package = if lts then pkgs.incus-lts else pkgs.incus; + inherit package; preseed.config."core.https_address" = ":8443"; ui.enable = true; From 6aa913f085a5d13546b6731d9852ac4ca392cdb4 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 29 Sep 2025 21:36:24 -0400 Subject: [PATCH 1727/2279] nixos/tests/incus: fix user feature --- nixos/tests/incus/incus-tests.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 619a40a25b72..efc1554f25a6 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -202,8 +202,8 @@ in server.succeed("incus project show user-1000") # users shouldn't be able to list storage pools server.fail("su - testuser bash -c 'incus storage list'") - - + # user can create an instance + server.succeed("su - testuser bash -c 'incus create --empty'") '' + instanceScript; } From 1aa2d898d1647b6ba861baa1636f2986a498ef50 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 29 Sep 2025 21:36:24 -0400 Subject: [PATCH 1728/2279] nixos/tests/incus: fix lvm, zfs, ovs tests --- nixos/tests/incus/default.nix | 37 ++++++++++++++++++++++++++++--- nixos/tests/incus/incus-tests.nix | 6 ----- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 04d2fa4d4299..fb10fa56e0dd 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -18,6 +18,29 @@ let }; in { + all = incusRunTest { + feature.user = true; + + instances = { + c1 = { + type = "container"; + }; + + vm1 = { + type = "virtual-machine"; + }; + }; + + network = { + ovs = true; + }; + + storage = { + lvm = true; + zfs = true; + }; + }; + # appArmor = incusRunTest { # all = true; # appArmor = true; @@ -29,9 +52,9 @@ in }; }; - # lvm = incusRunTest { storage.lvm = true; }; - # - # openvswitch = incusRunTest { network.ovs = true; }; + lvm = incusRunTest { storage.lvm = true; }; + + openvswitch = incusRunTest { network.ovs = true; }; ui = runTest { imports = [ ./ui.nix ]; @@ -44,6 +67,14 @@ in vm1 = { type = "virtual-machine"; }; + + # TODO never becomes available + # csm = { + # type = "virtual-machine"; + # incusConfig.config = { + # "security.csm" = true; + # }; + # }; }; }; diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index efc1554f25a6..56ed1f087803 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -6,12 +6,6 @@ }: # TODO aarch64 vm filter -# TODO CSM -# with subtest("incus-user allows users to create instances"): -# server.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'") -# server.succeed("su - testuser bash -c 'incus launch nixos instance2'") -# server.wait_for_instance("instance2", "user-1000") -# let cfg = config.tests.incus; From f25d94d9c06e595f9369bcb3a8aa31e9b757ca92 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 29 Sep 2025 21:36:24 -0400 Subject: [PATCH 1729/2279] nixos/tests/incus: give tests unique names --- nixos/tests/incus/default.nix | 31 +++++++++++++++++------- nixos/tests/incus/incus-tests-module.nix | 5 ++++ nixos/tests/incus/incus-tests.nix | 5 +++- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index fb10fa56e0dd..db8bf44ccf4a 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -19,6 +19,8 @@ let in { all = incusRunTest { + name = "all"; + appArmor = true; feature.user = true; instances = { @@ -41,20 +43,25 @@ in }; }; - # appArmor = incusRunTest { - # all = true; - # appArmor = true; - # }; - container = incusRunTest { + name = "container"; + instances.c1 = { type = "container"; }; }; - lvm = incusRunTest { storage.lvm = true; }; + lvm = incusRunTest { + name = "lvm"; - openvswitch = incusRunTest { network.ovs = true; }; + storage.lvm = true; + }; + + openvswitch = incusRunTest { + name = "openvswitch"; + + network.ovs = true; + }; ui = runTest { imports = [ ./ui.nix ]; @@ -63,12 +70,14 @@ in }; virtual-machine = incusRunTest { + name = "virtual-machine"; + instances = { vm1 = { type = "virtual-machine"; }; - # TODO never becomes available + # disabled because never becomes available # csm = { # type = "virtual-machine"; # incusConfig.config = { @@ -78,5 +87,9 @@ in }; }; - zfs = incusRunTest { storage.zfs = true; }; + zfs = incusRunTest { + name = "zfs"; + + storage.zfs = true; + }; } diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix index 4f8df4d08c2a..085dbfbc8750 100644 --- a/nixos/tests/incus/incus-tests-module.nix +++ b/nixos/tests/incus/incus-tests-module.nix @@ -8,6 +8,11 @@ let in { options.tests.incus = { + name = lib.mkOption { + type = lib.types.str; + description = "name appended to test"; + }; + package = lib.mkPackageOption pkgs "incus" { }; preseed = lib.mkOption { diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 56ed1f087803..ec5a6061b0d2 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -15,12 +15,15 @@ let ) "" cfg.instances; in { - name = cfg.package.name; + name = "${cfg.package.name}-${cfg.name}"; meta = { maintainers = lib.teams.lxc.members; }; + # sshBackdoor.enable = true; + # enableDebugHook = true; + nodes.server = { virtualisation = { cores = 2; From 2c84737d3a45d249f2659699623d03ef424038d2 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 31 Oct 2025 22:53:02 -0400 Subject: [PATCH 1730/2279] nixos/tests/incus: use runTestOn to limit systems, skip VMs aarch64-linux --- nixos/tests/all-tests.nix | 4 ++-- nixos/tests/incus/default.nix | 9 ++++++--- nixos/tests/incus/incus-tests.nix | 28 ++++++++++++++++++++-------- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 382d84fd6df1..a1b472b1d075 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -743,11 +743,11 @@ in immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix; incron = runTest ./incron.nix; incus = import ./incus { - inherit runTest; + inherit runTestOn; package = pkgs.incus; }; incus-lts = import ./incus { - inherit runTest; + inherit runTestOn; package = pkgs.incus-lts; }; influxdb = runTest ./influxdb.nix; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index db8bf44ccf4a..a09e4e8c3ace 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -1,11 +1,11 @@ { package, - runTest, + runTestOn, }: let incusRunTest = config: - runTest { + runTestOn [ "x86_64-linux" "aarch64-linux" ] { imports = [ ./incus-tests-module.nix ./incus-tests.nix @@ -18,6 +18,8 @@ let }; in { + # this is the main test which will test as much as possible + # run this for testing incus upgrades, also available in incus package tests all = incusRunTest { name = "all"; appArmor = true; @@ -43,6 +45,7 @@ in }; }; + # used in lxc tests to verify container functionality container = incusRunTest { name = "container"; @@ -63,7 +66,7 @@ in network.ovs = true; }; - ui = runTest { + ui = runTestOn [ "x86_64-linux" "aarch64-linux" ] { imports = [ ./ui.nix ]; _module.args = { inherit package; }; diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index ec5a6061b0d2..10470b36a795 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -5,14 +5,29 @@ ... }: -# TODO aarch64 vm filter let cfg = config.tests.incus; - instanceScript = lib.foldlAttrs ( - acc: name: instance: - acc + instance.testScript - ) "" cfg.instances; + # limit building of VMs to these systems as nested virtualization is + # required to test VMs, but support for this is poor outside x86 + # will print warnings on those systems rather than failing outright + vmsEnabled = lib.elem pkgs.stdenv.system [ "x86_64-linux" ]; + + instanceScript = lib.pipe cfg.instances [ + (lib.filterAttrs ( + name: instance: + let + keep = instance.type != "virtual-machine" || vmsEnabled; + in + lib.warnIf (!keep) '' + Skipping virtual-machine ${name} as VMs are disabled on ${pkgs.stdenv.system} + '' keep + )) + (lib.foldlAttrs ( + acc: name: instance: + acc + instance.testScript + ) "") + ]; in { name = "${cfg.package.name}-${cfg.name}"; @@ -21,9 +36,6 @@ in maintainers = lib.teams.lxc.members; }; - # sshBackdoor.enable = true; - # enableDebugHook = true; - nodes.server = { virtualisation = { cores = 2; From 4947d15dffdab7a02bc9d05e4401c19a2d62fc45 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 8 Nov 2025 15:25:24 +0100 Subject: [PATCH 1731/2279] nixosTests.agda.base: fix build the binary adga-mode has been deprecated one is supposed to use the main binary with --emacs-mode instead --- nixos/tests/agda/base.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/agda/base.nix b/nixos/tests/agda/base.nix index f804abda6f62..9fafd2f46000 100644 --- a/nixos/tests/agda/base.nix +++ b/nixos/tests/agda/base.nix @@ -26,7 +26,6 @@ in testScript = '' # agda and agda-mode are in path machine.succeed("agda --version") - machine.succeed("agda-mode") # Minimal script that typechecks machine.succeed("touch TestEmpty.agda") From 4ae9f24c290924174015d069b0d20b6200e096e4 Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 8 Nov 2025 12:14:17 +0000 Subject: [PATCH 1732/2279] opencode: 1.0.35 -> 1.0.45 --- pkgs/by-name/op/opencode/hashes.json | 8 ++++---- pkgs/by-name/op/opencode/package.nix | 4 ++-- pkgs/by-name/op/opencode/skip-npm-pack.patch | 12 +++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/op/opencode/hashes.json b/pkgs/by-name/op/opencode/hashes.json index ad76e9e5ed76..77927f0f7894 100644 --- a/pkgs/by-name/op/opencode/hashes.json +++ b/pkgs/by-name/op/opencode/hashes.json @@ -1,8 +1,8 @@ { "node_modules": { - "aarch64-linux": "sha256-nNzDvqsFLJdZYDjvuYAcohnGnqNiGiS1mI9zAeKPr/U=", - "x86_64-linux": "sha256-rrW97K4eNtW3gGxu49BdzL6p8/goHBi3IT6z0IcQY0A=", - "aarch64-darwin": "sha256-joKBnXYVtDiJeq7sdDZwseXdNIjXM6BO3RqLTvq8kTQ=", - "x86_64-darwin": "sha256-6hLqaOP6qxnkUPHsWvlD96SjXRrbqWLeExWwlRgrUdg=" + "aarch64-linux": "3yXOsptDRUoyL/FBQu8esD4ipudOA9jyLenNt1WChMU=", + "x86_64-linux": "sha256-ocgmxMx+V6uBMLZTrHfYAqO4l38WQVCrQ2AbUWagaoM=", + "aarch64-darwin": "sha256-xNU+ucIy84iqmyoWKwwLBIV34TTmH/OGmIbIiNOPM/w=", + "x86_64-darwin": "sha256-9kplc7tpWgYnB+4471EBkE2xYF3RkpgKqpg26M6bUPs=" } } diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 1eb440b9b922..b284368643ee 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.0.35"; + version = "1.0.45"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-0IFlFWMPu9ynrpu/bYJK2xOgZc+lCSQOSV2WfD0KY3w="; + hash = "sha256-59nsauILNEvQ4Q8ATHKtgTViIWMaFnUyBf7CN6qrtdk="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/op/opencode/skip-npm-pack.patch b/pkgs/by-name/op/opencode/skip-npm-pack.patch index cdb93c3f82fa..67825e14e99a 100644 --- a/pkgs/by-name/op/opencode/skip-npm-pack.patch +++ b/pkgs/by-name/op/opencode/skip-npm-pack.patch @@ -1,16 +1,14 @@ diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts -index 4ce8bfba..5b3da591 100755 +index 29706c09..584b00d4 100755 --- i/packages/opencode/script/build.ts +++ w/packages/opencode/script/build.ts -@@ -39,17 +39,9 @@ for (const [os, arch] of targets) { +@@ -39,15 +39,9 @@ for (const [os, arch] of targets) { const name = `${pkg.name}-${os}-${arch}` await $`mkdir -p dist/${name}/bin` - const opentui = `@opentui/core-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}` - await $`mkdir -p ../../node_modules/${opentui}` -- await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd( -- path.join(dir, "../../node_modules"), -- ) +- await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd(path.join(dir, "../../node_modules")) - await $`tar -xf ../../node_modules/${opentui.replace("@opentui/", "opentui-")}-*.tgz -C ../../node_modules/${opentui} --strip-components=1` + // Skip npm pack - packages already installed in node_modules by Nix @@ -20,5 +18,5 @@ index 4ce8bfba..5b3da591 100755 - await $`tar -xf ../../node_modules/${watcher.replace("@parcel/", "parcel-")}-*.tgz -C ../../node_modules/${watcher} --strip-components=1` + // Skip npm pack - packages already installed in node_modules by Nix - const parserWorker = fs.realpathSync( - path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js"), + const parserWorker = fs.realpathSync(path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js")) + const workerPath = "./src/cli/cmd/tui/worker.ts" From 700dcfbea47fd585e9ede350a2756bf3fb900271 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 14:20:29 +0100 Subject: [PATCH 1733/2279] python3Packages.pycategories: drop Broken unmaintained leaf package. --- .../python-modules/pycategories/default.nix | 42 ------------------- .../python-modules/pycategories/infix.nix | 25 ----------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/development/python-modules/pycategories/default.nix delete mode 100644 pkgs/development/python-modules/pycategories/infix.nix diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix deleted file mode 100644 index 98a8e360d157..000000000000 --- a/pkgs/development/python-modules/pycategories/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - callPackage, - fetchPypi, - pytestCheckHook, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "pycategories"; - version = "1.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-vXDstelOdlnlZOoVPwx2cykdw3xSbCRoAPwI1sU3gJk="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" - substituteInPlace setup.cfg \ - --replace "--cov-report term --cov=categories" "" - ''; - - # Is private because the author states it's unmaintained - # and shouldn't be used in production code - propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = with lib; { - description = "Implementation of some concepts from category theory"; - homepage = "https://gitlab.com/danielhones/pycategories"; - changelog = "https://gitlab.com/danielhones/pycategories/-/blob/v${version}/CHANGELOG.rst"; - license = licenses.mit; - maintainers = with maintainers; [ dmvianna ]; - }; -} diff --git a/pkgs/development/python-modules/pycategories/infix.nix b/pkgs/development/python-modules/pycategories/infix.nix deleted file mode 100644 index d5959c1a0ec1..000000000000 --- a/pkgs/development/python-modules/pycategories/infix.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - buildPythonPackage, - lib, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "infix"; - version = "1.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "a1bfdcf875bc072f41e426d0673f2e3017750743bb90cc725fffb292eb09648c"; - }; - - # No tests - doCheck = false; - - meta = { - homepage = "https://github.com/borntyping/python-infix"; - description = "Decorator that allows functions to be used as infix functions"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6a5f33f02284..6cecf4d22c75 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -309,6 +309,7 @@ mapAliases { py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 py-scrypt = scrypt; # added 2025-08-07 py_stringmatching = throw "'py_stringmatching' has been renamed to/replaced by 'py-stringmatching'"; # Converted to throw 2025-10-29 + pycategories = throw "'pycategories' has been removed as it was broken and unmaintained"; # added 2025-11-08 PyChromecast = throw "'PyChromecast' has been renamed to/replaced by 'pychromecast'"; # Converted to throw 2025-10-29 pydns = throw "'pydns' has been renamed to/replaced by 'py3dns'"; # Converted to throw 2025-10-29 pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7445001618c7..d01e393f4e97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12818,8 +12818,6 @@ self: super: with self; { pycatch22 = callPackage ../development/python-modules/pycatch22 { }; - pycategories = callPackage ../development/python-modules/pycategories { }; - pycayennelpp = callPackage ../development/python-modules/pycayennelpp { }; pycddl = callPackage ../development/python-modules/pycddl { }; From 0d206b3a485ca9dcbf3bd9cd8f05b3b5ddcc16a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 14:23:42 +0100 Subject: [PATCH 1734/2279] python3Packages.mesonpep517: drop Broken unmaintained leaf package. --- .../python-modules/mesonpep517/default.nix | 49 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/development/python-modules/mesonpep517/default.nix diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix deleted file mode 100644 index 4256dbe6ece4..000000000000 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - meson, - ninja, - setuptools, - toml, - wheel, -}: - -# TODO: offer meson as a Python package so we have dist-info folder. - -buildPythonPackage rec { - pname = "mesonpep517"; - version = "0.2"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; - }; - - # Applies the following merge request, which doesn't apply cleanly: - # https://gitlab.com/thiblahute/mesonpep517/-/merge_requests/25 - # - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'backend-path = "."' 'backend-path = ["."]' - ''; - - build-system = [ - setuptools - wheel - ]; - - dependencies = [ toml ]; - - propagatedNativeBuildInputs = [ - meson - ninja - ]; - - meta = { - description = "Create pep517 compliant packages from the meson build system"; - homepage = "https://gitlab.com/thiblahute/mesonpep517"; - license = lib.licenses.asl20; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6cecf4d22c75..7cf00fbaa665 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -256,6 +256,7 @@ mapAliases { memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29 memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29 mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 + mesonpep517 = throw "'mesonpep517' has been removed as it was broken and unmaintained."; # added 2025-11-08 minikerberos-bad = throw "'minikerberos-bad' has been renamed to/replaced by 'kerbad'"; # added 2025-11-06 mir_eval = throw "'mir_eval' has been renamed to/replaced by 'mir-eval'"; # Converted to throw 2025-10-29 mistune_2_0 = throw "'mistune_2_0' has been renamed to/replaced by 'mistune'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d01e393f4e97..99e66e842b76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9341,8 +9341,6 @@ self: super: with self; { meson-python = callPackage ../development/python-modules/meson-python { inherit (pkgs) ninja; }; - mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - messagebird = callPackage ../development/python-modules/messagebird { }; metaflow = callPackage ../development/python-modules/metaflow { }; From e2016ca6f846a3bc822852b925c30ea0d648870d Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 31 Oct 2025 08:46:11 -0400 Subject: [PATCH 1735/2279] incus: 6.17.0 -> 6.18.0 Changelog: https://github.com/lxc/incus/releases/tag/v6.18.0 --- pkgs/by-name/in/incus/generic.nix | 9 +++++++++ pkgs/by-name/in/incus/package.nix | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index 8082c909b00f..364d4a7017a1 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -158,7 +158,16 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/incus completion zsh) mkdir -p $agent_loader/bin $agent_loader/etc/systemd/system $agent_loader/lib/udev/rules.d + '' + + lib.optionalString (lib.versionOlder finalAttrs.version "6.18") '' cp internal/server/instance/drivers/agent-loader/incus-agent{,-setup} $agent_loader/bin/ + '' + + lib.optionalString (lib.versionAtLeast finalAttrs.version "6.18") '' + # the agent_loader output is used by virtualisation.incus.agent + cp internal/server/instance/drivers/agent-loader/incus-agent-linux $agent_loader/bin/incus-agent + cp internal/server/instance/drivers/agent-loader/incus-agent-setup-linux $agent_loader/bin/incus-agent-setup + '' + + '' chmod +x $agent_loader/bin/incus-agent{,-setup} patchShebangs $agent_loader/bin/incus-agent{,-setup} cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/ diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 91998acb2f21..b170d0f2b26f 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-QtsdKXgf995FzMxSHYz8LupECeRA2nriz9Bb3S0epKY="; - version = "6.17.0"; - vendorHash = "sha256-5BQFoiutNuvFu+oA3ZpD8w8qtrf7l/B5b3eHwSEfzBU="; + hash = "sha256-XJp0Loaj3FFygyiIkSaMl4T0KmkNt7xtyU4nz++6yHs="; + version = "6.18.0"; + vendorHash = "sha256-ySNeO06x8FzCH29EHbO3/ASVNSXTviyeULFrVoQwxcw="; patches = [ ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix" From 6e20cb326ce21b0631d9c90ea78d907ef056c1d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 14:46:55 +0000 Subject: [PATCH 1736/2279] iosevka: 33.3.3 -> 33.3.4 --- pkgs/by-name/io/iosevka/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 23ae4b93842b..0f79808b6021 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.3.3"; + version = "33.3.4"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-/e65hFA8GabDrHjQ+9MthSTxUku9af0LT4W1ENI+LYc="; + hash = "sha256-CH9OGj9dfxY3vfLX4ipbML4rIOlXBKIOgwz3K54o1No="; }; - npmDepsHash = "sha256-QJ3h8NdhCG+lkZ5392akKk+pVHiqmnt+DsC3imixNnw="; + npmDepsHash = "sha256-xNd/DGIYbjR0v+iUgj12T1jsUpIuOG0avNGnEYVdK3Q="; nativeBuildInputs = [ remarshal From 3546cbd95131cd4f16fdac89f0916fdc8df56537 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 14:54:11 +0000 Subject: [PATCH 1737/2279] libretro.ppsspp: 0-unstable-2025-10-31 -> 0-unstable-2025-11-08 --- pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 8b55fc42292b..e6799c37037d 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-10-31"; + version = "0-unstable-2025-11-08"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "884ec9d16e39272d6f04ce6e7e202290ec31f45d"; - hash = "sha256-vC2GPK5hHjOUtoxG2rw2ESiAbTOsQRx8tDABxNjRkFw="; + rev = "5646e471699de213b0fd30eecc50628322b0a8e2"; + hash = "sha256-TZqqABGy2smTsIScDKb4hMAyghyN8jW6RMba1o6/nNU="; fetchSubmodules = true; }; From 405393e439446a86c585ee69929ef82e306b3a2c Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sat, 8 Nov 2025 17:19:29 +0200 Subject: [PATCH 1738/2279] blender: pin to ffmpeg 7 to fix build --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 8645982537e9..9b7fe43f35e6 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -16,7 +16,7 @@ embree, fetchzip, fetchFromGitHub, - ffmpeg, + ffmpeg_7, fftw, fftwFloat, freetype, @@ -239,7 +239,7 @@ stdenv'.mkDerivation (finalAttrs: { buildInputs = [ alembic boost - ffmpeg + ffmpeg_7 fftw fftwFloat freetype From 0c5e72e937001532ec0155823f5c810fce0add0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 15:19:35 +0000 Subject: [PATCH 1739/2279] protoc-gen-dart: 22.5.0 -> 24.0.0 --- pkgs/by-name/pr/protoc-gen-dart/package.nix | 4 ++-- pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix index 424a548c51a1..c2a017ca417f 100644 --- a/pkgs/by-name/pr/protoc-gen-dart/package.nix +++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix @@ -11,13 +11,13 @@ buildDartApplication rec { pname = "protoc-gen-dart"; - version = "22.5.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf.dart"; tag = "protoc_plugin-v${version}"; - hash = "sha256-8pSCYlbZLqHnpetM4luyfGo1qnWgKx93JPjRVWCOX0w="; + hash = "sha256-DEuvwBJhSo4o5ydnutxv2PCIRgS+2dE7u3RleidhAUM="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json index c9f46703e9ed..faa7178b5dd4 100644 --- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json +++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json @@ -14,11 +14,11 @@ "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0", + "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.4.0" + "version": "8.4.1" }, "args": { "dependency": "transitive", @@ -104,11 +104,11 @@ "dependency": "transitive", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "dart_style": { "dependency": "transitive", From ba5974d572f6b7946cd9ad71b8633155af482f12 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Nov 2025 16:15:00 +0100 Subject: [PATCH 1740/2279] nixos/tlsrpt: enable TLSRPT in Postfix These are required settings to allow tlsrpt-collectd to receive telmetry from Postfix. --- nixos/modules/services/mail/tlsrpt.nix | 141 +++++++++++++------------ 1 file changed, 76 insertions(+), 65 deletions(-) diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix index 843e1477d7e0..52ed3793309d 100644 --- a/nixos/modules/services/mail/tlsrpt.nix +++ b/nixos/modules/services/mail/tlsrpt.nix @@ -9,6 +9,7 @@ let inherit (lib) mkEnableOption mkIf + mkMerge mkOption mkPackageOption types @@ -59,8 +60,6 @@ let reportdConfigFile = format.generate "tlsrpt-reportd.cfg" { tlsrpt_reportd = dropNullValues cfg.reportd.settings; }; - - withPostfix = config.services.postfix.enable && cfg.configurePostfix; in { @@ -286,71 +285,83 @@ in }; }; - config = mkIf cfg.enable { - environment.etc = { - "tlsrpt/collectd.cfg".source = collectdConfigFile; - "tlsrpt/fetcher.cfg".source = fetcherConfigFile; - "tlsrpt/reportd.cfg".source = reportdConfigFile; - }; + config = mkMerge [ + (mkIf (cfg.enable && config.services.postfix.enable && cfg.configurePostfix) { + users.users.postfix.extraGroups = [ + "tlsrpt" + ]; - users.users.tlsrpt = { - isSystemUser = true; - group = "tlsrpt"; - }; - users.groups.tlsrpt = { }; - - users.users.postfix.extraGroups = lib.mkIf withPostfix [ - "tlsrpt" - ]; - - systemd.services.tlsrpt-collectd = { - description = "TLSRPT datagram collector"; - documentation = [ "man:tlsrpt-collectd(1)" ]; - - wantedBy = [ "multi-user.target" ]; - - restartTriggers = [ collectdConfigFile ]; - - serviceConfig = commonServiceSettings // { - ExecStart = toString ( - [ - (lib.getExe' cfg.package "tlsrpt-collectd") - ] - ++ cfg.collectd.extraFlags - ); - IPAddressDeny = "any"; - PrivateNetwork = true; - RestrictAddressFamilies = [ "AF_UNIX" ]; - RuntimeDirectory = "tlsrpt"; - RuntimeDirectoryMode = "0750"; - UMask = "0157"; + services.postfix.settings.main = { + smtp_tlsrpt_enable = true; + smtp_tlsrpt_socket_name = cfg.collectd.settings.socketname; }; - }; - systemd.services.tlsrpt-reportd = { - description = "TLSRPT report generator"; - documentation = [ "man:tlsrpt-reportd(1)" ]; - - wantedBy = [ "multi-user.target" ]; - - restartTriggers = [ reportdConfigFile ]; - - serviceConfig = commonServiceSettings // { - ExecStart = toString ( - [ - (lib.getExe' cfg.package "tlsrpt-reportd") - ] - ++ cfg.reportd.extraFlags - ); - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_NETLINK" - ]; - ReadWritePaths = lib.optionals withPostfix [ "/var/lib/postfix/queue/maildrop" ]; - SupplementaryGroups = lib.optionals withPostfix [ "postdrop" ]; - UMask = "0077"; + systemd.services.tlsrpt-reportd.serviceConfig = { + ReadWritePaths = [ "/var/lib/postfix/queue/maildrop" ]; + SupplementaryGroups = [ "postdrop" ]; }; - }; - }; + }) + + (mkIf cfg.enable { + environment.etc = { + "tlsrpt/collectd.cfg".source = collectdConfigFile; + "tlsrpt/fetcher.cfg".source = fetcherConfigFile; + "tlsrpt/reportd.cfg".source = reportdConfigFile; + }; + + users.users.tlsrpt = { + isSystemUser = true; + group = "tlsrpt"; + }; + users.groups.tlsrpt = { }; + + systemd.services.tlsrpt-collectd = { + description = "TLSRPT datagram collector"; + documentation = [ "man:tlsrpt-collectd(1)" ]; + + wantedBy = [ "multi-user.target" ]; + + restartTriggers = [ collectdConfigFile ]; + + serviceConfig = commonServiceSettings // { + ExecStart = toString ( + [ + (lib.getExe' cfg.package "tlsrpt-collectd") + ] + ++ cfg.collectd.extraFlags + ); + IPAddressDeny = "any"; + PrivateNetwork = true; + RestrictAddressFamilies = [ "AF_UNIX" ]; + RuntimeDirectory = "tlsrpt"; + RuntimeDirectoryMode = "0750"; + UMask = "0157"; + }; + }; + + systemd.services.tlsrpt-reportd = { + description = "TLSRPT report generator"; + documentation = [ "man:tlsrpt-reportd(1)" ]; + + wantedBy = [ "multi-user.target" ]; + + restartTriggers = [ reportdConfigFile ]; + + serviceConfig = commonServiceSettings // { + ExecStart = toString ( + [ + (lib.getExe' cfg.package "tlsrpt-reportd") + ] + ++ cfg.reportd.extraFlags + ); + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + UMask = "0077"; + }; + }; + }) + ]; } From 2505ca46231c79e18e6a5ec96ded819040d74718 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 8 Nov 2025 23:35:37 +0800 Subject: [PATCH 1741/2279] polari: Switch to girepository-2.0 Fails to launch with gjs-1.85: cannot register existing type 'GIRepository' --- pkgs/by-name/po/polari/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix index 7703671c9319..70ee17118cf9 100644 --- a/pkgs/by-name/po/polari/package.nix +++ b/pkgs/by-name/po/polari/package.nix @@ -3,6 +3,7 @@ lib, itstool, fetchurl, + fetchpatch, gdk-pixbuf, telepathy-glib, gjs, @@ -42,6 +43,13 @@ stdenv.mkDerivation rec { # If we wrap it in a shell script, gjs can no longer run it. # Let’s change the code to run the script directly by making it executable and having gjs in shebang. ./make-thumbnailer-wrappable.patch + + # Switch to girepository-2.0 + # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/356 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/polari/-/commit/d7946c7fe39f112cd3f751bb95b170446022980d.patch"; + hash = "sha256-naRzZ5Iple11HJ+d8DL9oJy3C4VKLkz+FdMuhO7sc7k="; + }) ]; propagatedUserEnvPkgs = [ telepathy-idle ]; From 346f25967b4ec3c4799371466f832785b8297525 Mon Sep 17 00:00:00 2001 From: Bastian Erdnuess Date: Sat, 8 Nov 2025 17:10:08 +0100 Subject: [PATCH 1742/2279] unpin sbcl for stumpwm --- pkgs/top-level/all-packages.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5d3897c1ca4..5e075871330c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8948,14 +8948,6 @@ with pkgs; "3000" ]; }; - sbcl_2_4_10 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.10"; }; - faslExt = "fasl"; - flags = [ - "--dynamic-space-size" - "3000" - ]; - }; sbcl_2_5_5 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.5.5"; }; faslExt = "fasl"; @@ -12257,11 +12249,9 @@ with pkgs; inherit (ocaml-ng.ocamlPackages) stog; - # Stumpwm is broken on SBCL 2.4.11, see - # https://github.com/NixOS/nixpkgs/pull/360320 stumpwm = callPackage ../applications/window-managers/stumpwm { stdenv = stdenvNoCC; - sbcl = sbcl_2_4_10.withPackages ( + sbcl = sbcl.withPackages ( ps: with ps; [ alexandria cl-ppcre @@ -12271,7 +12261,7 @@ with pkgs; ); }; - stumpwm-unwrapped = sbcl_2_4_10.pkgs.stumpwm; + stumpwm-unwrapped = sbcl.pkgs.stumpwm; sublime3Packages = recurseIntoAttrs ( callPackage ../applications/editors/sublime/3/packages.nix { } From 17b131092da3d09c7b562d3df60896b539970668 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 16:15:43 +0000 Subject: [PATCH 1743/2279] python3Packages.openai-harmony: 0.0.4 -> 0.0.8 --- pkgs/development/python-modules/openai-harmony/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/openai-harmony/default.nix b/pkgs/development/python-modules/openai-harmony/default.nix index 74251b28ad4e..7de7f6ed6468 100644 --- a/pkgs/development/python-modules/openai-harmony/default.nix +++ b/pkgs/development/python-modules/openai-harmony/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "openai-harmony"; - version = "0.0.4"; + version = "0.0.8"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "harmony"; rev = "v${version}"; - hash = "sha256-2LOrMLrNR1D3isbjiv5w+1Ni9IMwMEPPTOnG1rm//ag="; + hash = "sha256-CaEldCrjBkjwsVeTzpiAFl/llAnUwJGTlU8Pt8YTV1E="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-tQq6PFMYghIfJu8CddbXFKXxr41GJaElbCCQuSpnaqk="; + hash = "sha256-HeUK/S9nUDRTVkLf8CPrHfjBbyGZezZGu5P8XkfStVQ="; }; nativeBuildInputs = [ From 5ea380bca358203a7397a0fa87c56239e31bd4c8 Mon Sep 17 00:00:00 2001 From: euxane Date: Tue, 4 Nov 2025 03:39:47 +0100 Subject: [PATCH 1744/2279] gscan2pdf: 2.13.4 -> 2.13.5 (and fix build) This release fixes issues with imagemagick 7. This change also re-enables two disabled tests which are now passing. The font init has been fixed upstream. The Tesseract input is aligned to the currently supported version. --- pkgs/by-name/gs/gscan2pdf/package.nix | 47 ++++++--------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix index c0ac37768c9d..3091f396e1b0 100644 --- a/pkgs/by-name/gs/gscan2pdf/package.nix +++ b/pkgs/by-name/gs/gscan2pdf/package.nix @@ -1,6 +1,7 @@ { lib, fetchurl, + fetchpatch, perlPackages, wrapGAppsHook3, # libs @@ -17,18 +18,17 @@ pdftk, # test dependencies xvfb-run, - liberation_ttf, file, - tesseract3, + tesseract, }: perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.13.4"; + version = "2.13.5"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - hash = "sha256-4HcTkVJBscBb8AxeN6orMQFVR0w4hFfkGhxQOzP3mWk="; + hash = "sha256-DUME9nI9B2+Gj+sBPj176SXfuxDc3CMXfby/Zga31fo="; }; patches = [ @@ -74,18 +74,11 @@ perlPackages.buildPerlPackage rec { SubOverride ]); - postPatch = - let - fontSubstitute = "${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf"; - in - '' - # Required for the program to properly load its SVG assets - substituteInPlace bin/gscan2pdf \ - --replace "/usr/share" "$out/share" - - # Substitute the non-free Helvetica font in the tests - sed -i 's|-pointsize|-font ${fontSubstitute} -pointsize|g' t/*.t - ''; + # Required for the program to properly load its SVG assets + postPatch = '' + substituteInPlace bin/gscan2pdf \ + --replace-fail "/usr/share" "$out/share" + ''; postInstall = '' # Remove impurity @@ -123,33 +116,13 @@ perlPackages.buildPerlPackage rec { xvfb-run file - tesseract3 # tests are expecting tesseract 3.x precisely + tesseract ] ++ (with perlPackages; [ TestPod ]); checkPhase = '' - # Temporarily disable a dubiously failing test: - # t/169_import_scan.t ........................... 1/1 - # # Failed test 'variable-height scan imported with expected size' - # # at t/169_import_scan.t line 50. - # # got: '179' - # # expected: '296' - # # Looks like you failed 1 test of 1. - # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) - rm t/169_import_scan.t - - # Disable a test failing because of a warning interfering with the pinned output - # t/3722_user_defined.t ......................... 1/2 - # Failed test 'user_defined caught error injected in queue' - # at t/3722_user_defined.t line 41. - # got: 'error - # WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert"' - # expected: 'error' - # Looks like you failed 1 test of 2. - rm t/3722_user_defined.t - export XDG_CACHE_HOME="$(mktemp -d)" xvfb-run -s '-screen 0 800x600x24' \ make test From 5d4d40ab373d0dc9c590a8339c67017fd6ff1074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 16:31:00 +0000 Subject: [PATCH 1745/2279] terragrunt: 0.93.0 -> 0.93.3 --- pkgs/by-name/te/terragrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 304ce55bbca0..e5e98c426d8c 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGo125Module (finalAttrs: { pname = "terragrunt"; - version = "0.93.0"; + version = "0.93.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-wi5Ff2wYPMgMMHZAJlq1v/UHjnRyNFbAy3IUYA+T5yI="; + hash = "sha256-E+NV3snA02fHDVadjQACdt6RNndjWDAcxChGxf/+/M4="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: { make generate-mocks ''; - vendorHash = "sha256-GLdUM5vlLO6B8ZCGiBAz5L32Wzr9eeYZxPtUc9MkjhE="; + vendorHash = "sha256-nUiXlkJKFiKlZkXoMfwysedyX0//GtNVB/fyR3sBWEU="; doCheck = false; From 05298556c4ec9509f9d536454d42437b86820096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 16:46:33 +0000 Subject: [PATCH 1746/2279] faugus-launcher: 1.9.9 -> 1.9.10 --- pkgs/by-name/fa/faugus-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 60a97b2d1c24..f9b726490655 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "faugus-launcher"; - version = "1.9.9"; + version = "1.9.10"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = version; - hash = "sha256-4ySI6j74DmeHAKtIYuAp+dnmyz9/gc6cQomcfP6V5IM="; + hash = "sha256-XYEqC+vqB8dHGxDZQnyYEG2FgxfOakXB0u0OrIwsf0k="; }; nativeBuildInputs = [ From e2afbd7a5d58c3b9bdad52aa3b19f82af6d00dcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Oct 2025 23:47:05 +0000 Subject: [PATCH 1747/2279] sabnzbd: 4.5.3 -> 4.5.5 --- pkgs/by-name/sa/sabnzbd/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 8a1f9720cd3f..a2b0b35dd538 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -45,6 +45,7 @@ let pysocks python-dateutil pytz + rarfile rebulk # sabnzbd requires a specific version of sabctools (sabctools.overridePythonAttrs (old: { @@ -72,14 +73,14 @@ let ]; in stdenv.mkDerivation rec { - version = "4.5.3"; + version = "4.5.5"; pname = "sabnzbd"; src = fetchFromGitHub { owner = "sabnzbd"; repo = "sabnzbd"; rev = version; - hash = "sha256-RFvWk+K/5gXMSO4jPOxkl7f+tnMvz+0u4NWPTUEv4dg="; + hash = "sha256-XEWMy+Ph47neyQubehegcOxucClB1Z9t1QDLN7FrxaY="; }; nativeBuildInputs = [ makeWrapper ]; From 6557f662943a6f0039878dd68fd9805392c9bdd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 16:55:25 +0000 Subject: [PATCH 1748/2279] python3Packages.apscheduler: 3.11.0 -> 3.11.1 --- pkgs/development/python-modules/apscheduler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index 028df647f83a..f11fe2e37d8e 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.11.0"; + version = "3.11.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "apscheduler"; tag = version; - hash = "sha256-tFEm9yXf8CqcipSYtM7JM6WQ5Qm0YtgWhZvZOBAzy+w="; + hash = "sha256-3KSW1RdiUXlDTr30Wrc8fYb4rRnlOn6lVhBgz3r1D/4="; }; postPatch = '' From 795f9c30c577bb5d1ea70e0f3bc362b3cbbd117f Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 8 Nov 2025 17:56:44 +0100 Subject: [PATCH 1749/2279] la-capitaine-icon-theme: fix dangling symlinks --- pkgs/data/icons/la-capitaine-icon-theme/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix index 05d115b2be91..bf0df6858f0c 100644 --- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix +++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "keeferrourke"; repo = "la-capitaine-icon-theme"; - rev = "v${version}"; - sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs"; + tag = "v${version}"; + hash = "sha256-+n+GN5sCcWTyAigtgyudliOTulP7ECoOCYdm01trokU="; }; propagatedBuildInputs = [ @@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation rec { mkdir -p $out/share/icons/$pname cp -a * $out/share/icons/$pname rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md} + cp "$out/share/icons/$pname/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/$pname/apps/scalable/" runHook postInstall ''; From f2f501c50ceabfb676b32dc5842d55edb6d75d22 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 8 Nov 2025 12:12:16 -0500 Subject: [PATCH 1750/2279] zfs_2_2: remove Will likely go out of support during 25.11 as zfs-2.4.0-rc3 is already out --- nixos/tests/zfs.nix | 5 ----- pkgs/os-specific/linux/zfs/2_2.nix | 33 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/linux-kernels.nix | 4 ---- 5 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/os-specific/linux/zfs/2_2.nix diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 470d256ba515..0f0f40e00020 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -204,11 +204,6 @@ let in { - series_2_2 = makeZfsTest { - zfsPackage = pkgs.zfs_2_2; - kernelPackages = pkgs.linuxPackages; - }; - series_2_3 = makeZfsTest { zfsPackage = pkgs.zfs_2_3; kernelPackages = pkgs.linuxPackages; diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix deleted file mode 100644 index 487435ca5f48..000000000000 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - callPackage, - lib, - nixosTests, - stdenv, - ... -}@args: - -callPackage ./generic.nix args { - # You have to ensure that in `pkgs/top-level/linux-kernels.nix` - # this attribute is the correct one for this package. - kernelModuleAttribute = "zfs_2_2"; - - kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.15"; - - # this package should point to the latest release. - version = "2.2.8"; - - tests = { - inherit (nixosTests.zfs) series_2_2; - } - // lib.optionalAttrs stdenv.isx86_64 { - inherit (nixosTests.zfs) installer; - }; - - maintainers = with lib.maintainers; [ - adamcstephens - amarshall - ]; - - hash = "sha256-ZYgC8L4iI9ewaC7rkMFSRAKeTWr72N5aRP98VLL4oqo="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61b6b6f12bdd..fd31fabdc97f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1651,6 +1651,7 @@ mapAliases { zeroadPackages.zeroad-data = throw "'zeroadPackages.zeroad-data' has been renamed to/replaced by 'zeroad-data'"; # Converted to throw 2025-10-27 zeroadPackages.zeroad-unwrapped = throw "'zeroadPackages.zeroad-unwrapped' has been renamed to/replaced by 'zeroad-unwrapped'"; # Converted to throw 2025-10-27 zeromq4 = throw "'zeromq4' has been renamed to/replaced by 'zeromq'"; # Converted to throw 2025-10-27 + zfs_2_2 = throw "'zfs_2_2' has been removed, upgrade to a newer version instead"; # Added 2025-11-08 zfsStable = throw "'zfsStable' has been renamed to/replaced by 'zfs'"; # Converted to throw 2025-10-27 zfsUnstable = throw "'zfsUnstable' has been renamed to/replaced by 'zfs_unstable'"; # Converted to throw 2025-10-27 zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e075871330c..6e60e4329f24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10342,9 +10342,6 @@ with pkgs; inherit ({ - zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { - configFile = "user"; - }; zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { configFile = "user"; }; @@ -10352,7 +10349,6 @@ with pkgs; configFile = "user"; }; }) - zfs_2_2 zfs_2_3 zfs_unstable ; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5b649e3be8ae..121f344a22b1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -656,10 +656,6 @@ in zenpower = callPackage ../os-specific/linux/zenpower { }; - zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { - configFile = "kernel"; - inherit pkgs kernel; - }; zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { configFile = "kernel"; inherit pkgs kernel; From 92fe9345e507bfe47e7ed59237784fa1c1f43bd3 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Sat, 8 Nov 2025 17:20:29 +0000 Subject: [PATCH 1751/2279] tests.fetchtorrent: store torrent file locally Avoid being unnecessarily dependent on webtorrent.io being available. --- .../fetchtorrent/test-sintel.torrent | Bin 0 -> 20792 bytes pkgs/build-support/fetchtorrent/tests.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 pkgs/build-support/fetchtorrent/test-sintel.torrent diff --git a/pkgs/build-support/fetchtorrent/test-sintel.torrent b/pkgs/build-support/fetchtorrent/test-sintel.torrent new file mode 100644 index 0000000000000000000000000000000000000000..c3775deb9e2bba4d38805d99bf995fa1168505ca GIT binary patch literal 20792 zcmYeXuu9C!%P-AKPBk&GDorV{($_C3N=(j9Ez-+LO-;^7Eh^S6NGwWB$t+IQ%P&f| zGP5+ZG&F|m(#^>%F3HIuL33)3u?d<@$@v8ZsYS)5MQN!;dL`LlJ5qCujnS0l7o_Ha z9ajW)iJ`Hvd1{UkOjT+{K~8>3Cc>4eImU))CZy&TWEQ3BW)IB@Ks}N(w+0Bbk<&Z)a#=m0XmXSdyBekW@*W4r7Rp%=|osl*E$M zOhXe(14~0QGh_2q3#-(;(PhoYdl+6f>)w)V%bP zj7&o_Q=?Q9tAfOmj2uH_tKiJMlGGf%lvKUqqLS29Bz2~SCYb6{^Dxz!VpCU)q0Y?E z0@J*-A`Eq=CT5uGGD|Sj8Ce>c7@8w_#sKD-+yWC+pBS5CnwXb^VWO!q7MlyOs53Rh zG_L@|g+>O3Sj;ObMYq?)%+SyjZlHlxL4I*bYLQ-6L3(Oxs)6StwYaYR>DaC0d18mGlIgpd68r3==k3})E&E`dp-si-$kUF$ zZ^nF|Wc~B^+#aRXECL_C-9FVa{Vl&k*rkotk17}@UolC%5h^kmYzqgh>I9GgpV?e3MBaJD^ss{6a-Q@b3`>oM-<2>)c(iI_`M}IGCbCB2X z^;Fw&YUS*x&%7tst=AMYouvM8qixjZ8U80%FS+~EXV2>iKRyPfFa-ZsS;O)CWuuzt zuDGh;1>5VVIBzTbzT(*5?>RojZ^T`f=&~+idtkh1TAjisWo;)hS<5)D zb%x23Ta%+82XF0VF@>U0wLd(G!h<&2)R>0c%< zU2-;O#dJ2Mu&TRfo}AtC#{JNvtJS~jyKZlpEo1Ft(SPbJ9uu>lN;~Sz98u6nqxuzl%MReQCn<7x6jVx|+? zE}Z+c;h(#)&mzfX_wWBL`)$P}u;)_C;fC`c=9D{D%w{=L74PZEr5$Qy@O=5XT_%&$ zejVQ~)^p|Iu|KBwI_JwAa!+IN?dX>|80&kKf5EFu8Vwr))ylv9t>X8%`ud1bEaTZP zZQS2|Blh>U-Q?dCt>F-_bEci|tLky<=Z$+Z&*XlTH5UtiAHiSr{Xu2qC-2F%EBLA> zUA?wuPWF``hbD!yEK6sd+cs@&y`kmwy8@v)lP*`q*@gT3KkR>J!u8OF+Vj4v$s11o zT_2|#_w%{)Qz@|?<1@1w*X^G=wPy9qBL{m<^h$2r-+S+j!QqK}ANaj}k){7DCO|2# z(m3+_&hKxsclLhQo?QMwYOh6%L>T*8jZ@q&EtOOrSTfu!ozTp3+G3VZ*_xS0PS&hU ztE!p#py_y)ZF`r-q}}R?%vRA-ncf?kZ}BKK{VuyI?fQ~ehU4?RYRPXK=EU>l9kP1w z>1o{&wb*JmFGEy<=ElwyN)P9DJ8h7wkjZ#9->y8x{d0eNbf6l?-CB#ufW?xSS3fyV0^S_;Sq)=hYMtgfp2^H~68yXmEW-S&v#{B#v zHFJjEr_j~A!P)~E)r z-zFpWX?~hbS%c>K_T)(p8C)@Y*G!wEEL~71@OjF_ycAa1qPtq2|8{=uPyg>N)NN-j z(*MDwMxs4<_VZ(xt*5-b*50Y{#niwiX9EAy#`Nh9YaPy=TF;+)Q9R(ocl~@vdwU)q z4Lj%5LU#UE#_kB`_8*%>%CbYw9}H~S?0EDwyG)V0-?Jy*rlhWlWv+ankn;aRjN`;) ziCvP{KfX!-|K`x5t*2t8&;HxgP}!Vn^XRt25wGyYu4lR87iH87?~I5vHNSqwO>hn>;CyI^-j~g!K7xq zf2ZM;%596?Hg65@*O6D6D^ck#WzzrT*N@7kx2A_*-AORrUA#L}u>J830pV#Ew8bqx z@Lg5(x^}qv_Z5|nJ)tF9&8b3s8I6lCz2aHvtZMFC`lId?gYZeKrpl*mryI6DXj$m^ z^zu{T%6*?-22R~5SD&@Gxy`ZeNZR|Vf3j`n)Akk2?m28>Dj8uCbf{F;e}6ZpiAt=1PKvQ*73k9}m9a%ubXhzGF? zG`~C&n0#@4+03Iix-QSwj@-%X@cIAI53=h|+I2S_`{}>EgyT=YkE-m~-Cwo}n#FC5 z5|3d2_wZx0=>20G3(9s>{&}D;bRlH? zZwsy|<%b=_)^CqI6ndkYVj&)*ZY0PfJYo z_51sT`Af<7>oyzpqj=0q|CxP~vz2-+-T!sL+zaw-Cw^{v-z_7`R$;Ey+0Zhbp)FZ> z)qZjBq~)FhA~z1*3d~n$w%>Njuc*VcIWtFM?&eRk&v_qqw_N*B@8!{xr7G24??Y7s zgJl9NX9Q#{c7G>ft-T~?^3zY5ErEGrQw4LT%x~{HR_*fYik%Hlz~i3X?^5pXetqe* zgRp-=w)XNTjyg+YHM6}wU5K+SpBr+*rh4nF)|}=wpQc+C8`XR+{j~3Y@@31@-`9(! zbvsYhy78s&^P4X?4;sg<_s0 z9QYD#U6DPF-RiaJq1?AS6u(5d^Zwoz=ewjv_Ab-c`X;~qy;{1TnV#K>Q~dFRFHG;C zv1-ltw*?CpWD7sa&-G!Px!xhMXrJ#o!4m75-Q6dDSk0HKa^oxX-7uG5-+GqTP9OcP zsWUGRvJEddGFD}TLx#^jfbaNtC@X>j5Hr-k0bXZ`f*sacMOEM$! zC#M@+yt7qYH00?Me$60(W2WLNFYP1d_J3Zm7M#3sP$Z{(&y#xtG9Kkdgi~~>Xfc%H9g;XLdJ8pY3Hmqe4Nts_tB3% ze;ivpbbf!nllwB=cfD`QUA4qqQDe!I=`(ICi(Xu#{LL`*`^W1JeZ2?Poj7;9Dd_k= z_g#nMx^`v=*7vd%bNs0NDr~Ttd*0G?C%2Q_6AaEyG}_Q2e8FB&?Wu8!ZCv83J&cU1 zY4ycCPAQeIFHZMXoNc~GWc@5*tDJ<7S6JImpnvw9?cvcO zZ{n*K9%cS>xJ$++KmMFh0PE*%@)b+j5567l`P{Q|W zt$BPjM@LBPyuyi}1pYnNNZR$}$hSFGtK(U;v^)<*C;oO`$b6tRUrO_35Ff{P-p+%M z)MB$=xCdK?b#)1Ee#BOMJ;iIOzynV)Kh59Xp65)scYfP1_i|S5+^pa6s&!G!qE9(5 z?u~4y`7ibD_Zr0@@f?|7>Q8^^{Y&Vd?)324(TxRfGz7E1m;ROiIPFTzOii`F^LROz zt$oM%)WpcAIyK0h&280gmoqKptDkB1uxg7ezxC$i%)PDqIN86y;0OqI^z*-9HZ58{ z`}EK28=e(DRQ(^G^YxtBq6+@MlYZaPo_3_cpw{Nhtexj}z2pjalj1VJpZvn)9&g3} z>t|)Uq!*XE6i>VPdD)5P_{EbBrfsW=I>wW^_>$1$_nNIX!t$a!g1+BarX5z*d-<$b zNk(36ZgR->VD$&lRWpxF{`V!eRm^VjQrUYmZbxfs^d^Mq-M-6LD9U7hds2b=3@zX5 z4)RLhB0r0NI@|CiJT_rtRhoD3jH^96J^L#}k8vD(QD$__^LV|#Rm=a@MbSTAU!PZI z)_0UwbY{5kLD%LZZLjo$Ro^a@&hG8EkvsSDec;}vn`OKOyLohuv8V6uSbbXJz4Po( z0-Mfx?Yne&!m9P1DTk8}Z!11Av-HJ+!pGKnjr*Eh%g&{J-FPsC*Yv#j&5r`R_CJ5t zba36v{kwl_KYFX+FlqXtm&Ota-}k<(x-y@I@uFm|UX-x-o~xqM7hU+kcwnBu;$=b# z`&fQA+v%Ox6KYd6<%)9G`tVB1>S$nf2($8^HWsPfr>D ztrFin?R#9sW-lEl>|<7Q$is1J_HPC|Wv0WI+Jg2Q%$5snD|}`qA#&qVU1s?D`$jB$ z&Ylxy2_L#S>xFFn{_GFWSsZh(DsR_V*uVSx(NjFh6%#J~e4CQJ?#x=FtUS}kaJ@!P zzSrw7v-0|SeqTB7+9`)Qk7_;44!=_n*p>ROszy9|Me22N$=VIGVwTJ6+MMS2@?C`=rof_v}{IB#3cxId6Egdcp^Mz4WUw+H! zD>HpUi)TbX?_bcR^K-GN#w)Qi;X5w({`55Dp1kDYMy;kdr>AQ_lDbxQa?vDS?@rfS zpO36sbkp!fXy1z;((5x`I^WNzDqUT#W~lxpDbeHp$F~c9Z=Snac<<(|1>6^$v{vYE zw|O{aAIH?p)MpkuGfvKJ>(I!5H9bA@=DMuU$~?(B;e=I?=8z>Z$QI7doIsPuWs;NHg(=H36)Js ze;H4<$fkPf3!DnLyEISEW2S#H-_?EFzBueX`nMvnKY5=0!BFj4m)X=V+&oj%)Azx?;P0eP%}q;k%xHZvN5IspMlgp;&qAc)_n}ZHrZ( z{_+>{gBikh-|U%zTQX>9m9c3xhi z=2NjBTJ3i(-*pbn+>zT?C8X!IWMk&u-M`l*>^jUfRchBSD~~r^^Yw0c8EoL+D6ZFa zYu}2uk5a7DfBrTRdwB8G-<*YKmEL$>I5Bg6hQh0_GmHu=_A6_t-}rlOz2{xm+ZJoJ z8`r$d{c>qFx8V26;Nw4CeXd+*S5UfOt!#Mg>$#XH+n@I?T%LQX!|B=C$)6$%QeD^B ztYz36x8`Vp>h);xv_~7P8jJgrigwx@-Zg*yjJU@6)2D9Qu+q7A`p)yJ%jP`$WWV>L z)56a43el6f`ro_1QK)$;o5gXmt3Ycf%cEGn%}-Q&YSq&1%8#x}zv3vQvD~#|({^9W zi|79yI41t0!tZ#0-Lsl$ceNake{7YooPFnG;-k&MDGpD9KQ=j~bVtO7J;&B&9KBPTqRCxWJ30Lr>$|hpzcIYn_viAL^eJ}h zTB~ngVbZkpzOl-WSAoTO$~Dy(UsK6gvrGXVK#WxRGC+2@h-M++hV)G)texcZ` zXy^EUmql4OsH}C|_-axhcgh=9dOP|TQxVdTsiUY);Z6wzB{xorfaQdVRQQPCAM0|M+~j1cU0I;4)d2jqadB1;bT`( zk+fJ)}4-DE2 zE1szEee<4pb^3jldFu}Zhi^LIA$alYhO7POTtA&Px14FUe_H7#cSwXcWF<2d%{a&t|ROqiR%)RQ3+Tld!=fBA4GgQiDjhv>Ht;n%OeJoY-N!Qif?ZgO*weh#p<)yrg?|T4$oY~AE5FwOIklu=Xpd=)uqmD?$@3^SND6c zZ-L6THC#!*mbXp&z^v?hIC6L6q2$KK=W16zhsRyWoL_VD`S110w~S4MOInSXgAP}7 zxvRR&*bw$M;X{8r&#m{pZeMuh)~HA95-u%!IsMve-bF%E*&FAY`v$JM9KCV=f9F@s zR=;buXv-=twR98p+9~9_XX?W%wO!`_rCGjhOl6;#$>A&CJT zzFXr!>y7XwTUIn}WXUp^HMch9uT%Avy`h)x-ErLbI=5k4X^!Kbwa;zBvyZRmyFD|Z zQsMROdBV#55mI}?3-pZEY@NH%>uE{bG@HHiR&HaTIpLe^VV=qNZZiH~9xyjpAY1*; z@-P23Et3BAHqYnro!udBX1sUpeohF^d(3+;XD!FxKB0w~jl$>F`iOYN@oqUdHS}(a zXx5U26J(kUh~>?^DKGeTs&0OmwaBbM!$K5j46Nh#USk}z60X6U*GUwIIFic|2TK#|D%b& zC7!Mljr7-x=r3s5H(mbWtBL9g>ZSEdUS%x&+IYSAP@ek#P5&+89j<=3!7@|x(}mVO zxAh-PRtv8Cyd==4>iY9Zt-lIi$i8@f>fp3DAKO|NG+gGm`zv@Z-@4nsEc`=%RGi%N zR@|`iNz+Ac&vVE3{aP!iq%nne?~i9jTh}sPxe(0AZDMUE6=2paF0eQB(!PI}Q@Og` zeA$Ck1-HkStvKj?!65Or@sz#X#WWO;Jwdn2@lEk>ql9&HPp@bdRI7UnA|c{%;>w+vI(q_o6d;T`ICoxlOo7nOtv7c5L9z1<|L*^r!m&@iE z3ax&%E_0si%pIQ?z`1$4=+j~L|&j}U#5O}wKVd$mh zTU2~HJbFZ5*W7wrkl+fQ@;Tv5!RJmEGI*V(r(-cE53n$XL7 z$F^{HyOhE-{Rz6w;hND~58Vs9cxG?hJTHyLaLXKXZJQUy~4< z^IpKuJ#6dZIS(%%|MqT2GwVF}a<@PoF+PKJ4aZI11k^=o-+`Jn^TW3)aqdezvr)x_vA^l>x{O1dowk`QrypEAcmG2w0a&9(X?0oFGE1|!Re~FJ*&`#O; zvB!dKgcfk$H;`Iydeok~cE_uDNow zYvqZT$^940r9aI+=6LP=souSl*YEqW>wMe^W~TXwaD_lWVX@V znfoT^*8SD0)*mLs9NwkBdy4$-$5Kxi6U{!Hw=SuEU?^Kraaj6dZ-C~)?b6+Uemg&7 zx@3B|?)!#Io=m$Zar&sek#ESmo|0qgdLXza=l*2D6Cd9_`p$W2PR~s*g$eRO4ZTx$ z&b6NJwEn`~uY8MFh<@PPZMSFr;u~GNy7&Aja-KBlRb6hX2768yPr>_3bIRp1pV{wz z|Ka$@UDJNv;5athf$K-plT??~{KY>%&+9VeS6dQ${lq$hsNY);KYQI#(&wG-xb6Upwpq!<5G*!MI()YM{X#Pv3 zONIwLFD+lq5cf**`D~?vdCLN0G?#Vkdypkv-s4xZxpL;LOZg0UpU=eY(7lf`ba}_xk;eSrAa3*XL0^obo`>C*B8SOc}~eCdqiJ-=Q&vPy!U>s@*&+1 zHOIS7D~lhJTF({JdfO-9_Z=0VBPSBfC)vLA(VQ&sUsfaX|9^&@m49rGu9mCo?D+O^ zkxS?D_KtnG?6Y`mePd_(y!8ID_~!RpQ~l=Oy|8Ki{J&cd9*e2}^m#`8vj1Dy{-u3+ zCLFzDo!;R%lkU6mT{*LqGY`6#sWconT>mNNyp#85E_UY31WUu&MM=W0N9XUGRUEYc z=HHO8kCPjMFWQAieY>-g`$g+!rJJwVbzc5Td_TRlHu6yL_JchaHYze|{xRNF-@D5* z=~k4^={E5#?ps;C*B5IqVCB0f#Wr`r!r0`_q<}>!H|9vITa364JyR$3wSM(>%*AthpO{v|{%;s}HJisj7_PCMcjmjxI ze>ir|+IpZ*QU9XC)x-w3_#Thv?a@MKcQeJ+9W-NF@%`tCpRcQbCRRUMX%Z+L%iC9Y z-RhOk%9IfE-$hOve;1~y8hS9+^Rzt(^8zJ3#7OE3wiZy zU7xk?TwF-UxATXuE!#~thB-z~|jU&!uH zH;t^9?DDm`zT*CZW~Xz4&UdeJWqNHZK0jG^6@SQD?yQZLiT3yESr2Yq$y--l*Hx%$ z>2Rd*wfR- zZX?d%?yr4*P1pO(toX&s;-+3?s+=o-^OWqu`7{wu_mtb4xkY0(bnMTX7Co82VaDw`#wj^R*IO!{oo?Bg7`Noe z&N&yAY8wlE|CP<*U!8WKGd4%zMf&VRTWqbv6(?u#{n1a!4LdLG6Tf1ANXcoLaE{A& zPCxk*96H(ham?A;$6p@Jlhd5VcgrSszNAF_n|CgcY$kZIZeVriZI8KMr_b#>Au-*P zyTE+K8m4_R8_jM9x%I4M)Ia+yeZ#x>a*;~ii1u@?r;lr?Idt5q;k&HPF#nP1)5-{s zTb9fDPB80Q-%rdn2wv~%+V8w?mf0NRzB=tM8;VN%z65YYt@KzGw&Bye z=dUEr-8&^Ua7lglJ#M}Q_H$xqig#KytMPO5^-NT+Q0>23@%59;TWbyu?~-}3(k3gc za<66oJ!rpo!q=X7$Hz~-;vvu_-?sjm(-NEbf%`Dz!xli!M) zX4BXB8Xb7S{P$b;=c@RmPjh^2cSc_N_`=KWvj^XImi_PZrmxtdkok>i(*`TWshSHK zeu-`8*u}lZw!24<#a{i*N8!22=L;8xg@5tN$VXS z$3}m-tO5p+b8VfK0sasE=9+g%UWs@ zTDJIh)BLTsi=(7lWO=gJWiHrw>$A<#KhK-oJ9>izlUk*srF{ItIU?_CrK+W}${4s` z)y!>9uvbyr<)I^SgjHu6fBXMU3zmIKyy7pCW;FA)!s$Ks_A&)RGeYA%GQ`}&tofoF zYTNccdVKei>U2Ltb0giEm1o{=n;LNBw9yw2f8i~?VS2mjyEj@CykxI@^2B1s!wPS` zl?rouE;LU2_~6gGk28*~{Fzl!W@FBjvf$^luT!Ri<*E%}gty#Kmp}x&qrM}{Z z`$so#lzrY>==|P}HMUrC-K@K+*^vgC_tS#c-&plf6Xm4-qhF~zV2JfhL&yBN>at!S>CB>e^*u6`g@B+*C~w!V%b7**Pcxf z_j6k*C~LDZb+2Lqi@X=Zlo{ML=TiEQSEkxaNnU>+B{=`htaJMl56#N0JS3dFbd__* z3n}JsPS0~OdmX1cy7l;fZCT52tR*3HK*07!=ZB4cvKe1XZhA!fOX@rjaVyZe@lyEK z^Nse7U*>a%gw(dWl|^6v%`Rzv?t}f~?=e5;3VaY_vYGqlJ*x?ClHiM+Yg1=3i@IN_ z<(+qNaiE@#PD=HK=Nh4rXN1Mp#C+Sde5v#ot|O&U8>X|Q3$(j*KbxO~rt#KNJ-YLJ%H@7#c1GznTTcDFR;4VbTS z_627gW4u=HRXBG>V2|%qUdtCdYCAO&Bi=i9cm7nnB-OuoN$;Y_R_m4{G8fiQ5twE; zLC!HXzNyBLt$5G1sQFVS3%=#4k6yR`uCb_q;ZyNz+it7IyxhA$`D3=n>F)~XHDxvz z+~2o$Nzkc-y&k!@&uH>g8Cs?9{&h=A`o!(ss!EoR9vG&*y?gV1&ds=k8z;-EUVO2e zr)>I(M^bTHH2y7#<*$GEPf=N@+1FrO{8VX%%iLz{kFT;s%+PSUwKe)BkC@=om;Bc^ zd$b!pn3&Ul{b^#k{pFah2Q$y^56g+qKeoE`U#v)JZhrc$d9|OP-EXM&5_4HQPfAS8 zVv3uMR?wU)MoT_g{?7k-{=?SJT>%2C=boL?>U{eCRA)7&h#L)^%Vv06Ycic!E&0>N zuv#Ng=!2C^WK2rYrAe*L-l76_x6iiCUv&S?)&HiVHNL;nH7=B`T5x-flA@f& z$Iks{I1KNe-eWVb@^-+Snmxy|y=LAlH`t#pAh9o~LQqWc3A2r1?oy#GA@|aJSt~Eb z-tfCv_3LcgLCc6+LMdO~&C;(3bo{N(rX6!3`L(Iyafc5%B^u5>tXk{qm&6wjx6fTSd}tkopi6y?YoiR3$AD0nbvA#C?WLL-|W3t_)M|W zcRGZe{x{WZ{5K=w`;Xh={v0=-rS3fVLfCB9+?h=;UhZ%?qU*O`&+y>J(>Iotc}7my zlU({;>0wY(vR#UM{e`C!vwv%U6N|d}IAde&B=sK!)$Clxo?5dHyjyo8B~o%%=&G}i zN)7DiE}gY*)%9{U^NQbMDg58OlsJ3mH@xNG+i~^Crz3t9w+`k!S~1z__X;UybzAk) zq}@+%xd}<7)pPm8z4;aTX0K^NMT5i=+J za=e$pOD5M7wNc3vSZAH>Snt;NpQ~Zf`n+Y=c0^72?D_0WX!+NLexI)7%srpn{BRk& zb!TvVsHNe1wZ|{cZ2P#x;Bz5g+pqT@f_AJ@(W==J_WJd*#Qjc>6P}#rX>sO$o+o_d z&#kQ@d)yywEmOcK?<9#qm5)2J{0A1k7$!_pW~PHfs$j57h;mO<1zDv(72Jd0pwK z&8FIWMyw&-Yiro#g`ZE=J-OjrE2_K2qv6%@jQpM@TXW9*_+|XZ`TS93g*RDt7pnhU zoN(}xRAz~YQ%&+w+YKTsa}+|pZr^04DW4|x`q{Tz*EDu^GxbHU5m&r;L9k|aU8R_n zqol`sZ9xkU>kr4Y64a+mIwcp^=3KF$;)0Owg}HA&vUYYQEi=a=m} z>i<->to`?{m&^}#yu48rEFrnf!T63lpYOgC#}4pDUwgIDYun)yt5{En7k})5j#*uQD1Z1C(_x+1f6 zLR3A&^(z}gUO%;(yxyhvi$I3M5#^}TI}cxOva8+pMMT}PafT|(miIgw$@AD|r!+W6 zsy^YLB{bRMlr7hRXN8NB1KdmHU;U{(``z){hjk8bInY03+jXz3f4PmzZ5>Ka(#BL(!CNx|7OHc7MuMy82{J(Ji6Sq|YA}UUx5H&^75{Tx|QuM9FtS(zBXN z*SVymCU<)MVe(g>@TL7C|Fp>MEKlqw9-L_HQhsfTT%g34?%RC7rm#-Eydp)3hoP=V z@c$)VQ>#5kZ;P+adh)&@Wy5_T6Ww{m-;%mRwz%$NKjyId;=h#WcQQ4hwgP9&SO341 zy0P*1-|Y5X`;6!LUz2Zc>9V+W(@%7!)9GL@f3v$iuEqw_OPFRKI_;-A;ob2Er~dF} z9C|)aW6LAm33|_*@BcpcO?SrC?!=o%O_D38UiVliIze{H1K<8gaXF_D%cfHnXICvf zDOg#-YtTOFPxO~lO$j);+2U%s=fcZg&G0H~ z)v1Zuy3JNIe#=>k32+v&e>G-#>bK2ut7hnY&;G)dadMf@xjqXW-r?VHuP-(!MczO( z;=$K9HO+TUX}C{y)pwIVb0gZ%_WqsIjSM;-Q#5K<85rAFe0jX!Tte=|L+5#R1@*q> zQVd9bVZ~9r*KlhmUkvlrGb?=?xALwmFyVi2G4RO?*NIaLt^1!gCEZ<_uA*YA{>QxR z{F-xZ>)!M4oMJKY+2egLdNTiWSbN=)YF?H1wooELHC#9PDdV?%)=w#Zl5UAP{+D}w z3-_(FxYz%7TWio%*~fpQy#Fn@xwW0kjLmH0uK3QaQk#xUVzLvPd3)O=Wwqubi~+oB zzJ7VJa=O3B3A6giH*4<9@;-FhXtiJc>EkYWM~r_3%=|X_&YK2q*%eXW9XryWJn`ID zs+51yICQ^!#^etySv^Vr!nhKA)sKhn{Vce~ugPXruz~ODA0gecFU&n`uW#`=?YGh< zu;Gl#GsBFSLpJ$F>mODjtL%m{Q^Pxb#==uRO{3i|$UoVO|v$ zvQ=%L&zh&!hkbvazbj+3=6y@*+pAwXCcBmY?20^5_*$!KC37}1b8kE`O?_>bO3%CFE3SBMd(pJ)jq!==doHNW`2S$ulmG6gVozPx zIs97Fu1M*r;*Mg^)d`PgYDBIU*?72P>F=K$z07()twWmM?007wtFSwdIS=4%;;k0=mw6$8sns&tdz@n9e%C^4aAN30ca=0uq-jIjZ^o z#-yhV)~Db4sehl|edC0&Pgqvu@V$A(F1z=s=JL~W z`#z7*W&Yrhe<%ffI>zmKNUt7iX{=L7VEZnaoqdsV1r}*;6UE5E2=&2?%&OW+PlwG9g z$U7sokJf#x)t~=f`TuC!l1qnP8BhMSN-mGtcCY8I>Pvf>4wmV^<+}4vAUW#W{|tqm zPV+PMJ||}M_hd0}J!?)+wEy5C_a*$^GAGG30WMopXRcr1TUY+^O2~@f#jj#NH*kvm zDrdPgS?TyuSBdo9f4)AnFESRFi)vximMq*x8qm!4qZoYcM z;<5D14RKCYkv?jrUv+nzy!JSi9I{2jUVQSDzdCb5rnIm$S*<^ylgAi){%^>#zAo$c z{0qNHZxK^fnVS z`caYbuvB7A@#dyOdq4g!UlsEF)V7#ckKSE8ar}~1_Tes-xvK=6R&1#<{@<3&FnL3B zj(5es>4A5;vKMZ4ev+23EJmK)>`{)@K_knpDhciH0=;-*H=g6UWwh@@!Q5{yLBl5l@dWBuz`4{>1v$y7ik1Ke1Qb zeS0vn_MEoujalm52kjOH-*#NQNw)I5VO)#xwlKZ~x2ds{-!D3LN}P2|v{p<)^>pr& zm)hSp=ucZXFRNwITh8B$w>TWUIc4*`t+9GaYyaraJYQeBMcD0btI%G%MgONU@aKtZ zYjHg6v%eME$6FnDw`azWcfBtcepY2KuJAbY__ZX%u?LmB%qh3(&z~)h6l%*d`M|=R ze4_OKt;+r9{YqM#!(KjVR2RSGFUL|>N^G{apwMJ}PbJyIfEBM6bn^Ej@Z1L913?FS0cWXD@ zj9VLfg?DOEMA-U3=hx*ojei@y+$Y4T_V&raUiO2nu?rgym)!sK<-o&3?fdgKMV&j+ zA^h5oLu0-e_$wYf_{wP2XF+mnnH z^6cw(wRTu0Mm+g7_5U$@jcXA*SAAH*v#c)D@WsXL9g^#RExY=!|A6t?iPu*Dd%OA3 zjBDI??^lK#Gtjk-7nC-Ad3b@^W4V{dMc+6_$v*aP%vrU>v%@^h>6HJgpx0GX86Umx zVfw+DJ4Z^uGBfi%n?;v{g21ddyG$=mPP38bZE#n6bokNoos%v#{g@@aqk3hYJey9j z$kOjj)}iaJzDld~6MT0!ILRh(#~Jk^4e>dL&Z(Idt~C~`_EU_LT=bPOlS5$9uL|jt zO5ZOmvuJTI?hajB~0|>AN(u{ZtPqe%t1Kvw6z7 z)RoOgGfJ+OG|kzzzF~6OKe=Cv7R#64&)1w|67+Z#-`nto%GL!r*^8>ZHmqAcCr|a@ z+waqp?Kdso5F#9zlYe=8@B4zCGxQg{bFQ3wMci!r40d+Cbg|w3rVnTK9(`$~e|p}u zca87)x%aIMS==-&Kz;dNmRI{s>a|mvFQ3ucZ^c{oPHA(*|0l0p7ED|ksAOKwE@^OS z+wc9a_(f#yYOhU5ZVr5LmZM7Uz;7>x=;a50Bo}|WVX9phTX(8*{?5m zpSf4GF~X|nfc~$G%o&=$g;)GuXOpp{`dXLh97B(;DbEf{X&W2fidn+9C^R_DFSlr$ zLxRi%r#sdUmaomz?A_%wTW!awdz)0RGL}!Dv*4wc@@)2}*FMzbvpuYt6Q!_$&B?Li z)k2|z#nb9j&dXKjX0}cERv$Lo>-EXb%bUNwT09{>N%XXAX|I;lhQi!wlVaZn)fDIz zO6;&-R(2%U$82J-OzMP5W*PI&*etR-HOE$UAK#1%a|JRdn)qM)_eHn#DEH&X6}!Hf zthms2=Gm`V&vpORx_#HS=XuJ)<(+B%rDCP|-OuWw4{iRgn(q^kz!zKM`+5rh6zSF; z>uaao9?j9>l)WOP`hJc0#A~k-ySFSV&J7nxj-Sdhc?QdL)=T?+Ir{E3s5{j&h(u+V zN!gw~9jBRe`RQYm8*%Yc3q!uUX|v8c9Wmp6VXeXubN5o+@MYTfFL6(u+wSZg1tq|RRdcHYc=TccHswwT{dH03`pzp%#qWTU4>J|p)#Uf&x&KhJCa@H#E^ zG_d)_f=72eayG0N{}y=UZq*0b)tOtK|5WZ=v*W{;&2qA_sb5Xlo;#FvGcTFUcK^~b zVc!qMlCIAmx2Ul-a8IB4^6tko347N0e`-=Zen*30ZOS%%+ntBsoRm5syqb6Nj6-}X za#QpIh0ne@YWRDNS4aIkTOE#b%62v8?nllsP8547zG-^%rj1^XFHGF#$qI)q+x35b zb>U&D$Ze%`_C=*I4||iK3CRtz29#18L)RUUp%<}gM9R!te%_OtFOi~ z1kDv*ed^4aTS8Ms7?>_3T6}rU&pWXp;(Wk{4;H_aJ~((~SWkV}D7xiROz}OPnSbX8 zIj(s>cQLpB)km4%ChywOS$yMgH>3S0`Qum9uG&boJvCBrs{VJx>^1inr&EGAG=CsQ2cRYD{xT4MPeToFjhttlR ztX-Guv6v?{-;0$#K5fxGtw*1iUTfV|*;jFWmeb+M=I)zQFBL3gd=zNu(r{Pu(Z%<@ z=O$Khw;!Kd*TiL0u|K);KcfU&vnwxiSvRb=eVLKb=HJ2-gToAm%Yq(MFN zJHe|qH%uLGHY`%=SYjU_*&lJ(=1f^o=<(tu&M6EZkI#LszFy_m=`h2a!OBqv23o#+ ze^-BEFi$<5P@6vjb+=f60;GqrLOv z*?Vgj++*tB5}7~$@szcp%J;&aCqD>fJ!F1+X0)`dv1#IlM@-D?zdVijG0Xp*l~eZW zpnE4IB7JwSzrAnQ(vO>O)Fj-CXYgXdf3#J1NZ(bDe0)wW^13nrqq1Wx7TY$&GSA;v4t-Q^9&GL%G|oMT_OH* zeAV6eZ8K)Z)UH2evbQ(!^}be};P$ug+i$n;VW^iA;n)_>qf)%}>;6(VPdi4d-^ONa z0=v7;2|X<^m)+Z0B*Rwr^xzZ~hwEQ&|1R-5e1W-!)x!C=oa!g9)b;YOWEnX8qSCfG zGENrLIU?Q@a_;q+-s0Oa4C#`^IWHM`ch8x2bu!PZC6OKuH%%7Cq;EYSj+E~A7k>mro6fEkY}RWG4(4OrWqNQYjv!? zu~UAF$BlcTg+HwgW^Fle#p6iCFYYfNnAbYRC9h!j@~GM^Kg;9Z0@=*y-M15Z46j@5 zj0m15=Bx9`_)^ioLhDyYtYX)(iXMJlDivDsMsz`TN2P53nS*(rC-lCB=)X%SwT^MU z6Pzn>F2$sX@ovqrVnuPhZaeTS?y!#@b^gW z^I{LsuM0l(z(62F^wqMnPjptQr_W%RmZ~B1%Yx;npz=2-V+*!+*|Q8QJ})sZyd6AC z>B+hS{^wKI7hA8XJD>3?D8i66^yKN9&itt_)YmYte&N7=c~SlR;;l28L*0_h!=q2d zuly19h}Td&M9bI$KC;Z~cSE|tXuar`p7y>k7^ ztvvTRr)B@)d9+3UYR$HL2eOtL6(}(@JI;T*R_{W~e1;Q#SH2z3J$kf$|C1{#yLVeU zl*nam3XYj1Svg0iaoORs0U6KR__~-Tez?*7>fUpa%ph}BjXmBR4PsI29kXvd>)ag0 zwPoEEmjB&tS8M|lC#V)rSoOQ3y#6Mmzg*|5Guvmhu9?5GG)K1d&v%2Y`I?(%&-y4~tdn+jy&NltfL+bh-3K;WxjPDSJ$rq3=UjJp zE3WXiFrC#WOg8XpFL<}?`qUdhPyPoV$L_uEGQ z3-_v-Oi7D4^6%dT*@*N16EEy$y+2QRfA7XCeJpSEJeTfm3F$Q!bv==EE2X(q+JE;; zzsRoJ3QTi<&*`7s%>C86Qr)`7cguP{zJ`a9YQIHvV|WC4vw!g3lel_i&2xKxwY3qq z#DXn$|GM)kNBzyER*k|n6Bd|vSHIilI&;#RGhcQeO>YcGt14o%cv@zk;J``Tdr=iM{)Jt6Wu#_bz=mL3q;jjs=cU?J|$kZ#XY0J$QJ| z;dG(yb4~WQ`m=ZK`}Q+=&)m&+dD%j(ZPGiPw{d5EV2z6CFnHUg|JNqjov)t-BeQ#^Ul2R%JQ~^^q?zlOCD*)8oWDdW3<+WDP70kCB#Oh zJ)>o}^kL7bi|@`A^mv%k(eb6D;-2R1Sq}ey)<`x9CjArK#h>E#Gwj&~Yb&S8*Z7`T znmQ&=6EqR&a$T*ZenMlD+>V=>`#=;bC}mHs+k<;_=Dk0p0o zE2X|RD0a>~%zWf;yX6qJKeb;CH%3iA?B=dqrk!|jyr7nTe?3~<1o;>IO z8yQ&0U;L6N>!EMV->P)|l^IKQM1&#hnfZp0`AgXY=D#&&EO+16AygG~ zSvE~~>olkNhVDH}&8~3Vms+v1OWW$-k>~QNYmYCg{ULtwir}o(D?)kg-|5`5`0%R4 z;ohl@6XWGO8#@i(94vH?K5lvELCeGFTN92(*y{)`DOQqAI-luVbg2FK)?MG{^;v8& ze5=1}-YdyFwzF^9x4phA@p+y+V@=aPx!;E?%J!ZT*~zh6^=y*=)8q$wHXDWOW~>(1 zEv;G}J0oNEWl7Obt1F*hDm$5=ILEJstwUYH#L`7V)^FX7jf*c^y)Lr2T7Jyu&BU z?-_LD#*1T?8(trou=UiQ53iRrPM%)n9)8VA>`_hptS!c#`bSOHCiuN&Sr)T#Pr|N^ z){WDjEBN5&!8TWRt zs5}+4e%{R|{#g?^n9h_RPP*P$IeA@s|6kU%{d!Act>V6GthvCtiFuORhrbLDI3s88tSeX#e4;-A;j4xi6W^|yL4@9z6(SFa7ZpE@-v+h1);`If4;YV*yf^Q&ej z?6hDnT%D<@+t|GG*s-T=%b(mbvr>z)xNr7nUEYO!Z?|7x?6ud^J+wGDbc3HM+kP4SgE<@i zFBUle?#8P}A)GcLOn>LIS^bi!EdMF`@%_=_E!lfoq>Q9@x;9^&aMM+3f=~D@cTbU? zP5UPBPkS1uEOh6A^Gboo_y6=Zv1swCoW5D{bn=7G<&y%R-_@{P_l{@EisZs&w<8a% zE4MFkTzB~LH?yqvZ=YtalAobnb8v3gFSm87i8g{K-1Fb{rEGrlX~Czy7ddmLcuoI) zr{`tx2Z2|{RW?Y||`drfDpoPvc#~ot1jf-~g|c| za`0Z*d}hiF9mUTNET54j&lN%UOPSd?Jsn+dw$HZIWO&e4m__}G=1Tp z6F0JVe9=B-rQptGQMF-FP5NGEj(2aSq-xIX&icRdWb)Sy_TN3Umsf^(3p#vT?4#Tk zvhu;JJV~YBWeZA8k9TCSy6Yry%>D6OccMb&8;)mh9DX(jO+WqRs><7R#S<-ccA-@( zMDAJ}rm|`W6*{e}KN)+iWoA)wkhavurQZ~9bBl1_v`CWOFRXWecIcN)lP8{EopMZb z>4}T}OOKV5onF87=-s->?s5D2n{WNx_|1Gtphvi*S;ee#t?OPKD|~LSX4ap(`hTB2 zpUW$nH~FyXkBa_9r|!?%w}LU%`jNa8569~bYF84&=Dn?|65tIty;t{nNj=M=Bdw3W z-PLoJ;tu4@sZY{4EV1NIGW%P$Eay#5Co>;zx-h>{Sf+A%NVX++^DSmG~~?zy}*8tmPIo>yE_?-Lm z(R2mF){B=aqOHF!a`7m>ZJha}O@!U!5CdoQY*#x$;s2KJr@#EIy|h2!&HU6AF8Lo< zYesDRr+V~V_RZ*QMvvZZ)6>=u=P!Se)+MIl_Dj~KQ&x9dM)F#hSJl_1yOnKVW^}uA zKVA0Px}@hx;%O^%{8agKex)y58x(wDuC2I&_U%~RkBJwSwn)r<#nuz8)grRgF^Yfs z@j6att-mkD!tF%j@=xtvvQ+HK+b`3L+2CmrN-ShU`UVHDxV&iM|HD{i!fAGYp`i;6?PvW6JN7L$xp8b#D z75&X@$M))#&$QGZ#xH06&QY72ZV!la*lr= z)^!-Xc%2(y)SU1BET?D2cD?lLOXGe8MP2k_v$Q>K|Nq%@(aOwu;b-SuG4`)H_G=I8 zhebO$zV7@R|I|+PFk^M><&U1G*++}Tvb~qf?iIfGQlByYZ+1dc%e(rUKmM$G<^KCW zgVUXg`sZGc=d4H-a^CFL_&9s@{%Ezcr?$v_+ZTFan!;^&7P)8@VKa-C#-C4`^Bg;U zUOt&L;lZKKDPGe}qOY?@JU0`#=grKwaV`JpZSE=7B}=3f0$49q*jnUFU)#v{*Gzq< z`kGftFJYoEIpy6hiJIG~)%PBh{wk{8?3aFQ!xxt?o3~xP&m}*hbK$C*a2x)x zH}B&5ziG7<88Kdp2$MZnnyr&tGWFynt+!LwWo>Jc@BY8)zv5kcfd?}lh?}JwyeMFr zq;>1SXBq7YY_;iGmZs_N?tTrieqnCfyL<8y{>q8h860`naD9>Apc}rR`JPRz#P7YQ zXSZ4}ElgPUfNXFI=9UFnIBxz>PtBZX2-PB UGc-1|!g@5HKJ;L~V*S)q09GjUY5)KL literal 0 HcmV?d00001 diff --git a/pkgs/build-support/fetchtorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index 210a4d3bf9dd..c0ef386e2098 100644 --- a/pkgs/build-support/fetchtorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -32,7 +32,7 @@ let }; # Via https://webtorrent.io/free-torrents - http.url = "https://webtorrent.io/torrents/sintel.torrent"; + http.url = "${./test-sintel.torrent}"; magnet.url = "magnet:?xt=urn:btih:08ada5a7a6183aae1e09d831df6748d566095a10&dn=Sintel&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel.torrent"; # Sintel isn't a massive download, but it's not small. There's also no real From bebb1065ac8c1524b42aeb564f9e0f72593c00c8 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 6 Nov 2025 20:27:47 -0500 Subject: [PATCH 1752/2279] nodePackages.@webassemblyjs/*: repackage or drop wasm-strip has been deprecated and removed by upstream, so drop it. Everything else is repackaged. --- pkgs/by-name/wa/wasm-text-gen/package.nix | 68 +++ pkgs/by-name/wa/wast-refmt/package.nix | 69 +++ pkgs/by-name/we/webassemblyjs-cli/package.nix | 74 +++ .../by-name/we/webassemblyjs-repl/package.nix | 69 +++ pkgs/development/node-packages/aliases.nix | 6 + .../node-packages/main-programs.nix | 5 - .../node-packages/node-packages.json | 5 - .../node-packages/node-packages.nix | 516 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 - 10 files changed, 287 insertions(+), 533 deletions(-) create mode 100644 pkgs/by-name/wa/wasm-text-gen/package.nix create mode 100644 pkgs/by-name/wa/wast-refmt/package.nix create mode 100644 pkgs/by-name/we/webassemblyjs-cli/package.nix create mode 100644 pkgs/by-name/we/webassemblyjs-repl/package.nix diff --git a/pkgs/by-name/wa/wasm-text-gen/package.nix b/pkgs/by-name/wa/wasm-text-gen/package.nix new file mode 100644 index 000000000000..2c93576c9986 --- /dev/null +++ b/pkgs/by-name/wa/wasm-text-gen/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + makeBinaryWrapper, + gcc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "wasm-text-gen"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "xtuc"; + repo = "webassemblyjs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8="; + }; + + postPatch = '' + substituteInPlace packages/**/package.json \ + --replace-warn "1.13.2" "1.14.1" + + patchShebangs scripts/ + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + + preInstall = '' + yarn install --offline --prod --no-bin-links + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/{packages,node_modules} + mkdir $out/bin + mv -t $out/lib/packages packages/** + mv -t $out/lib/node_modules node_modules/** + + makeWrapper ${lib.getExe nodejs} $out/bin/wasmgen \ + --add-flags "$out/lib/packages/wasm-text-gen/lib/cli.js" \ + --set NODE_PATH "$out/lib/node_modules" + runHook postInstall + ''; + + meta = { + description = "Toolbox for WebAssembly"; + homepage = "https://webassembly.js.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "wasmgen"; + }; +}) diff --git a/pkgs/by-name/wa/wast-refmt/package.nix b/pkgs/by-name/wa/wast-refmt/package.nix new file mode 100644 index 000000000000..c0805e922448 --- /dev/null +++ b/pkgs/by-name/wa/wast-refmt/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + makeBinaryWrapper, + gcc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "wast-refmt"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "xtuc"; + repo = "webassemblyjs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8="; + }; + + postPatch = '' + substituteInPlace packages/**/package.json \ + --replace-warn "1.13.2" "1.14.1" + + patchShebangs scripts/ + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + + preInstall = '' + yarn install --offline --prod --no-bin-links + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/{packages,node_modules} + mkdir $out/bin + mv -t $out/lib/packages packages/** + mv -t $out/lib/node_modules node_modules/** + + makeWrapper ${lib.getExe nodejs} $out/bin/wast-refmt \ + --add-flags "$out/lib/packages/wast-refmt/lib/cli.js" \ + --set NODE_PATH "$out/lib/node_modules" + + runHook postInstall + ''; + + meta = { + description = "WAST Reformatter"; + homepage = "https://webassembly.js.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "wast-refmt"; + }; +}) diff --git a/pkgs/by-name/we/webassemblyjs-cli/package.nix b/pkgs/by-name/we/webassemblyjs-cli/package.nix new file mode 100644 index 000000000000..3dd8b359c655 --- /dev/null +++ b/pkgs/by-name/we/webassemblyjs-cli/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + makeBinaryWrapper, + gcc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "webassemblyjs-cli"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "xtuc"; + repo = "webassemblyjs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8="; + }; + + postPatch = '' + substituteInPlace packages/**/package.json \ + --replace-warn "1.13.2" "1.14.1" + + patchShebangs scripts/ + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + + preInstall = '' + yarn install --offline --prod --no-bin-links + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/{packages,node_modules} + mkdir $out/bin + mv -t $out/lib/packages packages/** + mv -t $out/lib/node_modules node_modules/** + + declare -a cmds=("wasmdump" "wasmast" "wasmrun" + "wasm2wast" "wastast" "get-producer-section" + "wast-to-wasm-semantics") + for c in "''${cmds[@]}" + do + makeWrapper ${lib.getExe nodejs} $out/bin/$c \ + --add-flags "$out/lib/packages/cli/lib/$c.js" \ + --set NODE_PATH "$out/lib/node_modules" + done + + runHook postInstall + ''; + + meta = { + description = "Toolbox for WebAssembly"; + homepage = "https://webassembly.js.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/by-name/we/webassemblyjs-repl/package.nix b/pkgs/by-name/we/webassemblyjs-repl/package.nix new file mode 100644 index 000000000000..d564c7d541cd --- /dev/null +++ b/pkgs/by-name/we/webassemblyjs-repl/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + makeBinaryWrapper, + gcc, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "webassemblyjs-repl"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "xtuc"; + repo = "webassemblyjs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8="; + }; + + postPatch = '' + substituteInPlace packages/**/package.json \ + --replace-warn "1.13.2" "1.14.1" + + patchShebangs scripts/ + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + + preInstall = '' + yarn install --offline --prod --no-bin-links + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/{packages,node_modules} + mkdir $out/bin + mv -t $out/lib/packages packages/** + mv -t $out/lib/node_modules node_modules/** + + makeWrapper ${lib.getExe nodejs} $out/bin/wasm \ + --add-flags "$out/lib/packages/repl/lib/bin.js" \ + --set NODE_PATH "$out/lib/node_modules" + + runHook postInstall + ''; + + meta = { + description = "WebAssembly REPL"; + homepage = "https://webassembly.js.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "wasm"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ece40c1c57ba..88f44406f802 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -57,6 +57,12 @@ mapAliases { "@uppy/companion" = pkgs.uppy-companion; # Added 2025-11-01 "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15 "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15 + "@webassemblyjs/cli-1.11.1" = pkgs.webassemblyjs-cli; # Added 2025-11-06 + "@webassemblyjs/repl-1.11.1" = pkgs.webassemblyjs-repl; # Added 2025-11-06 + "@webassemblyjs/wasm-strip" = + "@webassemblyjs/wasm-strip has been removed because it was deprecated by upstream. Consider using wabt instead"; # Added 2025-11-06 + "@webassemblyjs/wasm-text-gen-1.11.1" = pkgs.wasm-text-gen; # Added 2025-11-06 + "@webassemblyjs/wast-refmt-1.11.1" = pkgs.wast-refmt; # Added 2025-11-06 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 inherit (pkgs) autoprefixer; # added 2024-06-25 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d14d6c6d4f76..39dcd0b5f460 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -3,15 +3,10 @@ # Packages that provide multiple executables where one is clearly the `mainProgram`. "@antfu/ni" = "ni"; "@microsoft/rush" = "rush"; - "@webassemblyjs/cli-1.11.1" = "wasm2wast"; # Packages that provide a single executable. "@angular/cli" = "ng"; "@commitlint/cli" = "commitlint"; - "@webassemblyjs/repl-1.11.1" = "wasm"; - "@webassemblyjs/wasm-strip" = "wasm-strip"; - "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; - "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt"; aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 5ca242ab9d0b..40aa250b7072 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -7,11 +7,6 @@ , "@tailwindcss/forms" , "@tailwindcss/line-clamp" , "@tailwindcss/typography" -, {"@webassemblyjs/cli": "1.11.1"} -, {"@webassemblyjs/repl": "1.11.1"} -, "@webassemblyjs/wasm-strip" -, {"@webassemblyjs/wasm-text-gen": "1.11.1"} -, {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" , "audiosprite" , "aws-cdk" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 35904c330ad4..ad3a0ac076ed 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3666,294 +3666,6 @@ let sha512 = "/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="; }; }; - "@webassemblyjs/ast-1.11.1" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"; - sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw=="; - }; - }; - "@webassemblyjs/ast-1.8.1" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.1.tgz"; - sha512 = "gDrC14Ae2b4gP9vYdCzx6ytY4LuYoH3I0h0QzU9RPifGPgjXz8F3s5g9632P7Wf39vQQg6XQ0Bfv29rc5RoTmw=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; - sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.8.1" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.1.tgz"; - sha512 = "g50x4xV7o2b39pB+uppF3kibFXhb9Dl4Jj3fj18eqWPGBgabreIwQmw3B5Uc6Y7Ec7ZZJ8TrUe79swN3iBaPDQ=="; - }; - }; - "@webassemblyjs/helper-api-error-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; - sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="; - }; - }; - "@webassemblyjs/helper-api-error-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.1.tgz"; - sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w=="; - }; - }; - "@webassemblyjs/helper-buffer-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.1.tgz"; - sha512 = "ex3cnmE6V0JfCBIesxF70vsPvh/QNOfaIsL5N0lkiJjVDl65YjH/WZxLe0nTuIuvVQhZH7DdRzUm0G9g12YACg=="; - }; - }; - "@webassemblyjs/helper-code-frame-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.11.1.tgz"; - sha512 = "mPd+wiLANX+0WdXre6/nVufpukwfGBzolYCrzx+QtpUUa9FthKTr+mdg0yVWgs9W7zhOE3tCOK/ffqpu4rsJag=="; - }; - }; - "@webassemblyjs/helper-code-frame-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.1.tgz"; - sha512 = "vSs2ObU/pbPXrvMqfpEUnvTcvlhwHT3ochBdekn+cv5zYR1wtmAIj+UXrmzbkBQYff/yTrZgaeqkFaT3fLLOrA=="; - }; - }; - "@webassemblyjs/helper-compiler-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-compiler"; - packageName = "@webassemblyjs/helper-compiler"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.11.1.tgz"; - sha512 = "4fhcksfjZlUO+A6BoHhq+jqIA0IoTCALO7lthg88oSvMnDwI7MLydC0Dxy9L9h8/VX6rgxn+Ks3qFFvUv9TAWQ=="; - }; - }; - "@webassemblyjs/helper-flatten-ast-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-flatten-ast"; - packageName = "@webassemblyjs/helper-flatten-ast"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.11.1.tgz"; - sha512 = "fyr0qH03eF/iH8Cos52Z5kE+pdOj5m/ZeCIKxfezDf0r/vmukoMgmLt9gH5u6T1wt7hZHXjV1ocNoqBP+DBgeg=="; - }; - }; - "@webassemblyjs/helper-fsm-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.11.1.tgz"; - sha512 = "k+B+H6RO3f8xDborqpvTS5T5xp43MmytDSJbsbDmuMIN8yhCs7Oyu7+s08noYkDplj2rRlcq3iW9eGMhY7jxmg=="; - }; - }; - "@webassemblyjs/helper-fsm-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.1.tgz"; - sha512 = "WeXD3ZkKi2wpAXqPW+COawoNb0Vcu3OGoaQv8/cL3VpTfGO85ZN30h/6CjUHLISGZtpZxQu3D7AuJmI/rlEqAw=="; - }; - }; - "@webassemblyjs/helper-module-context-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.1.tgz"; - sha512 = "657xpRy6lptA7oCIgOKQAHElsgAXliqutMPLjoEL2T5Uyp1cIDUH7axmphu7bb5U+ZUpwApnZHvdvyJYGDOxsQ=="; - }; - }; - "@webassemblyjs/helper-numbers-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-numbers"; - packageName = "@webassemblyjs/helper-numbers"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; - sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.11.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; - sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.1.tgz"; - sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w=="; - }; - }; - "@webassemblyjs/helper-wasm-section-1.8.1" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.1.tgz"; - sha512 = "FlNdlARr+mcP8XL+wg6bXqgC+0ZwnltqXExw63e9cgK84bAdTwKnfX9k6CKg8qvK5e/d9dUmk0dkVrkyEpKx5w=="; - }; - }; - "@webassemblyjs/ieee754-1.11.1" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; - sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ=="; - }; - }; - "@webassemblyjs/ieee754-1.8.1" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.1.tgz"; - sha512 = "Pq3IQR3uay+rFC0qIgg6xvD+uu0a9QEWDCRihHuU9wmOBFW3Lda/ObnO0HjC7XUJ8A9h4xExaa1w5TsSk+DxIQ=="; - }; - }; - "@webassemblyjs/leb128-1.11.1" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; - sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw=="; - }; - }; - "@webassemblyjs/leb128-1.8.1" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.1.tgz"; - sha512 = "Ir8M3hgTzFLEOKmMMH44neM6sLESfEoSCjNsOInETxbSpPY1MKOsFSAxCUaeXhjtLQfflCCdjgSsU+2veP6SGw=="; - }; - }; - "@webassemblyjs/utf8-1.11.1" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; - sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="; - }; - }; - "@webassemblyjs/utf8-1.8.1" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.1.tgz"; - sha512 = "I5QQEb5ajQ99ARiyDrVQM/2nvyFFG0tF1TX2Ql7dOjw5GRT6P4FF+gRk7OeAUtI1CLyffUNWbIvpJz13crGSxw=="; - }; - }; - "@webassemblyjs/validation-1.11.1" = { - name = "_at_webassemblyjs_slash_validation"; - packageName = "@webassemblyjs/validation"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.11.1.tgz"; - sha512 = "qNByLv/qST8x4CshQ8vUuX/+OebI9gK+FHkGPMnLnwALKFJOG0jIxG8TXaf2L+fVHNyd96qhsZ/GL54G3KTjpg=="; - }; - }; - "@webassemblyjs/wasm-gen-1.8.1" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.1.tgz"; - sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug=="; - }; - }; - "@webassemblyjs/wasm-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; - sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA=="; - }; - }; - "@webassemblyjs/wasm-parser-1.8.1" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.1.tgz"; - sha512 = "k63WJZdIjTQgZt+cn8rsIEvW0aNKttGip6ygTE/ZPXKZsMTk0G5xyw+MQxphbvt/GYbNu5DdxGN/7WGybO95TA=="; - }; - }; - "@webassemblyjs/wast-parser-1.11.1" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.11.1.tgz"; - sha512 = "qnd52euxGXBO27fC8SQTqT0HAuDauAk3EJpp1yw68mtdHO6I3YpiRMJK/dvSKU75saT/uRoSgiyfW9vajh7dhA=="; - }; - }; - "@webassemblyjs/wast-parser-1.8.1" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.1.tgz"; - sha512 = "iXjhXGhZeZIAnWkHD2G4ZOx8x5GYux5dwHuQL/AU8jb2H3BxolxVvNdpDmBTQPKDAgAAEeCFDnftNf4xNR9KMQ=="; - }; - }; - "@webassemblyjs/wast-printer-1.11.1" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; - sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg=="; - }; - }; - "@webassemblyjs/wast-printer-1.8.1" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.1.tgz"; - sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA=="; - }; - }; "@xmldom/xmldom-0.8.10" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; @@ -3981,33 +3693,6 @@ let sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; }; }; - "@xtuc/ieee754-1.2.0" = { - name = "_at_xtuc_slash_ieee754"; - packageName = "@xtuc/ieee754"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - }; - "@xtuc/long-4.2.1" = { - name = "_at_xtuc_slash_long"; - packageName = "@xtuc/long"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz"; - sha512 = "FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g=="; - }; - }; - "@xtuc/long-4.2.2" = { - name = "_at_xtuc_slash_long"; - packageName = "@xtuc/long"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - }; "@yarnpkg/lockfile-1.0.2" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -29174,15 +28859,6 @@ let sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; }; }; - "webassemblyjs-1.11.1" = { - name = "webassemblyjs"; - packageName = "webassemblyjs"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.11.1.tgz"; - sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg=="; - }; - }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -31746,198 +31422,6 @@ in bypassCache = true; reconstructLock = true; }; - "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage { - name = "_at_webassemblyjs_slash_cli"; - packageName = "@webassemblyjs/cli"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.11.1.tgz"; - sha512 = "XLCwWiDYeufpJPb/0H9sx4p07LtwXHRyv137I8peZZmTd4Xrk7KH2qSaDOCkpZX9yItTd8g7MWXNqGh0tT+8eg=="; - }; - dependencies = [ - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-code-frame-1.11.1" - sources."@webassemblyjs/helper-compiler-1.11.1" - sources."@webassemblyjs/helper-flatten-ast-1.11.1" - sources."@webassemblyjs/helper-fsm-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/validation-1.11.1" - sources."@webassemblyjs/wasm-parser-1.11.1" - sources."@webassemblyjs/wast-parser-1.11.1" - sources."@webassemblyjs/wast-printer-1.11.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."webassemblyjs-1.11.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Toolbox for WebAssembly"; - homepage = "https://github.com/xtuc/webassemblyjs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@webassemblyjs/repl-1.11.1" = nodeEnv.buildNodePackage { - name = "_at_webassemblyjs_slash_repl"; - packageName = "@webassemblyjs/repl"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.11.1.tgz"; - sha512 = "RDyNwDPb2YmsUYZ4OVCwJQpvxT7Mus4Dy9wNf0remSn7cTltrYGCk/zWe21+AXuNvuhYO0kzeNzswROuyB33cA=="; - }; - dependencies = [ - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-code-frame-1.11.1" - sources."@webassemblyjs/helper-compiler-1.11.1" - sources."@webassemblyjs/helper-flatten-ast-1.11.1" - sources."@webassemblyjs/helper-fsm-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/validation-1.11.1" - sources."@webassemblyjs/wasm-parser-1.11.1" - sources."@webassemblyjs/wast-parser-1.11.1" - sources."@webassemblyjs/wast-printer-1.11.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."webassemblyjs-1.11.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "WebAssembly REPL"; - homepage = "https://github.com/xtuc/webassemblyjs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage { - name = "_at_webassemblyjs_slash_wasm-strip"; - packageName = "@webassemblyjs/wasm-strip"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-strip/-/wasm-strip-1.8.1.tgz"; - sha512 = "yDFZagGY6+M4EwAvHhZa3AVuz+LLr5iodcIIKk2rY8WT9VI+9rfzHR5aLCpVOkHrdCjBDnxXnnZqDkNbP28UXA=="; - }; - dependencies = [ - sources."@webassemblyjs/ast-1.8.1" - sources."@webassemblyjs/floating-point-hex-parser-1.8.1" - sources."@webassemblyjs/helper-api-error-1.8.1" - sources."@webassemblyjs/helper-buffer-1.8.1" - sources."@webassemblyjs/helper-code-frame-1.8.1" - sources."@webassemblyjs/helper-fsm-1.8.1" - sources."@webassemblyjs/helper-module-context-1.8.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.1" - sources."@webassemblyjs/helper-wasm-section-1.8.1" - sources."@webassemblyjs/ieee754-1.8.1" - sources."@webassemblyjs/leb128-1.8.1" - sources."@webassemblyjs/utf8-1.8.1" - sources."@webassemblyjs/wasm-gen-1.8.1" - sources."@webassemblyjs/wasm-parser-1.8.1" - sources."@webassemblyjs/wast-parser-1.8.1" - sources."@webassemblyjs/wast-printer-1.8.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "> Strips custom sections"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@webassemblyjs/wasm-text-gen-1.11.1" = nodeEnv.buildNodePackage { - name = "_at_webassemblyjs_slash_wasm-text-gen"; - packageName = "@webassemblyjs/wasm-text-gen"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.11.1.tgz"; - sha512 = "7SWOLN+1eZ5e9gohQPVdA8XQstGIYei/70T5kmLP6vC41zy8BBYNt35OgLZmbpg3iOQ1vWT17ZMhVikSJySSRg=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/generator-7.26.10" - sources."@babel/helper-string-parser-7.25.9" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@babel/parser-7.26.10" - sources."@babel/template-7.26.9" - sources."@babel/types-7.26.10" - sources."@jridgewell/gen-mapping-0.3.8" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/ieee754-1.11.1" - sources."@webassemblyjs/leb128-1.11.1" - sources."@webassemblyjs/utf8-1.11.1" - sources."@webassemblyjs/wasm-parser-1.11.1" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."commander-2.20.3" - sources."js-tokens-4.0.0" - sources."jsesc-3.1.0" - sources."picocolors-1.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Emit documentation/code for your WASM binary Edit"; - homepage = "https://github.com/xtuc/webassemblyjs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@webassemblyjs/wast-refmt-1.11.1" = nodeEnv.buildNodePackage { - name = "_at_webassemblyjs_slash_wast-refmt"; - packageName = "@webassemblyjs/wast-refmt"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.11.1.tgz"; - sha512 = "xbYYo9CPjYMz1YHE4xvODqfrREiefWMXPD/rHgqV4rRituNpNRhbWIomwuKBfS5rgBsc0RdoLOmG4UdLbR6SDA=="; - }; - dependencies = [ - sources."@webassemblyjs/ast-1.11.1" - sources."@webassemblyjs/floating-point-hex-parser-1.11.1" - sources."@webassemblyjs/helper-api-error-1.11.1" - sources."@webassemblyjs/helper-code-frame-1.11.1" - sources."@webassemblyjs/helper-fsm-1.11.1" - sources."@webassemblyjs/helper-numbers-1.11.1" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" - sources."@webassemblyjs/wast-parser-1.11.1" - sources."@webassemblyjs/wast-printer-1.11.1" - sources."@xtuc/long-4.2.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "WAST refmt"; - homepage = "https://github.com/xtuc/webassemblyjs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; alex = nodeEnv.buildNodePackage { name = "alex"; packageName = "alex"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61b6b6f12bdd..8c2a9067e7c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1597,6 +1597,7 @@ mapAliases { warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 wasm-bindgen-cli = wasm-bindgen-cli_0_2_104; + wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e075871330c..ad488dac0d7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4130,15 +4130,8 @@ with pkgs; inherit (perlPackages) Po4a; }; - webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1"; - webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1"; - buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { }; - wasm-strip = nodePackages."@webassemblyjs/wasm-strip"; - wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1"; - wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1"; - wasmedge = callPackage ../development/tools/wasmedge { stdenv = clangStdenv; }; From 3901ded5d641ee4fa34abf4b42643af33dcfbbaf Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 8 Nov 2025 16:12:57 +0100 Subject: [PATCH 1753/2279] ossec-agent,ossec-server: drop The package build is broken on linux since #270218 from 2023. It looks like it's building on darwin, dropping it anyway since noone cared to bump it to the current state which also contains security related improvements. --- pkgs/tools/security/ossec/agent.nix | 82 ------- pkgs/tools/security/ossec/no-root.patch | 297 ------------------------ pkgs/tools/security/ossec/server.nix | 82 ------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 - 5 files changed, 2 insertions(+), 465 deletions(-) delete mode 100644 pkgs/tools/security/ossec/agent.nix delete mode 100644 pkgs/tools/security/ossec/no-root.patch delete mode 100644 pkgs/tools/security/ossec/server.nix diff --git a/pkgs/tools/security/ossec/agent.nix b/pkgs/tools/security/ossec/agent.nix deleted file mode 100644 index 28f29c9c045e..000000000000 --- a/pkgs/tools/security/ossec/agent.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - which, - pcre2, - zlib, - ncurses, - openssl, -}: -let - version = "unstable-2023-08-09"; -in -stdenv.mkDerivation { - pname = "ossec-agent"; - inherit version; - - src = fetchFromGitHub { - owner = "ossec"; - repo = "ossec-hids"; - rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2"; - sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE="; - }; - - # clear is used during the build process - nativeBuildInputs = [ ncurses ]; - - buildInputs = [ - which - pcre2 - zlib - openssl - ]; - - # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files - patches = [ ./no-root.patch ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of - # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = '' - mkdir $out - export USER_DIR="$out" # just to satisy the script - ./install.sh < /dev/null 2>&1 -- echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT} -- echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT} -- echo "DATE=\"`date`\"" >> ${OSSEC_INIT} -- echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} -- chmod 600 ${OSSEC_INIT} -- cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} -- chmod 640 ${INSTALLDIR}${OSSEC_INIT} -+ # chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 -+ # echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT} -+ # echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT} -+ # echo "DATE=\"`date`\"" >> ${OSSEC_INIT} -+ # echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} -+ # chmod 600 ${OSSEC_INIT} -+ # cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} -+ # chmod 640 ${INSTALLDIR}${OSSEC_INIT} - - - # If update_rules is set, we need to tweak -@@ -148,12 +148,12 @@ Install() - fi - - # Calling the init script to start ossec hids during boot -- if [ "X${update_only}" = "X" ]; then -- runInit -- if [ $? = 1 ]; then -- notmodified="yes" -- fi -- fi -+ # if [ "X${update_only}" = "X" ]; then -+ # runInit -+ # if [ $? = 1 ]; then -+ # notmodified="yes" -+ # fi -+ # fi - - } - -@@ -965,10 +965,10 @@ main() - catError "0x1-location"; - fi - -- # Must be root -- if [ ! "X$ME" = "Xroot" ]; then -- catError "0x2-beroot"; -- fi -+ # # Must be root -+ # if [ ! "X$ME" = "Xroot" ]; then -+ # catError "0x2-beroot"; -+ # fi - - # Checking dependencies - checkDependencies -diff --git a/src/Makefile b/src/Makefile -index 7fc04c0b..0eb27a0a 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -144,7 +144,7 @@ endif - ifeq (${uname_S},AIX) - INSTALL_CMD?=./install-shim-aix.ksh -m $(1) -o $(2) -g $(3) - else -- INSTALL_CMD?=install -m $(1) -o $(2) -g $(3) -+ INSTALL_CMD?=install - endif - - ifdef DEBUGAD -@@ -404,10 +404,10 @@ endif - install: install-${TARGET} - - install-agent: install-common -- $(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-agentd ${PREFIX}/bin -+ $(call INSTALL_CMD) agent-auth ${PREFIX}/bin - -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids - - install-local: install-server-generic - -@@ -416,133 +416,126 @@ install-hybrid: install-server-generic - install-server: install-server-generic - - install-common: build -- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/ -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs -- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log -- -- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control -+ $(call INSTALL_CMD) -d ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-logcollector ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-syscheckd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-execd ${PREFIX}/bin -+ $(call INSTALL_CMD) manage_agents ${PREFIX}/bin -+ $(call INSTALL_CMD) ../contrib/util.sh ${PREFIX}/bin/ -+ $(call INSTALL_CMD) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control - - ifeq (${LUA_ENABLE},yes) -- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua -- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native -- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled -- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/ -+ $(call INSTALL_CMD) -d ${PREFIX}/lua -+ $(call INSTALL_CMD) -d ${PREFIX}/lua/native -+ $(call INSTALL_CMD) -d ${PREFIX}/lua/compiled -+ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ -+ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/ - endif - -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue -- $(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff -+ $(call INSTALL_CMD) -d ${PREFIX}/queue -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/alerts -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/ossec -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/syscheck -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/diff - -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc -+ $(call INSTALL_CMD) -d ${PREFIX}/etc - ifeq (${INSTALL_LOCALTIME},yes) -- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc -+ $(call INSTALL_CMD) /etc/localtime ${PREFIX}/etc - endif - ifeq (${INSTALL_RESOLVCONF},yes) -- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/resolv.conf ${PREFIX}/etc -+ $(call INSTALL_CMD) /etc/resolv.conf ${PREFIX}/etc - endif - -- $(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp -+ $(call INSTALL_CMD) -d ${PREFIX}/tmp - - ifneq (,$(wildcard /etc/TIMEZONE)) -- $(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/ -+ $(call INSTALL_CMD) /etc/TIMEZONE ${PREFIX}/etc/ - endif - # Solaris Needs some extra files - ifeq (${uname_S},SunOS) -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/ -+ $(call INSTALL_CMD) -d ${PREFIX}/usr/share/lib/zoneinfo/ - cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/ - endif -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/ -+ $(call INSTALL_CMD) -b ../etc/internal_options.conf ${PREFIX}/etc/ - ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf)) -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf -+ $(call INSTALL_CMD) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf - endif - ifeq (,$(wildcard ${PREFIX}/etc/client.keys)) -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys -+ $(call INSTALL_CMD) /dev/null ${PREFIX}/etc/client.keys - endif - ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf)) - ifneq (,$(wildcard ../etc/ossec.mc)) -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf -+ $(call INSTALL_CMD) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf - else -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf -+ $(call INSTALL_CMD) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf - endif - endif - -- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared -- $(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/ -+ $(call INSTALL_CMD) -d ${PREFIX}/etc/shared -+ $(call INSTALL_CMD) rootcheck/db/*.txt ${PREFIX}/etc/shared/ - -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/ -+ $(call INSTALL_CMD) -d ${PREFIX}/active-response -+ $(call INSTALL_CMD) -d ${PREFIX}/active-response/bin -+ $(call INSTALL_CMD) -d ${PREFIX}/agentless -+ $(call INSTALL_CMD) agentlessd/scripts/* ${PREFIX}/agentless/ - -- $(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh -+ $(call INSTALL_CMD) -d ${PREFIX}/.ssh - -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/ -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/ -+ $(call INSTALL_CMD) ../active-response/*.sh ${PREFIX}/active-response/bin/ -+ $(call INSTALL_CMD) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/ - -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var -- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run -- -- ./init/fw-check.sh execute -+ $(call INSTALL_CMD) -d ${PREFIX}/var -+ $(call INSTALL_CMD) -d ${PREFIX}/var/run - - - - install-server-generic: install-common -- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall -- -- $(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin -- $(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/ -- $(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/ -- -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats -- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules -+ $(call INSTALL_CMD) /dev/null ${PREFIX}/logs/active-responses.log -+ $(call INSTALL_CMD) -d ${PREFIX}/logs/archives -+ $(call INSTALL_CMD) -d ${PREFIX}/logs/alerts -+ $(call INSTALL_CMD) -d ${PREFIX}/logs/firewall -+ -+ $(call INSTALL_CMD) ossec-agentlessd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-analysisd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-monitord ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-reportd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-maild ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-remoted ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-logtest ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-csyslogd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-authd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-dbd ${PREFIX}/bin -+ $(call INSTALL_CMD) ossec-makelists ${PREFIX}/bin -+ $(call INSTALL_CMD) verify-agent-conf ${PREFIX}/bin/ -+ $(call INSTALL_CMD) clear_stats ${PREFIX}/bin/ -+ $(call INSTALL_CMD) list_agents ${PREFIX}/bin/ -+ $(call INSTALL_CMD) ossec-regex ${PREFIX}/bin/ -+ $(call INSTALL_CMD) syscheck_update ${PREFIX}/bin/ -+ $(call INSTALL_CMD) agent_control ${PREFIX}/bin/ -+ $(call INSTALL_CMD) syscheck_control ${PREFIX}/bin/ -+ $(call INSTALL_CMD) rootcheck_control ${PREFIX}/bin/ -+ -+ $(call INSTALL_CMD) -d ${PREFIX}/stats -+ $(call INSTALL_CMD) -d ${PREFIX}/rules - ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml)) - cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml -+ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules -+ $(call INSTALL_CMD) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml - rm ${PREFIX}/rules/local_rules.xml.installbackup - else -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules -+ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules - endif - -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/fts - -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/rootcheck - -- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info -- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/agent-info -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/agentless - -- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids -+ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids - -- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/ -+ $(call INSTALL_CMD) ../etc/decoder.xml ${PREFIX}/etc/ - - rm -f ${PREFIX}/etc/shared/merged.mg - diff --git a/pkgs/tools/security/ossec/server.nix b/pkgs/tools/security/ossec/server.nix deleted file mode 100644 index 29587552cfe7..000000000000 --- a/pkgs/tools/security/ossec/server.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - which, - pcre2, - zlib, - ncurses, - openssl, -}: -let - version = "unstable-2023-08-09"; -in -stdenv.mkDerivation { - pname = "ossec-server"; - inherit version; - - src = fetchFromGitHub { - owner = "ossec"; - repo = "ossec-hids"; - rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2"; - sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE="; - }; - - # clear is used during the build process - nativeBuildInputs = [ ncurses ]; - - buildInputs = [ - which - pcre2 - zlib - openssl - ]; - - # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files - patches = [ ./no-root.patch ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of - # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = '' - mkdir -p $out/logs - export USER_DIR="$out" # just to satisy the script - ./install.sh < for migration instructions"; # Added 2025-08-04 pacup = throw "'pacup' has been renamed to/replaced by 'perlPackages.pacup'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ffccb2ce3ad..a720d2c5e1fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3653,10 +3653,6 @@ with pkgs; llvm = llvm_19; }; - ossec-agent = callPackage ../tools/security/ossec/agent.nix { }; - - ossec-server = callPackage ../tools/security/ossec/server.nix { }; - p4c = callPackage ../development/compilers/p4c { protobuf = protobuf_21; }; From b96231f6be926f30c9a737c710e015f875b3f070 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 4 Nov 2025 16:07:57 -0500 Subject: [PATCH 1754/2279] nixos/parsoid: remove --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 4 + nixos/modules/services/misc/parsoid.nix | 144 ------------------ 4 files changed, 6 insertions(+), 145 deletions(-) delete mode 100644 nixos/modules/services/misc/parsoid.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index d9b2a8c3f8c8..65001eb9b172 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -195,6 +195,8 @@ - `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`. If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly. +- `services.parsoid` and the `nodePackages.parsoid` package have been removed, as the JavaScript-based version this module uses is not compatible with modern MediaWiki versions. + - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information. - `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d0937a501807..ab964994d908 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -902,7 +902,6 @@ ./services/misc/packagekit.nix ./services/misc/paisa.nix ./services/misc/paperless.nix - ./services/misc/parsoid.nix ./services/misc/persistent-evdev.nix ./services/misc/pghero.nix ./services/misc/pinchflat.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 66e58ce59803..d7759c232fea 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -234,6 +234,10 @@ in (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. '') + (mkRemovedOptionModule [ "services" "parsoid" ] '' + The Javascript version of Parsoid configured through this module does not work with modern MediaWiki versions, + and has been deprecated by upstream, so it has been removed. MediaWiki comes with a new PHP-based parser built-in, so there is no need for this module. + '') (mkRemovedOptionModule [ "services" "polipo" ] '' The polipo project is unmaintained and archived upstream. '') diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix deleted file mode 100644 index b839309419d6..000000000000 --- a/nixos/modules/services/misc/parsoid.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - - cfg = config.services.parsoid; - - parsoid = pkgs.nodePackages.parsoid; - - confTree = { - worker_heartbeat_timeout = 300000; - logging = { - level = "info"; - }; - services = [ - { - module = "lib/index.js"; - entrypoint = "apiServiceWorker"; - conf = { - mwApis = map (x: if lib.isAttrs x then x else { uri = x; }) cfg.wikis; - serverInterface = cfg.interface; - serverPort = cfg.port; - }; - } - ]; - }; - - confFile = pkgs.writeText "config.yml" ( - builtins.toJSON (lib.recursiveUpdate confTree cfg.extraConfig) - ); - -in -{ - imports = [ - (lib.mkRemovedOptionModule [ - "services" - "parsoid" - "interwikis" - ] "Use services.parsoid.wikis instead") - ]; - - ##### interface - - options = { - - services.parsoid = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable Parsoid -- bidirectional - wikitext parser. - ''; - }; - - wikis = lib.mkOption { - type = lib.types.listOf (lib.types.either lib.types.str lib.types.attrs); - example = [ "http://localhost/api.php" ]; - description = '' - Used MediaWiki API endpoints. - ''; - }; - - workers = lib.mkOption { - type = lib.types.int; - default = 2; - description = '' - Number of Parsoid workers. - ''; - }; - - interface = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1"; - description = '' - Interface to listen on. - ''; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 8000; - description = '' - Port to listen on. - ''; - }; - - extraConfig = lib.mkOption { - type = lib.types.attrs; - default = { }; - description = '' - Extra configuration to add to parsoid configuration. - ''; - }; - - }; - - }; - - ##### implementation - - config = lib.mkIf cfg.enable { - - systemd.services.parsoid = { - description = "Bidirectional wikitext parser"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}"; - - DynamicUser = true; - User = "parsoid"; - Group = "parsoid"; - - CapabilityBoundingSet = ""; - NoNewPrivileges = true; - ProtectSystem = "strict"; - ProtectHome = true; - PrivateTmp = true; - PrivateDevices = true; - ProtectHostname = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - ]; - RestrictNamespaces = true; - LockPersonality = true; - #MemoryDenyWriteExecute = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - RemoveIPC = true; - }; - }; - - }; - -} From 016c39ca095d34d4a1c48230469f5d0e1b80ffd1 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 4 Nov 2025 16:08:25 -0500 Subject: [PATCH 1755/2279] nodePackages.parsoid: drop Has been deprecated by upstream as part of their move to the new PHP-based Parsoid runtime, so there is no need for this module or package to exist anymore. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 834 ------------------ 4 files changed, 1 insertion(+), 836 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index ece40c1c57ba..89573948a7bc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -229,6 +229,7 @@ mapAliases { orval = throw "orval has been removed because it was broken"; # added 2025-03-23 parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12 parcel-bundler = self.parcel; # added 2023-09-04 + parsoid = throw "The Javascript version of Parsoid has been deprecated by upstream and no longer works with modern MediaWiki versions"; # Added 2025-11-04 inherit (pkgs) patch-package; # added 2024-06-29 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d14d6c6d4f76..89cdcadffe15 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -25,7 +25,6 @@ gulp-cli = "gulp"; jsonlint = "jsonlint"; localtunnel = "lt"; - parsoid = "parse.js"; poor-mans-t-sql-formatter-cli = "sqlformat"; pulp = "pulp"; purescript-language-server = "purescript-language-server"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 5ca242ab9d0b..f2ebae50b8ca 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -62,7 +62,6 @@ , "node2nix" , "np" , "nrm" -, "parsoid" , "peerflix" , "peerflix-server" , "poor-mans-t-sql-formatter-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 35904c330ad4..62b841c0a73b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5376,15 +5376,6 @@ let sha512 = "OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg=="; }; }; - "babybird-0.0.1" = { - name = "babybird"; - packageName = "babybird"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; - sha512 = "1Niw1j7GKl8L3vyKBKbzKeJ//uPoQpr5RCr5/GV2Fto+U8OqcTWXJH/Ats2lOMYP4sVjRHwSIH+HUPdLkORZ9w=="; - }; - }; "backo2-1.0.2" = { name = "backo2"; packageName = "backo2"; @@ -5628,15 +5619,6 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "bintrees-1.0.2" = { - name = "bintrees"; - packageName = "bintrees"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz"; - sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; - }; - }; "bit-field-1.9.0" = { name = "bit-field"; packageName = "bit-field"; @@ -6294,24 +6276,6 @@ let sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig=="; }; }; - "bunyan-syslog-udp-0.2.0" = { - name = "bunyan-syslog-udp"; - packageName = "bunyan-syslog-udp"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.2.0.tgz"; - sha512 = "tY6iaw+iYbCjlsAgAyO4CeA7Usnj5VndygMfd2PcHK++626oMoHANcdsH5tq5VxRPsbk9M1fbuk0a5pX9axV2w=="; - }; - }; - "busboy-1.6.0" = { - name = "busboy"; - packageName = "busboy"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"; - sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; - }; - }; "byline-5.0.0" = { name = "byline"; packageName = "byline"; @@ -6969,15 +6933,6 @@ let sha512 = "0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="; }; }; - "clarinet-0.11.0" = { - name = "clarinet"; - packageName = "clarinet"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; - sha512 = "6hgoCgDgdyEtrXsk1tMomUl+S6wnslv2F1muNTOuhQemOhauR+Q0FtBdrj9k+qyIDLm0TVW0QMZ10aeWwRDgIA=="; - }; - }; "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; @@ -7194,15 +7149,6 @@ let sha512 = "5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w=="; }; }; - "cliui-5.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; - }; - }; "cliui-6.0.0" = { name = "cliui"; packageName = "cliui"; @@ -7842,15 +7788,6 @@ let sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; }; }; - "connect-busboy-0.0.2" = { - name = "connect-busboy"; - packageName = "connect-busboy"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; - sha512 = "/Wi+zhcjivLU6dtsVGXWtRoVs4F7jdE9FUp0tXkbV9gCN7MdRQAgBqQ0xH0Iv9g00Z5EuioJo7ihxOAdZOzZ8w=="; - }; - }; "connect-history-api-fallback-1.6.0" = { name = "connect-history-api-fallback"; packageName = "connect-history-api-fallback"; @@ -7977,16 +7914,6 @@ let sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; - "content-type-git+https://github.com/wikimedia/content-type.git#master" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.1"; - src = fetchgit { - url = "https://github.com/wikimedia/content-type.git"; - rev = "cd73e64490f9620329fe4ed6e3ac383abb6bdee0"; - sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; - }; - }; "conventional-changelog-6.0.0" = { name = "conventional-changelog"; packageName = "conventional-changelog"; @@ -8239,15 +8166,6 @@ let sha512 = "bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw=="; }; }; - "core-js-2.6.12" = { - name = "core-js"; - packageName = "core-js"; - version = "2.6.12"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; - sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -9616,15 +9534,6 @@ let sha512 = "Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ=="; }; }; - "dnscache-1.0.2" = { - name = "dnscache"; - packageName = "dnscache"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.2.tgz"; - sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; - }; - }; "docker-modem-5.0.6" = { name = "docker-modem"; packageName = "docker-modem"; @@ -9661,15 +9570,6 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-storage-2.1.0" = { - name = "dom-storage"; - packageName = "dom-storage"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz"; - sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q=="; - }; - }; "dom-walk-0.1.2" = { name = "dom-walk"; packageName = "dom-walk"; @@ -9706,15 +9606,6 @@ let sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; - "domino-2.1.6" = { - name = "domino"; - packageName = "domino"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz"; - sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; - }; - }; "domutils-3.2.2" = { name = "domutils"; packageName = "domutils"; @@ -10021,15 +9912,6 @@ let sha512 = "EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="; }; }; - "emoji-regex-7.0.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -11065,15 +10947,6 @@ let sha512 = "28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA=="; }; }; - "express-handlebars-3.1.0" = { - name = "express-handlebars"; - packageName = "express-handlebars"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.1.0.tgz"; - sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -11641,15 +11514,6 @@ let sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="; }; }; - "find-up-3.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - }; "find-up-4.1.0" = { name = "find-up"; packageName = "find-up"; @@ -12208,33 +12072,6 @@ let sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g=="; }; }; - "gc-stats-1.4.1" = { - name = "gc-stats"; - packageName = "gc-stats"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.1.tgz"; - sha512 = "eAvDBpI6UjVIYwLxshPCJJIkPyfamIrJzBtW/103+ooJWkISS+chVnHNnsZ+ubaw2607rFeiRDNWHkNUA+ioqg=="; - }; - }; - "gelf-stream-1.1.1" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; - sha512 = "kCzCfI6DJ8+aaDhwMcsNm2l6CsBj6y4Is6CCxH2W9sYnZGcXg9WmJ/iZMoJVO6uTwTRL7dbIioAS8lCuGUXSFA=="; - }; - }; - "gelfling-0.3.1" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; - sha512 = "vli3D2RYpLW6XhryNrv7HMjFNbj+ks/CCVDjokxOtZ+p6QYRadj8Zc0ps+LolSsh/I97XO0OduP/ShOej08clA=="; - }; - }; "generic-pool-3.4.2" = { name = "generic-pool"; packageName = "generic-pool"; @@ -13342,15 +13179,6 @@ let sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="; }; }; - "heapdump-0.3.15" = { - name = "heapdump"; - packageName = "heapdump"; - version = "0.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz"; - sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; - }; - }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -13450,15 +13278,6 @@ let sha512 = "sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg=="; }; }; - "hot-shots-6.8.7" = { - name = "hot-shots"; - packageName = "hot-shots"; - version = "6.8.7"; - src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-6.8.7.tgz"; - sha512 = "XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w=="; - }; - }; "html-entities-1.4.0" = { name = "html-entities"; packageName = "html-entities"; @@ -16195,33 +16014,6 @@ let sha512 = "8xtA8oqbZ6v1Niryp2/g4GxW16EQh5MvrUylQoOG+zcrDff5CKttON2XUXvMwlIHq4/2zfPVFiinAccJ+WhxoA=="; }; }; - "kad-fs-0.0.4" = { - name = "kad-fs"; - packageName = "kad-fs"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; - sha512 = "VlLY7MuXy+3Tlqn1NJNgNkta6BRposNsJhqqcLv/M5e/rGBAETU33DhlPwV6/RBZKGzylQFkeYaKaoYin+mGZw=="; - }; - }; - "kad-localstorage-0.0.7" = { - name = "kad-localstorage"; - packageName = "kad-localstorage"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; - sha512 = "3BEFBPa9cbPvW7WvZSTQHy6dSgw7ob7yTqT+eORWrxm4f4fE26BUVorg36KRbg/W+YWEnippuM68ybFyF3heiA=="; - }; - }; - "kad-memstore-0.0.1" = { - name = "kad-memstore"; - packageName = "kad-memstore"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; - sha512 = "fwGvRXWjaSzMed8iQHkZH41wvaoq+3tIhuIbkqBBYFuuJtWoDWqgCYTADGPqLyaLX4Ct8aP5NtAxCaxk4cfcCg=="; - }; - }; "keep-alive-agent-0.0.1" = { name = "keep-alive-agent"; packageName = "keep-alive-agent"; @@ -16456,15 +16248,6 @@ let sha512 = "2vJ6FDCit0ohq77qdbIdk5JqGs/98W1fGEgozoAMq/oybKPdgLuB8bHH/wWgvCdQzEJpm6Sxh0abG/PtxFr7XA=="; }; }; - "limitation-0.2.3" = { - name = "limitation"; - packageName = "limitation"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.2.3.tgz"; - sha512 = "IpIBG7WniPI1Og0HYxlo8JRD2E2pExwuol7hjobcNZSYBBxAamPJdV91Q47uw5/KiUKA+We8a33sh6vD1PQ+Yw=="; - }; - }; "limiter-1.1.5" = { name = "limiter"; packageName = "limiter"; @@ -16627,15 +16410,6 @@ let sha512 = "SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA=="; }; }; - "locate-path-3.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; - }; - }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -16753,24 +16527,6 @@ let sha512 = "aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="; }; }; - "lodash.clone-4.5.0" = { - name = "lodash.clone"; - packageName = "lodash.clone"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz"; - sha512 = "GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg=="; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; - }; - }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -17941,15 +17697,6 @@ let sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; - "mediawiki-title-0.6.5" = { - name = "mediawiki-title"; - packageName = "mediawiki-title"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz"; - sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g=="; - }; - }; "mem-8.1.1" = { name = "mem"; packageName = "mem"; @@ -18652,15 +18399,6 @@ let sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-db-1.53.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.53.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz"; - sha512 = "oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg=="; - }; - }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -19120,15 +18858,6 @@ let sha512 = "tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA=="; }; }; - "ms-0.7.3" = { - name = "ms"; - packageName = "ms"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"; - sha512 = "lrKNzMWqQZgwJahtrtrM+9NgOoDUveDrVmm5aGXrf3BdtL0mq7X6IVzoZaw+TfNti29eHd1/8GI+h45K5cQ6/w=="; - }; - }; "ms-2.0.0" = { name = "ms"; packageName = "ms"; @@ -19165,15 +18894,6 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "msgpack5-3.6.1" = { - name = "msgpack5"; - packageName = "msgpack5"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.1.tgz"; - sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; - }; - }; "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -19408,16 +19128,6 @@ let sha512 = "8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="; }; }; - "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchgit { - url = "https://github.com/arlolra/negotiator.git"; - rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; - sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; - }; - }; "nel-1.3.0" = { name = "nel"; packageName = "nel"; @@ -20714,15 +20424,6 @@ let sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="; }; }; - "p-locate-3.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - }; "p-locate-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -21749,15 +21450,6 @@ let sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="; }; }; - "pn-1.1.0" = { - name = "pn"; - packageName = "pn"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; - sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; - }; - }; "pngjs-3.4.0" = { name = "pngjs"; packageName = "pngjs"; @@ -21956,15 +21648,6 @@ let sha512 = "rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw=="; }; }; - "prfun-2.1.5" = { - name = "prfun"; - packageName = "prfun"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz"; - sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug=="; - }; - }; "printf-0.2.5" = { name = "printf"; packageName = "printf"; @@ -22037,15 +21720,6 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; - "prom-client-11.5.3" = { - name = "prom-client"; - packageName = "prom-client"; - version = "11.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz"; - sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; - }; - }; "promise-8.3.0" = { name = "promise"; packageName = "promise"; @@ -24251,15 +23925,6 @@ let sha512 = "cr7dZWLwOeaFBLTIuZeYdkfO7UzGIKhjYENJFAxUOMKWGaWDm2nJM2rzxNRm5Owu0DH3ApwNo6kx5idXZfb/Iw=="; }; }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="; - }; - }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -24539,15 +24204,6 @@ let sha512 = "v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA=="; }; }; - "serve-favicon-2.5.0" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz"; - sha512 = "FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA=="; - }; - }; "serve-handler-6.1.6" = { name = "serve-handler"; packageName = "serve-handler"; @@ -24584,15 +24240,6 @@ let sha512 = "rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ=="; }; }; - "service-runner-2.9.0" = { - name = "service-runner"; - packageName = "service-runner"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.9.0.tgz"; - sha512 = "u5yFOwfPAaLo9oqbTWq0F02C3R/sohTbX5zqxWfoYe1bS3OpEyJsTGoRE5CGHum/RZcazxFpaVCrE+fIUvg3qA=="; - }; - }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -24980,15 +24627,6 @@ let sha512 = "knEO6ub2Pw00c7ueOV6snKE1hr7jIdY068+239v0I8DVKofyd7IQmYHXrM9pZL1zuI0H7sd+Y5kedndBi5GXIA=="; }; }; - "simplediff-0.1.1" = { - name = "simplediff"; - packageName = "simplediff"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; - sha512 = "Jvtruf4MmFtRS7ICivKX9RzEJuWHp8Hw2jHyAPOEWzMJ4U3u9ykc+N1UD9zMmsW7Hg0BAxYRH2wHxzMsyd4oUw=="; - }; - }; "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; @@ -25880,15 +25518,6 @@ let sha512 = "KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw=="; }; }; - "streamsearch-1.1.0" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"; - sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; - }; - }; "streamx-2.22.0" = { name = "streamx"; packageName = "streamx"; @@ -25934,15 +25563,6 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string-width-3.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - }; "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; @@ -26528,15 +26148,6 @@ let sha512 = "+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ=="; }; }; - "tdigest-0.1.2" = { - name = "tdigest"; - packageName = "tdigest"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz"; - sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; - }; - }; "temp-0.8.4" = { name = "temp"; packageName = "temp"; @@ -28076,15 +27687,6 @@ let sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw=="; }; }; - "unix-dgram-2.0.6" = { - name = "unix-dgram"; - packageName = "unix-dgram"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.6.tgz"; - sha512 = "AURroAsb73BZ6CdAyMrTk/hYKNj3DuYYEuOaB8bYMOHGKupRNScw90Q5C71tWJc3uE7dIeXRyuwN0xLLq3vDTg=="; - }; - }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -29345,33 +28947,6 @@ let sha512 = "c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA=="; }; }; - "wikimedia-kad-fork-1.3.6" = { - name = "wikimedia-kad-fork"; - packageName = "wikimedia-kad-fork"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/wikimedia-kad-fork/-/wikimedia-kad-fork-1.3.6.tgz"; - sha512 = "m+IxFN4JatoQPRo0N46xMh7tR6FSznb/ithIchAy7Wg9mrkc4/bE/3BhlJS410quFJFrJp8lJJp93g4uTbj4lA=="; - }; - }; - "wikimedia-langconv-0.1.0" = { - name = "wikimedia-langconv"; - packageName = "wikimedia-langconv"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wikimedia-langconv/-/wikimedia-langconv-0.1.0.tgz"; - sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA=="; - }; - }; - "wikipeg-2.0.6" = { - name = "wikipeg"; - packageName = "wikipeg"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.6.tgz"; - sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg=="; - }; - }; "winreg-1.2.4" = { name = "winreg"; packageName = "winreg"; @@ -29453,15 +29028,6 @@ let sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; - "worker-farm-1.7.0" = { - name = "worker-farm"; - packageName = "worker-farm"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; - sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; - }; - }; "workerpool-6.5.1" = { name = "workerpool"; packageName = "workerpool"; @@ -29480,15 +29046,6 @@ let sha512 = "iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ=="; }; }; - "wrap-ansi-5.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; - }; - }; "wrap-ansi-6.2.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -29867,24 +29424,6 @@ let sha512 = "+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA=="; }; }; - "yargs-13.3.2" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; - }; - }; - "yargs-14.2.3" = { - name = "yargs"; - packageName = "yargs"; - version = "14.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz"; - sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; - }; - }; "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; @@ -29921,24 +29460,6 @@ let sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; }; }; - "yargs-parser-13.1.2" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; - }; - }; - "yargs-parser-15.0.3" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "15.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz"; - sha512 = "/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA=="; - }; - }; "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -39027,361 +38548,6 @@ in bypassCache = true; reconstructLock = true; }; - parsoid = nodeEnv.buildNodePackage { - name = "parsoid"; - packageName = "parsoid"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.11.1.tgz"; - sha512 = "t29ujC7jgKzuA25yXritkuF/rFGduN08c2CLOeSAjlKAzc/BUamZgvPWFqU/UVSRubnMYawJIQDX3m/RqKz7Xw=="; - }; - dependencies = [ - ( - sources."accepts-1.3.8" - // { - dependencies = [ - sources."negotiator-0.6.3" - ]; - } - ) - sources."ajv-6.12.6" - sources."ansi-regex-4.1.1" - sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."array-flatten-1.1.1" - sources."asap-2.0.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-0.9.2" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."babybird-0.0.1" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."bindings-1.5.0" - sources."bintrees-1.0.2" - sources."bl-1.2.3" - sources."bluebird-3.7.2" - ( - sources."body-parser-1.20.3" - // { - dependencies = [ - sources."content-type-1.0.5" - ]; - } - ) - sources."brace-expansion-1.1.11" - sources."bunyan-1.8.15" - sources."bunyan-syslog-udp-0.2.0" - sources."busboy-1.6.0" - sources."bytes-3.1.2" - sources."call-bind-1.0.8" - sources."call-bind-apply-helpers-1.0.2" - sources."call-bound-1.0.4" - sources."camelcase-5.3.1" - sources."caseless-0.12.0" - sources."clarinet-0.11.0" - sources."cliui-5.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."compressible-2.0.18" - ( - sources."compression-1.8.0" - // { - dependencies = [ - sources."negotiator-0.6.4" - ]; - } - ) - sources."concat-map-0.0.1" - sources."connect-busboy-0.0.2" - sources."content-disposition-0.5.4" - sources."content-type-git+https://github.com/wikimedia/content-type.git#master" - sources."cookie-0.7.1" - sources."cookie-signature-1.0.6" - sources."core-js-2.6.12" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."define-data-property-1.1.4" - sources."define-properties-1.2.1" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dnscache-1.0.2" - sources."dom-storage-2.1.0" - sources."domino-2.1.6" - sources."dtrace-provider-0.8.8" - sources."dunder-proto-1.0.1" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."emoji-regex-7.0.3" - sources."encodeurl-2.0.0" - sources."entities-1.1.2" - sources."errno-0.1.8" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."escape-html-1.0.3" - sources."esprima-4.0.1" - sources."etag-1.8.1" - ( - sources."express-4.21.2" - // { - dependencies = [ - sources."content-type-1.0.5" - ]; - } - ) - sources."express-handlebars-3.1.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."file-uri-to-path-1.0.0" - sources."finalhandler-1.3.1" - sources."find-up-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."gc-stats-1.4.1" - sources."gelf-stream-1.1.1" - sources."gelfling-0.3.1" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.3.0" - sources."get-proto-1.0.1" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."gopd-1.2.0" - sources."graceful-fs-4.2.11" - sources."handlebars-4.7.8" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-property-descriptors-1.0.2" - sources."has-symbols-1.1.0" - sources."has-tostringtag-1.0.2" - sources."hasown-2.0.2" - sources."hat-0.0.3" - sources."heapdump-0.3.15" - sources."hot-shots-6.8.7" - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ipaddr.js-1.9.1" - sources."is-arguments-1.2.0" - sources."is-fullwidth-code-point-2.0.0" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isstream-0.1.2" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."kad-fs-0.0.4" - sources."kad-localstorage-0.0.7" - sources."kad-memstore-0.0.1" - sources."limitation-0.2.3" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."math-intrinsics-1.1.0" - sources."media-typer-0.3.0" - sources."mediawiki-title-0.6.5" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.53.0" - ( - sources."mime-types-2.1.35" - // { - dependencies = [ - sources."mime-db-1.52.0" - ]; - } - ) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."moment-2.30.1" - sources."ms-2.0.0" - sources."msgpack5-3.6.1" - sources."mv-2.1.1" - sources."nan-2.22.2" - sources."ncp-2.0.0" - sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" - sources."neo-async-2.6.2" - sources."node-gyp-build-4.8.4" - sources."oauth-sign-0.9.0" - sources."object-inspect-1.13.4" - sources."object-keys-1.1.1" - sources."object.assign-4.1.7" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."parseurl-1.3.3" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.12" - sources."performance-now-2.1.0" - sources."pn-1.1.0" - sources."prfun-2.1.5" - sources."process-nextick-args-2.0.1" - sources."prom-client-11.5.3" - sources."promise-8.3.0" - sources."proxy-addr-2.0.7" - sources."prr-1.0.1" - sources."psl-1.15.0" - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - ( - sources."readable-stream-2.3.8" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - ( - sources."request-2.88.2" - // { - dependencies = [ - sources."qs-6.5.3" - ]; - } - ) - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - ( - sources."rimraf-2.4.5" - // { - dependencies = [ - sources."glob-6.0.4" - ]; - } - ) - sources."safe-buffer-5.2.1" - sources."safe-json-stringify-1.2.0" - sources."safer-buffer-2.1.2" - sources."semver-6.3.1" - ( - sources."send-0.19.0" - // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - } - ) - ( - sources."serve-favicon-2.5.0" - // { - dependencies = [ - sources."ms-2.1.1" - sources."safe-buffer-5.1.1" - ]; - } - ) - sources."serve-static-1.16.2" - ( - sources."service-runner-2.9.0" - // { - dependencies = [ - sources."semver-7.7.1" - sources."yargs-14.2.3" - ]; - } - ) - sources."set-blocking-2.0.0" - sources."set-function-length-1.2.2" - sources."setprototypeof-1.2.0" - sources."side-channel-1.1.0" - sources."side-channel-list-1.0.0" - sources."side-channel-map-1.0.1" - sources."side-channel-weakmap-1.0.2" - sources."simplediff-0.1.1" - sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" - sources."sshpk-1.18.0" - sources."statuses-2.0.1" - sources."streamsearch-1.1.0" - sources."string-width-3.1.0" - ( - sources."string_decoder-1.1.1" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."strip-ansi-5.2.0" - sources."tdigest-0.1.2" - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."uglify-js-3.19.3" - sources."unix-dgram-2.0.6" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."vary-1.1.2" - sources."verror-1.10.0" - sources."which-module-2.0.1" - ( - sources."wikimedia-kad-fork-1.3.6" - // { - dependencies = [ - sources."ms-0.7.3" - ]; - } - ) - sources."wikimedia-langconv-0.1.0" - sources."wikipeg-2.0.6" - sources."wordwrap-1.0.0" - sources."worker-farm-1.7.0" - sources."wrap-ansi-5.1.0" - sources."wrappy-1.0.2" - sources."y18n-4.0.3" - ( - sources."yargs-13.3.2" - // { - dependencies = [ - sources."yargs-parser-13.1.2" - ]; - } - ) - sources."yargs-parser-15.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Bidirectional runtime wikitext parser. Converts back and forth between wikitext and HTML/XML DOM with RDFa"; - homepage = "https://github.com/wikimedia/parsoid#readme"; - license = "GPL-2.0+"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; From d44159726020515f18c66f5d1f9e4dce7ff506ce Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 12:54:24 -0500 Subject: [PATCH 1756/2279] joplin-cli: 3.4.12 -> 3.5.1 Also fixes the update script so it actually works this time :clueless: --- .../by-name/jo/joplin-cli/missing-hashes.json | 75 ++++++++++++------- pkgs/by-name/jo/joplin-cli/package.nix | 6 +- pkgs/by-name/jo/joplin-cli/update.sh | 8 +- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/jo/joplin-cli/missing-hashes.json b/pkgs/by-name/jo/joplin-cli/missing-hashes.json index 7c3f79d470e0..25a41d7e9f74 100644 --- a/pkgs/by-name/jo/joplin-cli/missing-hashes.json +++ b/pkgs/by-name/jo/joplin-cli/missing-hashes.json @@ -1,76 +1,98 @@ { - "@esbuild/aix-ppc64@npm:0.25.4": "c3d5aaf00899940960a27f93a63d9169efc4ff317f10bc3608291678ce71255d657129061dbfa016a0d16fd7b6bfbeb9d37558e9113432f8ff5d04b8b8e54b2f", + "@esbuild/aix-ppc64@npm:0.25.5": "098d4c3ebe965823ee43fa708457c768caea59a5fab521e1129fbf1bc47dadf8319d7170e25a91a6af779a3b91cf4ce0b01a053410fe796b2235c262f7008e30", "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129", - "@esbuild/android-arm64@npm:0.25.4": "aa5285109d86607c973ee8d20b582cb444bae31457982dbd3b004feaa4776d145d48a6692537defd8477f2bd0bdf06ff8c7e688dd07fe30b5d031c6dd434c580", + "@esbuild/android-arm64@npm:0.25.5": "0a3b0db67072835d003519a7b297f2618b8c65cf168be7421656a3eaa7240499e3f89708e5aec507007bf8637f486dd4a2aeb48183702a5a8d0ee29432c22c8d", "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49", - "@esbuild/android-arm@npm:0.25.4": "8c5c306e03044527fb2f4eaaeda255d7f40d6a3d02aa9abd1334d67a9ea1a5ab2ab654df77eb7e17e64947c5893e1ba53fc9d3bbefa15f0692e6b56823c47abc", + "@esbuild/android-arm@npm:0.25.5": "3f85e15beb85467d5ac0bd19774fca6db353f4927a792c2281302e0f29f66931eb4ceac61216e19d9b21a5fc90c556b58bf54b4ed9d3205e81ecba16cff842d9", "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1", - "@esbuild/android-x64@npm:0.25.4": "aa8665b302b65ca62e15a34e72e43d1ce7a253a354d8684cbe5ea1a04a79d1323416b46c727d6ab73a76a4ec047fb2859b054f8f80fe9ac1d286a4d00ed754e6", + "@esbuild/android-x64@npm:0.25.5": "2033f7eb50910b4b9f8064926a8d2baf62597230dc07fd931c8def2022bc8d8e15c3ed7aa892041b6605b24d31e80afeb03e59cf7b0dc2f88a6959b821defd58", "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec", - "@esbuild/darwin-arm64@npm:0.25.4": "81b4d0482813ccff8c783035317d78220a4ec3eee3798e50b804a781a071f5790c7903c2f9216a25f5c167becd4c3d78fcf0a13e454b3973eb7d82b7ce1d4688", + "@esbuild/darwin-arm64@npm:0.25.5": "08d7238c6ea25cbf7de55ab2378b8bf3bf3d36de9bb3ca9fca15c41e5cec6cfcc619b2cbefd0d71722bd780ef5d1bcff5246b1676b62d131673532aa14e6ae5f", "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001", - "@esbuild/darwin-x64@npm:0.25.4": "633d97f18c299c8da3730ae04831895779b5f1271020cc924e06c6a5f0c5aac9f0653d60cca7d6ac23926797368301cd6ce2059b25f432aa2f1f378fcb34530d", + "@esbuild/darwin-x64@npm:0.25.5": "274767e53270755c1d1814eddd25a20e6ebd68cdf8432303d9e73b45a782579a4a898ffd68920f4052c4a5ba6ca85e59ba1a87e0005b94cac98e479e3f623a22", "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a", - "@esbuild/freebsd-arm64@npm:0.25.4": "4d52cf4e18e1f4ab2fd80c4c4a9ab9c20658c77d832d33603b5d19b3ed4565ad7186b86e30a92b78aa11694d884201d0914dba649d6277737574896a897a2af7", + "@esbuild/freebsd-arm64@npm:0.25.5": "b9ef91ca56536e988a72009c04e95f4ce18a6439151029d736c6df2af97a753f5b55f73d14da76c2c22693592a9468d57435af72bf535b2731b8fdda2aadb930", "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f", - "@esbuild/freebsd-x64@npm:0.25.4": "af75d6724969c4d831bb09209f4ddb46532516932db98a3e4c5c5dcc7f3cd0fe0930f2875fa901b8bb9c0ecfe0a65313da6127ea9387c63859e5d58cff975e68", + "@esbuild/freebsd-x64@npm:0.25.5": "8b6f53b0c0ffc7770ab078d694b705ca0169e08e0a88849fb0a54280e55f7339abc26aee969799ba6ee725b494653fc7188dc184d2f318be78506132b5e8f955", "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7", - "@esbuild/linux-arm64@npm:0.25.4": "72b7e3b8fe3bd27206577f8eceea1e0c289dc01fa2f5b03fe22f4ea27931ca664a9b93b35f9ae424e78552caec76330383fe7dc5afeeaffa0e00645ec143a49b", + "@esbuild/linux-arm64@npm:0.25.5": "c0e1925988f0b07aa8c4712f04f3cc858b52d7180ba1600c311206eeef023dbd6f0a00cb2d50fbd81064c15e69502ab95aabb433318638a5af0d9a4bd02f7294", "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c", - "@esbuild/linux-arm@npm:0.25.4": "407dcf9e8fc4ebc75689b6257be576047c03285067b5b22db74dd07ae067f8dd9126936dedfeb27934e09d0d700ecb3f8d70876fe61b90d92355f35c2a5d6540", + "@esbuild/linux-arm@npm:0.25.5": "b14daff5e6b0e9d6a613e6f11a6c0c4c1a275effe762383e6b3461c6318ec371f69d8c512bda475d634154ded6e0269345fb58281ca64c406d9dd0acfdfcf042", "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4", - "@esbuild/linux-ia32@npm:0.25.4": "47b13c9952c893e749380551dfa3580eb562a0394911a9ced68b23c0cafe116614b30ffd6744dc71ec312fab8bc7115f856f078fe29f1253a1dd99d3215a1424", + "@esbuild/linux-ia32@npm:0.25.5": "f962303d6dd5062bf8cfa31801c43c4ecf2c33cf42e8e4abbcbbea2d54619ba8bd0700a342e94e13deff856e6985e50f31bf97af283b26ff36b185da40a0f7a3", "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a", - "@esbuild/linux-loong64@npm:0.25.4": "75222fb808060b3f2507aee40c6ee877a1ed768c593dd8f192e1ea640bddf3b414080407ddaccac6d0cde35750a7f92c434e04af2c142075dc810c5b7a7ce5eb", + "@esbuild/linux-loong64@npm:0.25.5": "884863922180e39e9ae05c93f0d5e4e52627416237d892dca80f39bd1ce94c24920868cdeb8a8378b384332343c2b76bd7eba0ab56defaa4fa942bc361941a46", "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8", - "@esbuild/linux-mips64el@npm:0.25.4": "3f129931a6973a4fa470ddc46e3e3fa150aca64029951fe7a8d9616f41ddf8422d3744a30b0c5f36a35bff19b32b25c85bf1e5760537b329f18558e289213eea", + "@esbuild/linux-mips64el@npm:0.25.5": "90da507ace130201e4653e08187b6ec95d4acb9acf37fbd14f7c0aa60ac299cb9a8a2cc1c8541e376ac14206e10abc52e99bd2c1614dce53f6f66d00165671df", "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d", - "@esbuild/linux-ppc64@npm:0.25.4": "6f84018eda99c3f06d519abbdbdf15700707236b8643ba24150d5168062ba310ee3c972645554b05d4b768438697a9a04014bc884a1beb15bf05bbe1b29e34ca", + "@esbuild/linux-ppc64@npm:0.25.5": "1a82c32464c6e446bba510c5cafff685c113cadc3f65966465a54bed455cfc737ea3c11628785cd4ad8b169be03ef3b3c3e46b4ecd3e1a64a501d6ae3aa500d0", "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1", - "@esbuild/linux-riscv64@npm:0.25.4": "c5b674c2f48c5292f594141a4739f9f266ce8a1a2514eaefacc6fac761f1fa6c208981ca4c9e774c383ca33a46cad539b1fa46af6827cf89db721f33c36093c8", + "@esbuild/linux-riscv64@npm:0.25.5": "d9f49b01639ec4ceebf5455151e2632191a2bc0d96ba27ba661f4b97e314c1496a99ed5ea2d3c0bddbcf9da09bf1c06ba8f94bcab283a2f181a1c2c514848631", "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1", - "@esbuild/linux-s390x@npm:0.25.4": "a54c0972230a2264714371f6545ff0d9b20d349b08e4837e7063378886f88c08ade0ed5b2c7ba744c4679deb2f60e8485ef475f92cdbadca9d34f462a2724cc1", + "@esbuild/linux-s390x@npm:0.25.5": "14ce910d0ed879bf6549c4892a020e2a652fe5cbf8897a7a967ba20801e89582e70a3567659b96049a789a6b3fa5b34b330f4002de51f87bc734a2c83d8089a8", "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055", - "@esbuild/linux-x64@npm:0.25.4": "1ba32d40895c826e6990157a141e23d68fdf00b46d60ef3572a89781f177df75e023d38b130087b167a6e38410c3af0a6bec7b2d3b1af2a37a21c1ed70dcba45", + "@esbuild/linux-x64@npm:0.25.5": "31edf2a53f0dede747f57405d2d9e277b1ae25e40eef7a7567b8d9c11c0d23c7aa6d4f94493f5295f95dc0f75a77f8cf3a52144501a6db7bf914cff8a5370258", "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99", - "@esbuild/netbsd-arm64@npm:0.25.4": "37bc10864f14c60f995e2ef13bb53102d0ce0eab1d32dfe5f48254aafe6d791d7129cbb00c6acf9e32b561db5420c5558b84800cf6958d40d3d55a7e3f456ebb", + "@esbuild/netbsd-arm64@npm:0.25.5": "d35b97cf24a5f7e32e880b40a451c7409959acb26c9adaba1c4d5d469853982ce7e5f5e6ff33f32bde78d400c869923d2933d1620779d127e95a693422b4cc07", "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682", - "@esbuild/netbsd-x64@npm:0.25.4": "6875cc83961e613dd28f1c1d5c3b7404dc7cd4b54071596712c56574b1a24517424483c7c363c0aefa8259cf2d621e080b8270c0c242010ad04ce367aa87e897", + "@esbuild/netbsd-x64@npm:0.25.5": "7a8ecc712deda1af96de426998f39934ed5fad0cdb12b13ff31170c9dfe44f679d179c16dca7db2d686044a941a7addb9378a01f15b25efe424453ac61a0031f", "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7", - "@esbuild/openbsd-arm64@npm:0.25.4": "a7981586bbfea74746aa87113089020c73677209b71fadab43e6693c141b9415c342df01694e70aa607a1e80e9e37ccf4682dc2f095cae1ffb60c740e63e7d32", + "@esbuild/openbsd-arm64@npm:0.25.5": "9e1ccd8e6cc87b7f8c83b8fb7091b98078ac96e18d58c7a45c22c981e58be1f86d8328d48906a1869226edf1a21e62eba64e43dd2aed9046a57795ed31b8d617", "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f", - "@esbuild/openbsd-x64@npm:0.25.4": "7b1bf4a5032e32ed3ce33bf9373964bdf29e49b0e16179e179d7c7dd0a36dbc6ee98ba67e0ef637ed7823b3ac094e21ccde848a066deb091bacc6ea4726a2ede", + "@esbuild/openbsd-x64@npm:0.25.5": "a13696c3b5ea9971df702c3c6cf8ddd17490d4becd3c2596a33230e53523c2d8d11d43857973d06292ad6670163e42ca6203dbad5a4f708f250d2d5fc23dc4d0", "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a", "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d", - "@esbuild/sunos-x64@npm:0.25.4": "e1807f6dbd3bdf2f1ff9dc404fe0b667dea3bb03825344728de264c4f15323e99e3f1d8125b5c39e2aae94d2c1cad344e3b8a77b5e8c8e0004f09aa12daa82d9", + "@esbuild/sunos-x64@npm:0.25.5": "87789cae50b1aacd24d3f25b903d8016f370c6bc9c2618c243283921eea00119728e824c052fb41056ab7a5c8295442b32f598343788117499fb4145f52b6795", "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62", - "@esbuild/win32-arm64@npm:0.25.4": "0422de25c136f407bc223e1a9a65a6f528e64201a1b06b7ddcf3190045914c6d68f550a8190d18e58c4e22231acc4c7982d45bd5ceab6a739e2c539d135376fe", + "@esbuild/win32-arm64@npm:0.25.5": "4a02984bb78737aec94eac24347be38aa17e504dc7702b3de9cb59179d5df14a812ecab387ce7654e4e23e58ea7989079bdf90e515bbf774a66243387ad55c52", "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936", - "@esbuild/win32-ia32@npm:0.25.4": "5a8738ba94c72bc07bd17952cb5ba7f7f13593687cfe57792d36fcd9809082ac95ceb54b7739da68044de01f6d5d6826a2587ea2bce48b0de1c70f8de9b5257e", + "@esbuild/win32-ia32@npm:0.25.5": "e214bba446a70d3072c124f45b948af6dba335115c2f17b2bd64f64c1ef875db815cc7f6b5a57e2b9bec0bb76d7b4ebcd3afcb857b9b7e76a7c9d1a80ba0963e", "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e", - "@esbuild/win32-x64@npm:0.25.4": "0bc72a7dc50b20d2cb7cd38a0d85ab3ff0c6467ba7d817a74da8c671703f97c7c7f7a7375d0069c3f0a76571dc04a1072852e711131cf4d1a62a70e7a38449db", + "@esbuild/win32-x64@npm:0.25.5": "4c6381c6dd3ab7c8aa9fdcda4faf0f08c0982c497348844c764d5b0f7b3d1ccb3fc5bf341057a79ce4fdbb8dcddc115a7b9d5af3ea247b3434d3d451a88c7072", "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855", "@img/sharp-darwin-arm64@npm:0.34.2": "891e401a14429d293c1cdd1a9dd47b81f3fafd1b14a57f884307727662af1541dcd802a31488c394113a4ab25ebcbab1246c5ab3c90beba42f7e8afaf56f073e", + "@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f", "@img/sharp-darwin-x64@npm:0.34.2": "8d5e11f3430fa61966cb600cd23e2217f1666d481bbf754bdd731e60d4a6c34c78ff0169f7ec3463252d6542b0a3bafc0686473650b0e6b8a45fddbc49a8b52a", + "@img/sharp-darwin-x64@npm:0.34.3": "57ccfecf25b6e21b3df16694a959200ee6d00ac150bf4c5e3787bedfa8f944cbc95c7130fb6d66b207a0bd987e30f302b67de35a7481909b9bc175581da1be6f", "@img/sharp-libvips-darwin-arm64@npm:1.1.0": "f6bcbe44fa9bc0c4c87af8c655c7ecdc704b684da1169841921ff7c61692167ee3ab6a4a3a8131f206f0aa7245987be1c07a483111eadd3a684b1547ca2acf02", + "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "77a6a47fe9cbc1e6d1c66fd3f617bc64a8b710ed7cb44eee64409d49456dba054495e5ef8de3442e655ad11263ed19df554e9c33c2976e3226c121d826188587", "@img/sharp-libvips-darwin-x64@npm:1.1.0": "af6cd4ca1ccc96dcd5cb20ac45941180117baad387331a699a05e588fa843b85d327651356940d9e3e2c1fe17f0ce183043bebf882086d3cb0785bb4bc8bca05", + "@img/sharp-libvips-darwin-x64@npm:1.2.0": "334c823aa129365e7f71b3467fb3c37e7a0065d7cf192b08b2bf85d400a568da42cb236dd238ff35670f296ec5b81f08415e11c257e1c8b8df680923c3acd72a", "@img/sharp-libvips-linux-arm64@npm:1.1.0": "1d62f454f599580d64ecf72da24a08cb9347f1319e31678594f432e71762053c60c7bca5d70be720285b0754d8ed842efb160bef02abe36f5f57d735db0c012b", + "@img/sharp-libvips-linux-arm64@npm:1.2.0": "c8e7d5641ed6d1a406d08b45536fa6a9e221024bad1b3b6e7e16942500c5ca3f5ae444ac141a61ed9b43f6f7e73ee66bf973e24a90fd94dfcf83d4617492c085", "@img/sharp-libvips-linux-arm@npm:1.1.0": "5028a1ad8e247dc1624baaa084e981f2f152c7ee5f567ee253720b4553d06a969bd6285f1795b374532f99e63b44b4d39494cc3d5dd8f438dab67d4c018f3520", + "@img/sharp-libvips-linux-arm@npm:1.2.0": "9a854fff624303ed4bfdc7e936af47b3c6b07e486d0b366c8881306d49766b8e972c5a26fa53288b00f4b92a019b374bb66106c9d34f6fb23489cde5b861d2e3", "@img/sharp-libvips-linux-ppc64@npm:1.1.0": "d7c39d636083be25c71966e992803d652f5260c8fa0ece49348705c739042851c83057ec1f2d1cad8419afd3132311a6a0fcade343e69c9fbe8cbd8a12a54056", + "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "bd4e956d5f01efc158e992047460be6b8cddb9f89cdd02f4e377a178da1703ed12125f161ec2eeb99de9d11232333bf501bf5e70b85e0e6f94f1cddf7d5fc954", "@img/sharp-libvips-linux-s390x@npm:1.1.0": "612a7a967192a2bb31d757305a0abac4bdd17f4e41fed4fccee673961fd3743d1f435e9869efe324fa726d39286bcb4bfc9d5b7ceaebb2700483a3d6e2be0eb5", + "@img/sharp-libvips-linux-s390x@npm:1.2.0": "6ed6d891c2ddae07fff09290b24c1ee3531264dcdb0d0d461279fa2168c196490874f84d5b5fa045a3063e76957fee0bfa765860db486779e3acb68ab743400d", "@img/sharp-libvips-linux-x64@npm:1.1.0": "73cea31f06110740998a44cb27387d59ab5878fdb4080213a46bf312fee1e8a3b69b8d97a78611fe951fc113d7aa732d0a7d8acadf6bc77322e73b6d5228f5f2", + "@img/sharp-libvips-linux-x64@npm:1.2.0": "2a80a045237e56c5f4ec2b5c4febe9d95066beadff06bd936439f34bdd615205346dbbf996b5b4d1e43af6a128cdfd4b1a76d6fb36d9eb62f61a7248fb242728", "@img/sharp-libvips-linuxmusl-arm64@npm:1.1.0": "21d8124bccdc98817fc69022826a18a2630fbc1a3b16bfaf1d7f7c3df95d834cd75ef79e54c2edd0be44481d26e0f98ebcadc7b5e30bd73bf9afa66224cc4f8c", + "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "4225b0af93ec3a600f81930bb0ac70671cb76917a033f5ac6033252a79dd04c54b1d1bf602f79877efd07d9382106d8b2058b7c9a2bfcb7beabb6861eab0879a", "@img/sharp-libvips-linuxmusl-x64@npm:1.1.0": "6671bcdb165a7958b0478c64a5acd7eb279ebea446b91e938888a1d6e2e7c58699c55bf4a856047847e6cc56a6cdc60c9a13e2a002f081c923331585a0db2c73", + "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "d2a47388c6d1ff90bd85fa0a93f8bf9c5855c2834736bdd78d47d12689e3bcd41c695788c6bef9a8e1c5156951a675e22dc51a0ddf35a7d56c96cae3e9f55688", "@img/sharp-linux-arm64@npm:0.34.2": "4e314f4ea4182c6b67d03eaa8600afd78fa298f17e6f71e7d78fc3e2b91d65c3eca0474979cc9ab48eea7573d1150609326955a2b4ed168cbcfb881ca8632bb3", + "@img/sharp-linux-arm64@npm:0.34.3": "a4ec64134484037e6a1583b11e39a16afb95eff963bf9c52deb17557b0a35dbc509325368040b04939e859f3b9531d64e6405fe54d13b3633628a4f77bfd8672", "@img/sharp-linux-arm@npm:0.34.2": "3ec11f1c8312d4313623f20a09f60e53c07770c64dac50264f9da2e60688d992abb8a55ba4c665c88204db611cecf6e16d6397e57aac92390bddc2d7ee6a9ac2", + "@img/sharp-linux-arm@npm:0.34.3": "fe4106211c93c566d3712302c081391435caaeb6ecd41e88e94e3e9780d0f27934a02a871d6280625944f625350c4f81871d92210ff6ae5511318248a4ba3ebe", + "@img/sharp-linux-ppc64@npm:0.34.3": "0671ccb3a25e53a665d50b2b52cd779b57a07f642686bbb7311c288c44b2d861cd1eacf6bd6883421c73cc5efc8fa8536280dd48fde9a6de8d287e4a99c9ab69", "@img/sharp-linux-s390x@npm:0.34.2": "1fc3ae6eeb2af800567d26582ae97465ce5bf3aee4b4125f3b11899c8aec9b6b9e538bfc1176c257788c20e67d6f57cb1e67e9fe6c96c900d2b43127ef6a3f45", + "@img/sharp-linux-s390x@npm:0.34.3": "a5e2c3c14faa997616caf0a9296302c58b9565bb24f156dae7ad1770f5f984919fb34a0d1f59f0112205db060e8bc665842fd27621147786893619c51b81af45", "@img/sharp-linux-x64@npm:0.34.2": "8bad1ee5e9a23520da830090e29e2c8fc62c6dcf9255e490cfb664483423126b6a5417b1beb0e5433f678bd91996ebbc925c6a5f2cf477966ca4a5ebeee3fdf5", + "@img/sharp-linux-x64@npm:0.34.3": "83a82d1a97b975b64be0ed6fd35fe87609ffcbfb7a068a7ea0e67dba7ecd71f32382b86a024bcfda8aceb4ed1628f4ee4a567c4e157e9cd3c9fafa0b225fe6c2", "@img/sharp-linuxmusl-arm64@npm:0.34.2": "f4189234d072002934a77ea9131514fa4922c3d6acdec9768e9ca88cb088d67f1001a07fe19a920abcdbd7888b0a408128ec5561849829f8c99c4814dc04315a", + "@img/sharp-linuxmusl-arm64@npm:0.34.3": "53f9f3f673441b21ea0a8d6d95b7ba8f051d4c2d2d4c4cb0fd83bb7593a56f854b255a1b706ddd376f8003adc6431b602afbb8a1ffe0850896147b24912a9504", "@img/sharp-linuxmusl-x64@npm:0.34.2": "884532e80b772891d9452a1e6ad070e4668cd4aceb91935b7352d96f0813f1a6a3fafa3550e63f6f93dbcfdaafe8e8dcee7d6df6e12ebe3b66ca69d947ef0572", + "@img/sharp-linuxmusl-x64@npm:0.34.3": "ebd702f0f88121b31e87db93a87839085605a02826aba5207e9ad4fed89471daf0e32276ef3e13dc289e53042baaa8244bd43c0768c0733e3a4fce02fdf30dab", "@img/sharp-wasm32@npm:0.34.2": "ca383f6c9a8d7afc00c446b175cbc8b7827d5e02c602aeb6e889f641e3eac4b3969bbed62be8c5e595f4774b378f39d67b8f3558b1ce4ff361298e8fe3efd5ec", + "@img/sharp-wasm32@npm:0.34.3": "3a64ba7dec1883eaae60925d77b04322a81d9c2d39359fa021677252df7da3be72f469a298cf2470f7350553eb30ee84e874d7032b06fa91ce27a81e1ec5f6c7", "@img/sharp-win32-arm64@npm:0.34.2": "b7ce72e2861be11dd9ba8a0f00da57d97d4c93e88abf5f276dee516bde07527931908913cc576acc77c1f3cc61567e557cb927afcc88c5abee5d255f70f124a3", + "@img/sharp-win32-arm64@npm:0.34.3": "9328ef81ef6df02a8f83123f59c0addea7dd12681af3068e677ac274ed238321dd5522f2e4157b1a53ee0bc27ea22733263dddf5d4b65d2c5a2533ffb724f81e", "@img/sharp-win32-ia32@npm:0.34.2": "edf6719745e473a4cd13745cd3543c885dc076bee38b8f8b7ee42967670e6403d54d060c22288c3118c3872acdbfa27042df6b941e62d61e81294ed309828c77", + "@img/sharp-win32-ia32@npm:0.34.3": "cf08bf95ff895c831bd74c7c4567d6c4ac20100e0d1badd0a9f7100486f3f416022222e29fcbae79b379defd1f0bc13adccc16c119fd4705d00c11c35ca9988a", "@img/sharp-win32-x64@npm:0.34.2": "bb153458a2b1b4d794e1267b53626d7ec9080fddf38df2321b8e9d71da0eeea4669df7d88365e22c51f445595e5f281d7986dd5678cf8c331ad724f0dc29d06c", + "@img/sharp-win32-x64@npm:0.34.3": "07078e460f2749ad6422135193bacdfea1f223fab9f8442b5c0cbecb6d3e92070dd0a968219ff386a03930ec4104162627ffcad5b362ec8dc0247848deb52bbc", "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141", "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea", "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134", @@ -107,6 +129,5 @@ "lightningcss-linux-x64-gnu@npm:1.27.0": "bb1b5713ddc9d8d711b527bcce47ce3e7fd91f2058c317ad5df09cded4142a85362ee71c353dd3b332497fc32a431a22f7762ce01464ff008b2a7cf2607d3dd3", "lightningcss-linux-x64-musl@npm:1.27.0": "ec9b11bb0d70b929335f735486f8dd8fa6fc22eb95b71545b735b480b9e2b5287a24976735c2c5f4c9c50af07fb5cfdc02b65eceb6ec10256e7c9c637dedee9a", "lightningcss-win32-arm64-msvc@npm:1.27.0": "1814c0d0464c21e808a2909ebbee7e12c42fd81ecd480e7c4e31769c555f238c720087af4383fff14862764f52bf4250cd566c6c45c3d6633bee126ef3355bc3", - "lightningcss-win32-x64-msvc@npm:1.27.0": "be733309737e4c4ed3dff33ec9e80bbc2d269d07bfa3742dd30d9055adfdc2e22be4d484475a7ea7cb7940c17f001cdf64856e157ef9b7c1d2c9342041e9eae4", - "systeminformation@npm:5.21.15": "349877eb556ef2de51d4986f30ff3a2fad89eba356cf4d14ccad290599b2e565959952c95e64488932214572dd206c54792ceb8e24bd967409a8fee40b9882f3" + "lightningcss-win32-x64-msvc@npm:1.27.0": "be733309737e4c4ed3dff33ec9e80bbc2d269d07bfa3742dd30d9055adfdc2e22be4d484475a7ea7cb7940c17f001cdf64856e157ef9b7c1d2c9342041e9eae4" } diff --git a/pkgs/by-name/jo/joplin-cli/package.nix b/pkgs/by-name/jo/joplin-cli/package.nix index 58bb0e5ad2f0..9a97608786fd 100644 --- a/pkgs/by-name/jo/joplin-cli/package.nix +++ b/pkgs/by-name/jo/joplin-cli/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "joplin-cli"; - version = "3.4.12"; + version = "3.5.1"; src = fetchFromGitHub { owner = "laurent22"; @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { # there's a file with a weird name that causes a hash mismatch on darwin rm $out/packages/app-cli/tests/support/photo* ''; - hash = "sha256-p9MY7E0qa7LcXBpGs/DmX2A2jXQoOPYiRo/nEzkkQd0="; + hash = "sha256-NNtdY6ajMfcMWj/AIo+b2nhylBCqyOIwCepYx/ZNCBY="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes postPatch; - hash = "sha256-7sZX39OtNNPq5RE7+Oj58QqHhcrTY8FOdncKp3b40jQ="; + hash = "sha256-EGP/nnz4u6I0efTQu41lgmk0tuHpiavVKHRdiSYdEUs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jo/joplin-cli/update.sh b/pkgs/by-name/jo/joplin-cli/update.sh index 1776cc2fdbaa..7bc1de59d2aa 100755 --- a/pkgs/by-name/jo/joplin-cli/update.sh +++ b/pkgs/by-name/jo/joplin-cli/update.sh @@ -13,14 +13,10 @@ fi nix-update "$UPDATE_NIX_PNAME" --version "$NEW_VERSION" || true -HOME=$(mktemp -d) -export HOME - -src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src") WORKDIR=$(mktemp -d) -cp --recursive --no-preserve=mode "$src/*" "$WORKDIR" -pushd "$WORKDIR" +git clone "https://github.com/laurent22/joplin" -b "v$NEW_VERSION" "$WORKDIR/src" +pushd "$WORKDIR/src" yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json" popd rm -rf "$WORKDIR" From b7e8a33ae0ce94f99973e6a27b3e0fa4cd7a07ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sat, 8 Nov 2025 17:54:39 +0000 Subject: [PATCH 1757/2279] claude-code: 2.0.35 -> 2.0.36 --- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index eebf0b81eb5b..7179d9c5e136 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.35", + "version": "2.0.36", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.35", + "version": "2.0.36", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 370e33bc8d25..eeca6d40bee7 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.35"; + version = "2.0.36"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-cPy2xudIH1OVVzDlq5YAg1uFu59h6zDOvXpKaJ+fuP8="; + hash = "sha256-6tbbCaF1HIgdk1vpbgQnBKWghaKKphGIGZoXtmnhY2I="; }; - npmDepsHash = "sha256-07MUZ8i6K/uLodyDM1kFnhGGkRB2uVf88CkbaAVw5jk="; + npmDepsHash = "sha256-hgIWGAXqT517B+v/M15acseSf9NJGeHk2G4gZozFssw="; postPatch = '' cp ${./package-lock.json} package-lock.json From 32e145b3ca308653782d183c610657a72d55e281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 17:55:58 +0000 Subject: [PATCH 1758/2279] python3Packages.ax-platform: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/ax-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index b853ccf3858e..8808854e3550 100644 --- a/pkgs/development/python-modules/ax-platform/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "ax-platform"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "facebook"; repo = "ax"; tag = version; - hash = "sha256-DHB/BcD913gano5N7dlAbB+Tfg1dMTRP3AR1HwJjkLg="; + hash = "sha256-HZRo7jo5f3nnAha3evLTmI3caLhz7kIbP9CA6zaH4Zg="; }; env.ALLOW_BOTORCH_LATEST = "1"; From 35bbdb28111c191a4166b5f0e5436a22bd4ed287 Mon Sep 17 00:00:00 2001 From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com> Date: Sat, 8 Nov 2025 20:14:49 +0200 Subject: [PATCH 1759/2279] burpsuite: 2025.10.1 -> 2025.10.3 --- pkgs/by-name/bu/burpsuite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 8d250a144294..ecd564619781 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.10.1"; + version = "2025.10.3"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-aLP8jVHuKmp4yzcd1KsgidAhWUxoJo0beGwq/6I4n4A="; + hash = "sha256-4XGIFjklYfHBJ/HIdJ7C1eTpLAq0nC3VSP6O/R3tdJw="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-HiYdJrnTg0HkCt+lXKkhfGawp/NZQmhH4sGytlpiLU8="; + hash = "sha256-28dsTC0AEHT6IO9he1Rc3xglnf8epdXJitZ1BdCLrYE="; }; src = fetchurl { From 4a0ac9806f3a25b3e656813b6b7aff74215bead6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 8 Nov 2025 20:15:45 +0200 Subject: [PATCH 1760/2279] or-tools: downgrade highs to 1.10.0 again This is a local revert of 58daf511687f191829238fc7f571e08dc9dedf56, working around https://github.com/google/or-tools/issues/4911. --- pkgs/by-name/or/or-tools/package.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 3d13cdf0b797..c8e9ba327ff1 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -35,6 +35,25 @@ let python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; }; pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; }; + # local revert of 58daf511687f191829238fc7f571e08dc9dedf56, + # working around https://github.com/google/or-tools/issues/4911 + _highs = highs.overrideAttrs (old: rec { + version = "1.10.0"; + src = fetchFromGitHub { + owner = "ERGO-Code"; + repo = "HiGHS"; + rev = "v${version}"; + hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac="; + }; + # CMake Error in CMakeLists.txt: + # Imported target "highs::highs" includes non-existent path + # "/include" + # in its INTERFACE_INCLUDE_DIRECTORIES. + postPatch = '' + sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt + ''; + }); + in stdenv.mkDerivation (finalAttrs: { pname = "or-tools"; @@ -124,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { glpk gbenchmark gtest - highs + _highs python3.pkgs.absl-py python3.pkgs.pybind11 python3.pkgs.pybind11-abseil @@ -138,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ abseil-cpp - highs + _highs protobuf python-protobuf python3.pkgs.immutabledict From 368a919d928ef9b89293b4af9aa7a24c4b20b9a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 18:30:34 +0000 Subject: [PATCH 1761/2279] python3Packages.tencentcloud-sdk-python: 3.0.1483 -> 3.0.1484 --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e639430287ce..cb0a9cd40ebc 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1483"; + version = "3.0.1484"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-yidKh50qnikyhBeuMKxiVD4xdqRO2ReJp1SuD266lHM="; + hash = "sha256-nAfQTg4sufpyKAH37/TaUzklvIY5UPTLKf0t3chUAcI="; }; build-system = [ setuptools ]; From 498ffd776e42ed651d53ac48187590409a25bc58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 18:37:15 +0000 Subject: [PATCH 1762/2279] p2pool: 4.11 -> 4.12 --- pkgs/by-name/p2/p2pool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index 262a38bf5c11..fe56cad06d58 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "p2pool"; - version = "4.11"; + version = "4.12"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${finalAttrs.version}"; - hash = "sha256-qoz7wMI6hheF+Pecfq3pPZRc2H3nkrxKRMWR2qmJdsI="; + hash = "sha256-Yrc36tibHanXZcE3I+xcmkCzBALE09zi1Zg0Lz3qS2g="; fetchSubmodules = true; }; From 7446242d145fdc4b18848b154df95c9fdbcaf79d Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 8 Nov 2025 13:52:39 -0500 Subject: [PATCH 1763/2279] cargo-binstall: adopt --- pkgs/by-name/ca/cargo-binstall/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index c894974e9a07..76b2d4ed3e82 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -68,6 +68,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/cargo-bins/cargo-binstall"; changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mdaniels5757 ]; }; } From 39750bff983510df1efc705f17acf2f16e4699d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 18:56:21 +0000 Subject: [PATCH 1764/2279] sarasa-gothic: 1.0.33 -> 1.0.34 --- pkgs/by-name/sa/sarasa-gothic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 9514d0a2a102..48192fa2eb07 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.33"; + version = "1.0.34"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-aIZWTrG1NimE6cPzs1drrTfvbHAuObUOjlPgZv3PaSg="; + hash = "sha256-wCUKEGq6qL+rsRXEuLOqfRLWsWkMd8khfQ+rFKfEkRQ="; }; sourceRoot = "."; From ee911c1f6ae59ce519046a07d5696da9217331c5 Mon Sep 17 00:00:00 2001 From: "Commentator2.0" <46420447+CommentatorForAll@users.noreply.github.com> Date: Sat, 8 Nov 2025 20:01:04 +0100 Subject: [PATCH 1765/2279] frigate: fix broken string escape --- nixos/modules/services/video/frigate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix index efe9abd37a01..d937eb60bdea 100644 --- a/nixos/modules/services/video/frigate.nix +++ b/nixos/modules/services/video/frigate.nix @@ -578,7 +578,7 @@ in add_header Cache-Control "public"; ''; }; - "~ ^/.*-([A-Za-z0-9]+)\.webmanifest$" = { + "~ ^/.*-([A-Za-z0-9]+)\\.webmanifest$" = { root = cfg.package.web; extraConfig = '' access_log off; From bd76d34694d80430a3bd1026e2b6f5be368fa95e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 19:05:55 +0000 Subject: [PATCH 1766/2279] vimPlugins.cmp-async-path: 0-unstable-2025-04-13 -> 0-unstable-2025-11-04 --- .../vim/plugins/non-generated/cmp-async-path/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix index 89a6d7e91767..ff7883e7b4b4 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -7,14 +7,14 @@ }: vimUtils.buildVimPlugin { pname = "cmp-async-path"; - version = "0-unstable-2025-04-13"; + version = "0-unstable-2025-11-04"; src = fetchFromGitea { domain = "codeberg.org"; owner = "FelipeLema"; repo = "cmp-async-path"; - rev = "0ed1492f59e730c366d261a5ad822fa37e44c325"; - hash = "sha256-J1Iw7yNfvWq7Jul25Eyx4qk9lSiLpZt4TRvTYi1DXtk="; + rev = "b8aade3a0626f2bc1d3cd79affcd7da9f47f7ab1"; + hash = "sha256-gaK2aemMX4fzH85idIPuVZ1+ay5vCNqgxU15J4Jz5wU="; }; checkInputs = [ vimPlugins.nvim-cmp ]; From d07a7548f64a1d0a0d904b0e16a419915e02ece7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 19:12:12 +0000 Subject: [PATCH 1767/2279] hyprutils: 0.10.0 -> 0.10.1 --- pkgs/by-name/hy/hyprutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index b949294ee968..8bece943d05b 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A="; + hash = "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ="; }; nativeBuildInputs = [ From dc249fa9b321804460c82356fce126f2e4702f3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 19:21:43 +0000 Subject: [PATCH 1768/2279] cursor-cli: 0-unstable-2025-10-28 -> 0-unstable-2025-11-06 --- pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index bdb8015ce19e..558e212344f1 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -9,26 +9,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-mZ0T7rrKzwvaNUbrHBy3XO04vZSO6RQ4RmJmrdfaoJA="; + url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-otTYUTmGqqXT4Jx+r1RlFjJD7FYU62QRl+y69eo/khs="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-bchHYPQ0O/0YWiPdj3wnq43p/fKFoP4KXpeSVWpLYpE="; + url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-jPqgGdtjLg4qZWktz1/X1LI0+e6RYcCtuLw91k1Xofg="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-PWx5QAs84gWNOHYZL20uFnW+m4rApRT6g4LtabjL+lw="; + url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-UVR+iomdZzmPfj4o4N4FfUSCa9ttJre7Ipso5weIn1k="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-VW76Lx2VKspiGkphp74ib4+F5FCdu8793f+xvD67OpM="; + url = "https://downloads.cursor.com/lab/2025.11.06-8fe8a63/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-t5s9TfLLA/VLCYNF+fsf9wgfk2W96eQSIbW/cdUKMuY="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2025-10-28"; + version = "0-unstable-2025-11-06"; src = sources.${hostPlatform.system}; From 9477be20e1b1963c347cd2c44b03190a4099cd0a Mon Sep 17 00:00:00 2001 From: Thierry Delafontaine Date: Sat, 8 Nov 2025 20:24:26 +0100 Subject: [PATCH 1769/2279] mods: remove maintainer delafthi --- pkgs/by-name/mo/mods/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/mo/mods/package.nix b/pkgs/by-name/mo/mods/package.nix index da9250260f89..34d96d91b44e 100644 --- a/pkgs/by-name/mo/mods/package.nix +++ b/pkgs/by-name/mo/mods/package.nix @@ -77,7 +77,6 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ dit7ya caarlos0 - delafthi ]; mainProgram = "mods"; }; From 6bc521cbc067a3852e7caa4acf8b3062de7135cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 19:31:32 +0000 Subject: [PATCH 1770/2279] mprisence: 1.2.9 -> 1.2.10 --- pkgs/by-name/mp/mprisence/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix index bf407184a86e..e97587d61cdd 100644 --- a/pkgs/by-name/mp/mprisence/package.nix +++ b/pkgs/by-name/mp/mprisence/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mprisence"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "lazykern"; repo = "mprisence"; tag = "v${finalAttrs.version}"; - hash = "sha256-qF0jG9tc3tp2ChGCGE3YUZoTaQoTmLLd39iBWeSS7wU="; + hash = "sha256-M0UfdUw65PD3HuKAh6PbbuNzyHVbYUfMuQT8em6OnaM="; }; - cargoHash = "sha256-32zBqZJoo0C+4ogEbEz4rxyATG9dbibp7NxMXYYJNsE="; + cargoHash = "sha256-STvMAkCFrMjekz2wk2UtEi6nsEVFnuIhFinxWWbcIto="; nativeBuildInputs = [ pkg-config ]; From a77aa2b0c1c1d669ecaf263276bb5a17536b0c1f Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 8 Nov 2025 19:16:48 +0100 Subject: [PATCH 1771/2279] hop: drop The package hasn't been build succesfully since 2024-12. Co-authored-by: Tom --- pkgs/by-name/ho/hop/package.nix | 43 --------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/by-name/ho/hop/package.nix diff --git a/pkgs/by-name/ho/hop/package.nix b/pkgs/by-name/ho/hop/package.nix deleted file mode 100644 index cdf9785287e7..000000000000 --- a/pkgs/by-name/ho/hop/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - bigloo, -}: - -# Compute the “release” version of bigloo (before the first dash, if any) -let - bigloo-release = - let - inherit (lib) head splitString; - in - head (splitString "-" (builtins.parseDrvName bigloo.name).version); -in - -stdenv.mkDerivation rec { - pname = "hop"; - version = "3.4.4"; - src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/hop-${version}.tar.gz"; - sha256 = "sha256-GzXh4HC+SFFoUi7SMqu36iYRPAJ6tMnOHd+he6n9k1I="; - }; - - postPatch = '' - substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")' - ''; - - buildInputs = [ bigloo ]; - - configureFlags = [ - "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" - ]; - - meta = with lib; { - description = "Multi-tier programming language for the Web 2.0 and the so-called diffuse Web"; - homepage = "http://hop.inria.fr/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61b6b6f12bdd..c22396988d2b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -703,6 +703,7 @@ mapAliases { himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 hiPrio = warnAlias "'hiPrio' has been removed from pkgs, use `lib.hiPrio` instead" lib.hiPrio; # Added 2025-10-30 hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20 + hop = throw "'hop' has been removed due to lack of maintenance"; # Added 2025-11-08 hostPlatform = warnAlias "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'" stdenv.hostPlatform; # Converted to warning 2025-10-28 hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11 hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27 From 83928d8a193ea875fd43ce6578db86b931b6a6b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 19:38:26 +0000 Subject: [PATCH 1772/2279] terraform-providers.hashicorp_awscc: 1.62.0 -> 1.63.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 cc611a0c2f23..5725d39370af 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -498,13 +498,13 @@ "vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw=" }, "hashicorp_awscc": { - "hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=", + "hash": "sha256-eaFzTQehn1nIq0Zl/8r2AtmPQnhh7X44q/6JVzIzX2A=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.62.0", + "rev": "v1.63.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk=" + "vendorHash": "sha256-wP7A2k0sXfbfQjKkDx+rOC8vgBhSQXak3gdera8inzY=" }, "hashicorp_azuread": { "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=", From 2e80303fbb2aeac984737d933a864f2891fe9922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 19:58:14 +0000 Subject: [PATCH 1773/2279] vsce: 3.6.2 -> 3.7.0 --- pkgs/by-name/vs/vsce/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 9fb128393e93..4002ec7f627d 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "vsce"; - version = "3.6.2"; + version = "3.7.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; tag = "v${finalAttrs.version}"; - hash = "sha256-TcBzXDNpjJvI+0ir80d+HFp6mF/Ecle4vhOMcACvF7M="; + hash = "sha256-dNSO+PoUNQUtvS6NZJ/InOYqI4vav+WNg6kCA+CaWL8="; }; - npmDepsHash = "sha256-G09pn6JX389GMbIzYmmLutH7qwiaDb8V9zCGAOFaDdk="; + npmDepsHash = "sha256-rqwb1bz/OFHzL8GgqMZtuqYkeST5qlFybDRSFOx7LtU="; postPatch = '' substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"' From d51ca62a5d927a6193c4c560d10b8aba57467756 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 7 Nov 2025 15:28:22 -0800 Subject: [PATCH 1774/2279] miro: 0.7.0 -> 0.7.2 bump --- pkgs/by-name/mi/miro/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index 2b54d70c09a3..3543f9f9baec 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miro"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "vincent-uden"; repo = "miro"; tag = "v${finalAttrs.version}"; - hash = "sha256-tkZSyxdcHeumBMlinwA3DT2Y/FgLzbeuVbsFbTfvINg="; + hash = "sha256-2RyBjWeb94bxiZ7hy//654YP1bc6bl13slNxRwrhtyk="; }; - cargoHash = "sha256-4NE9nMmOTQpWvMsGexW6GpBGao4yQoofrzGaaM4+rWE="; + cargoHash = "sha256-wRlze8VZ9I4O/eycWvlNPUsa/ucBeZ8SWtD9eJ+Uxvs="; nativeBuildInputs = [ rustPlatform.bindgenHook From f9d65f372b638162f2e8174ef135bb0878c43994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 20:55:02 +0100 Subject: [PATCH 1775/2279] ipp-usb: fix man page being installed into double PREFIX, use --replace-fail everywhere (cherry picked from commit 4ed34a26057d00ebcdb0b482f7ca3971f8a519ba) --- pkgs/by-name/ip/ipp-usb/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix index c2350842ee2f..1adee0a56ffd 100644 --- a/pkgs/by-name/ip/ipp-usb/package.nix +++ b/pkgs/by-name/ip/ipp-usb/package.nix @@ -21,11 +21,13 @@ buildGoModule rec { postPatch = '' # rebuild with patched paths rm ipp-usb.8 - substituteInPlace Makefile --replace "install: all" "install: man" - substituteInPlace systemd-udev/ipp-usb.service --replace "/sbin" "$out/bin" - for i in Makefile paths.go ipp-usb.8.md; do - substituteInPlace $i --replace "/usr" "$out" - substituteInPlace $i --replace "/var/ipp-usb" "/var/lib/ipp-usb" + substituteInPlace Makefile \ + --replace-fail "install: all" "install: man" \ + --replace-fail "/usr/" "/" + substituteInPlace systemd-udev/ipp-usb.service --replace-fail "/sbin" "$out/bin" + for i in paths.go ipp-usb.8.md; do + substituteInPlace $i --replace-fail "/usr" "$out" + substituteInPlace $i --replace-fail "/var/ipp-usb" "/var/lib/ipp-usb" done ''; @@ -43,7 +45,7 @@ buildGoModule rec { doInstallCheck = true; postInstall = '' - # to accomodate the makefile + # to accommodate the makefile cp $out/bin/ipp-usb . make install DESTDIR=$out ''; From f3443782eae965d291c5a330ac9c859776d75d94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 20:07:47 +0000 Subject: [PATCH 1776/2279] solvespace: 3.1 -> 3.2 --- pkgs/by-name/so/solvespace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix index 92b397f8d071..589da2f5d793 100644 --- a/pkgs/by-name/so/solvespace/package.nix +++ b/pkgs/by-name/so/solvespace/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "solvespace"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "solvespace"; repo = "solvespace"; rev = "v${version}"; - hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA="; + hash = "sha256-+ZSAC7wDOaN51RjbSAqaQOp10JzxSME3g0ln4VdkwcA="; fetchSubmodules = true; }; From 1478dc2ae23d5aedcd98138b8e54b818257e715d Mon Sep 17 00:00:00 2001 From: flurie Date: Sat, 8 Nov 2025 13:09:20 -0500 Subject: [PATCH 1777/2279] SDL_audiolib: unbundle fmt to fix build on darwin --- pkgs/by-name/sd/SDL_audiolib/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/sd/SDL_audiolib/package.nix b/pkgs/by-name/sd/SDL_audiolib/package.nix index 6ee67a1faeec..22f782e32fc9 100644 --- a/pkgs/by-name/sd/SDL_audiolib/package.nix +++ b/pkgs/by-name/sd/SDL_audiolib/package.nix @@ -6,6 +6,7 @@ pkg-config, stdenv, flac, + fmt, }: stdenv.mkDerivation (finalAttrs: { @@ -29,10 +30,20 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 flac + fmt ]; strictDeps = true; + postPatch = '' + # Remove the bundled fmt directory + rm -rf 3rdparty/fmt + + # Patch CMakeLists.txt to replace bundled fmt with provided library + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_bundled_fmtlib()' 'find_package(fmt REQUIRED)' + ''; + cmakeFlags = [ (lib.cmakeBool "USE_DEC_ADLMIDI" false) (lib.cmakeBool "USE_DEC_BASSMIDI" false) From 5708ecc352bad209cf2e1db7dd6aa130f1eac328 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 20:12:41 +0000 Subject: [PATCH 1778/2279] terraform-providers.ciscodevnet_aci: 2.17.0 -> 2.18.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 cc611a0c2f23..2c8a8119e117 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -154,11 +154,11 @@ "vendorHash": "sha256-Puf8Rex1o3P1XAO+LIXBWx9MTUUsaD+iJQkFLjqVJA0=" }, "ciscodevnet_aci": { - "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=", + "hash": "sha256-MxcHtbuU2tMJpF8seEDqmsnamm58Lugi3Hw+l9wAcOU=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", "vendorHash": null }, From 28f11e5316770efa1df306e3b5c78eadf647938d Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 17:07:54 -0800 Subject: [PATCH 1779/2279] python3Packages.redshift-connector: disable broken tests --- .../python-modules/redshift-connector/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 63621cb51e97..249a9807bfe5 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -60,6 +60,18 @@ buildPythonPackage rec { # integration tests require a Redshift cluster enabledTestPaths = [ "test/unit" ]; + disabledTests = [ + # AttributeError: 'itertools._tee' object has no attribute 'status_code' + # This is due to a broken pytest_mock. + # TODO Remove once pytest-mock 3.15.1 lands. + "test_form_based_authentication_uses_user_set_login_to_rp" + "test_form_based_authentication_payload_is_correct" + "test_form_based_authentication_login_fails_should_fail" + "test_azure_oauth_based_authentication_payload_is_correct" + "test_okta_authentication_payload_is_correct" + "test_set_cluster_identifier_calls_describe_custom_domain_associations" + ]; + __darwinAllowLocalNetworking = true; # required for tests meta = { From e1604ac22848b472463e5ffd4d4a4945eef35251 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 6 Nov 2025 17:01:50 -0800 Subject: [PATCH 1780/2279] python3Packages.redshift-connector: 2.1.8 -> 2.1.9 --- .../python-modules/redshift-connector/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 249a9807bfe5..50da7338b7e7 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.1.8"; + version = "2.1.9"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "amazon-redshift-python-driver"; tag = "v${version}"; - hash = "sha256-q8TQYiPmm3w9Bh4+gvVW5XAa4FZ3+/MZqZL0RCgl77E="; + hash = "sha256-x0VhICEtZZz4Q7btCl7nP0D+YHPIKqbEUWnrEekJpt0="; }; # remove addops as they add test directory and coverage parameters to pytest @@ -43,6 +43,7 @@ buildPythonPackage rec { dependencies = [ beautifulsoup4 boto3 + botocore lxml packaging pytz From e317c4d283e4cf784c49900908f4639df00a4459 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Sat, 8 Nov 2025 20:14:40 +0000 Subject: [PATCH 1781/2279] nixosTests: fix evaluation errors Pass lib to NixOS test functions that need it following 03bb7d81954d (all-packages: do not export lib functions from pkgs, 2025-10-30) / #455775. --- nixos/tests/all-tests.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 80b652004d52..15f15e2fc212 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -818,7 +818,10 @@ in ksm = runTest ./ksm.nix; kthxbye = runTest ./kthxbye.nix; kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { }; - kubo = import ./kubo { inherit runTest; }; + kubo = import ./kubo { + inherit runTest; + inherit (pkgs) lib; + }; lact = runTest ./lact.nix; ladybird = runTest ./ladybird.nix; languagetool = runTest ./languagetool.nix; @@ -963,7 +966,10 @@ in mopidy = runTest ./mopidy.nix; morph-browser = runTest ./morph-browser.nix; mosquitto = runTest ./mosquitto.nix; - movim = import ./web-apps/movim { inherit runTest; }; + movim = import ./web-apps/movim { + inherit runTest; + inherit (pkgs) lib; + }; mpd = runTest ./mpd.nix; mpv = runTest ./mpv.nix; mtp = runTest ./mtp.nix; From 8a036f3d17d6146a1753e48c5eba431173336dc1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 8 Nov 2025 12:34:23 -0800 Subject: [PATCH 1782/2279] python3Packages.curl-cffi: pin websockets at 12.0 --- .../python-modules/curl-cffi/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index ac1eb455aa11..4f5a6eec18f0 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -19,10 +18,30 @@ python-multipart, trustme, uvicorn, - websockets, writableTmpDirAsHomeHook, }: +let + # This is only used for testing and requires 12.0 specifically + # due to incompatible API changes in later versions. + websockets = buildPythonPackage rec { + pname = "websockets"; + version = "12.0"; + pyproject = true; + src = fetchFromGitHub { + owner = "aaugustin"; + repo = "websockets"; + tag = version; + hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg="; + }; + + build-system = [ setuptools ]; + + doCheck = false; + + pythonImportsCheck = [ "websockets" ]; + }; +in buildPythonPackage rec { pname = "curl-cffi"; version = "0.14.0b2"; From 3974c53827d125d006662ea3ccda8391b9a11932 Mon Sep 17 00:00:00 2001 From: Alexis Williams Date: Thu, 16 Oct 2025 16:27:15 -0700 Subject: [PATCH 1783/2279] croncpp: init at 2023.03.30 --- pkgs/by-name/cr/croncpp/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/cr/croncpp/package.nix diff --git a/pkgs/by-name/cr/croncpp/package.nix b/pkgs/by-name/cr/croncpp/package.nix new file mode 100644 index 000000000000..db6430949da0 --- /dev/null +++ b/pkgs/by-name/cr/croncpp/package.nix @@ -0,0 +1,28 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "croncpp"; + version = "2023.03.30"; + + src = fetchFromGitHub { + owner = "mariusbancila"; + repo = "croncpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SBjNzy54OGEMemBp+c1gaH90Dc7ySL915z4E64cBWTI="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "C++11/14/17 header-only cross-platform library for handling CRON expressions"; + homepage = "https://github.com/mariusbancila/croncpp"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ typedrat ]; + }; +}) From b3605e26ae5becc3706698342bde34b5ffc54dbf Mon Sep 17 00:00:00 2001 From: Alexis Williams Date: Thu, 16 Oct 2025 16:27:31 -0700 Subject: [PATCH 1784/2279] uni-algo: init at 1.2.0 --- pkgs/by-name/un/uni-algo/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/un/uni-algo/package.nix diff --git a/pkgs/by-name/un/uni-algo/package.nix b/pkgs/by-name/un/uni-algo/package.nix new file mode 100644 index 000000000000..fcb105180de9 --- /dev/null +++ b/pkgs/by-name/un/uni-algo/package.nix @@ -0,0 +1,28 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uni-algo"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "uni-algo"; + repo = "uni-algo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IyQrL/DWDj87GplSGJC4iQJAzNURLh9TRko5l+EIfuU="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Unicode Algorithms Implementation for C/C++"; + homepage = "https://github.com/uni-algo/uni-algo"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ typedrat ]; + }; +}) From c3f511b9e6780f7d7c920ab173420539d8fa8ef8 Mon Sep 17 00:00:00 2001 From: Alexis Williams Date: Thu, 16 Oct 2025 19:19:55 -0700 Subject: [PATCH 1785/2279] dragonflydb: 0.1.0 -> 1.34.2 --- .../dr/dragonflydb/external-libs.patch | 115 ++++ pkgs/by-name/dr/dragonflydb/fixes.patch | 132 ----- pkgs/by-name/dr/dragonflydb/glog.patch | 553 ------------------ .../dr/dragonflydb/helio-third-party.patch | 150 +++++ pkgs/by-name/dr/dragonflydb/package.nix | 244 ++++++-- 5 files changed, 460 insertions(+), 734 deletions(-) create mode 100644 pkgs/by-name/dr/dragonflydb/external-libs.patch delete mode 100644 pkgs/by-name/dr/dragonflydb/fixes.patch delete mode 100644 pkgs/by-name/dr/dragonflydb/glog.patch create mode 100644 pkgs/by-name/dr/dragonflydb/helio-third-party.patch diff --git a/pkgs/by-name/dr/dragonflydb/external-libs.patch b/pkgs/by-name/dr/dragonflydb/external-libs.patch new file mode 100644 index 000000000000..368c0b2a139e --- /dev/null +++ b/pkgs/by-name/dr/dragonflydb/external-libs.patch @@ -0,0 +1,115 @@ +diff --git a/src/external_libs.cmake b/src/external_libs.cmake +index 62e6e879..8934777f 100644 +--- a/src/external_libs.cmake ++++ b/src/external_libs.cmake +@@ -1,7 +1,6 @@ + add_third_party( + lua +- GIT_REPOSITORY https://github.com/dragonflydb/lua +- GIT_TAG Dragonfly-5.4.6a ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/lua/. + CONFIGURE_COMMAND echo + BUILD_IN_SOURCE 1 + BUILD_COMMAND ${DFLY_TOOLS_MAKE} all +@@ -19,18 +18,16 @@ endif() + + add_third_party( + dconv +- URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz +- PATCH_COMMAND ${SED_REPL} "/static const std::ctype/d" +- /double-conversion/string-to-double.cc +- COMMAND ${SED_REPL} "/std::use_facet/double-conversion/string-to-double.cc +- COMMAND ${SED_REPL} "s/cType.tolower/std::tolower/g" /double-conversion/string-to-double.cc ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/dconv/. ++ PATCH_COMMAND echo ++ CMAKE_PASS_FLAGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + LIB libdouble-conversion.a + ) + + add_third_party( + reflex +- URL https://github.com/Genivia/RE-flex/archive/refs/tags/v5.2.2.tar.gz +- PATCH_COMMAND autoreconf -fi ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/reflex/. ++ PATCH_COMMAND echo + CONFIGURE_COMMAND /configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex + CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER} + ) +@@ -41,16 +38,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex") + + add_third_party( + jsoncons +- GIT_REPOSITORY https://github.com/dragonflydb/jsoncons +- GIT_TAG Dragonfly.178 +- GIT_SHALLOW 1 ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/jsoncons/. + CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON" + LIB "none" + ) + + add_third_party( + lz4 +- URL https://github.com/lz4/lz4/archive/refs/tags/v1.10.0.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/lz4/. + + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND echo skip +@@ -65,7 +60,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG") + file(MAKE_DIRECTORY ${MIMALLOC_INCLUDE_DIR}) + + ExternalProject_Add(mimalloc2_project +- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.2.4.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/mimalloc224/. + DOWNLOAD_DIR ${THIRD_PARTY_DIR}/mimalloc2 + SOURCE_DIR ${THIRD_PARTY_DIR}/mimalloc2 + # INSTALL_DIR ${MIMALLOC_ROOT_DIR} +@@ -118,21 +113,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO + + add_third_party( + croncpp +- URL https://github.com/mariusbancila/croncpp/archive/refs/tags/v2023.03.30.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/croncpp/. + LIB "none" + ) + + if (WITH_SEARCH) + add_third_party( + uni-algo +- URL https://github.com/uni-algo/uni-algo/archive/refs/tags/v1.0.0.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/uni-algo/. + + CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=17" + ) + + add_third_party( + hnswlib +- URL https://github.com/nmslib/hnswlib/archive/refs/tags/v0.7.0.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hnswlib/. + + BUILD_COMMAND echo SKIP + INSTALL_COMMAND cp -R /hnswlib ${THIRD_PARTY_LIB_DIR}/hnswlib/include/ +@@ -142,21 +137,20 @@ endif() + + add_third_party( + fast_float +- URL https://github.com/fastfloat/fast_float/archive/refs/tags/v5.2.0.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/fast_float/. + LIB "none" + ) + + add_third_party( + flatbuffers +- URL https://github.com/google/flatbuffers/archive/refs/tags/v23.5.26.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/flatbuffers/. + CMAKE_PASS_FLAGS "-DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_LIBCXX_WITH_CLANG=OFF + -DFLATBUFFERS_BUILD_FLATC=OFF" + ) + + add_third_party( + hdr_histogram +- GIT_REPOSITORY https://github.com/HdrHistogram/HdrHistogram_c/ +- GIT_TAG 652d51bcc36744fd1a6debfeb1a8a5f58b14022c ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hdr_histogram/. + CMAKE_PASS_FLAGS "-DHDR_LOG_REQUIRED=OFF -DHDR_HISTOGRAM_BUILD_PROGRAMS=OFF + -DHDR_HISTOGRAM_INSTALL_SHARED=OFF" + LIB libhdr_histogram_static.a diff --git a/pkgs/by-name/dr/dragonflydb/fixes.patch b/pkgs/by-name/dr/dragonflydb/fixes.patch deleted file mode 100644 index d2992fbbaf82..000000000000 --- a/pkgs/by-name/dr/dragonflydb/fixes.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake -index aeb78d9..e9d4e6b 100644 ---- a/helio/cmake/third_party.cmake -+++ b/helio/cmake/third_party.cmake -@@ -143,7 +143,7 @@ endfunction() - - FetchContent_Declare( - gtest -- URL https://github.com/google/googletest/archive/release-1.11.0.zip -+ DOWNLOAD_COMMAND true - ) - - FetchContent_GetProperties(gtest) -@@ -154,7 +154,7 @@ endif () - - FetchContent_Declare( - benchmark -- URL https://github.com/google/benchmark/archive/v1.6.1.tar.gz -+ DOWNLOAD_COMMAND true - ) - - FetchContent_GetProperties(benchmark) -@@ -169,7 +169,7 @@ endif () - - FetchContent_Declare( - abseil_cpp -- URL https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz -+ DOWNLOAD_COMMAND true - PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20211102.patch" - ) - -@@ -183,11 +183,7 @@ endif() - - FetchContent_Declare( - glog -- GIT_REPOSITORY https://github.com/romange/glog -- GIT_TAG Absl -- -- GIT_PROGRESS TRUE -- GIT_SHALLOW TRUE -+ DOWNLOAD_COMMAND true - ) - - FetchContent_GetProperties(glog) -@@ -233,10 +229,7 @@ endif() - - add_third_party( - gperf -- URL https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz -- #GIT_REPOSITORY https://github.com/gperftools/gperftools -- #GIT_TAG gperftools-2.9.1 -- GIT_SHALLOW TRUE -+ DOWNLOAD_COMMAND true - PATCH_COMMAND autoreconf -i # update runs every time for some reason - # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \ - # -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF \ -@@ -260,11 +253,12 @@ else() - endif() - - add_third_party(mimalloc -- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz -+ DOWNLOAD_COMMAND true - - # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug - CMAKE_PASS_FLAGS "-DCMAKE_BUILD_TYPE=Release -DMI_BUILD_SHARED=OFF -DMI_BUILD_TESTS=OFF \ -- -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g" -+ -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g \ -+ -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/mimalloc/lib" - - BUILD_COMMAND make -j4 mimalloc-static - INSTALL_COMMAND make install -@@ -274,7 +268,7 @@ add_third_party(mimalloc - ) - - add_third_party(jemalloc -- URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 -+ URL REPLACEJEMALLOCURL - PATCH_COMMAND ./autogen.sh - CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl - ) -@@ -282,24 +276,23 @@ add_third_party(jemalloc - - add_third_party( - xxhash -- URL https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz -+ DOWNLOAD_COMMAND true - SOURCE_SUBDIR cmake_unofficial -- CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF" -+ CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF \ -+ -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/xxhash/lib" - ) - - - add_third_party( - uring -- GIT_REPOSITORY https://github.com/axboe/liburing.git -- GIT_TAG liburing-2.1 -+ DOWNLOAD_COMMAND true - CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/uring - BUILD_IN_SOURCE 1 - ) - - add_third_party( - rapidjson -- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git -- GIT_TAG 1a803826f1197b5e30703afe4b9c0e7dd48074f5 -+ DOWNLOAD_COMMAND true - CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \ - -DRAPIDJSON_BUILD_DOC=OFF" - LIB "none" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0dc0824..d5b38b3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_third_party( - lua -- URL https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz -+ URL REPLACELUAURL - PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/lua-v5.4.4.patch" - CONFIGURE_COMMAND echo - BUILD_IN_SOURCE 1 -@@ -11,7 +11,8 @@ add_third_party( - - add_third_party( - dconv -- URL https://github.com/google/double-conversion/archive/refs/tags/v3.2.0.tar.gz -+ DOWNLOAD_COMMAND true -+ CMAKE_PASS_FLAGS "-DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/dconv/lib" - LIB libdouble-conversion.a - ) - diff --git a/pkgs/by-name/dr/dragonflydb/glog.patch b/pkgs/by-name/dr/dragonflydb/glog.patch deleted file mode 100644 index 2fb9c0733b87..000000000000 --- a/pkgs/by-name/dr/dragonflydb/glog.patch +++ /dev/null @@ -1,553 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 846b4448..b4900ead 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,7 @@ option (PRINT_UNSYMBOLIZED_STACK_TRACES - "Print file offsets in traces instead of symbolizing" OFF) - option (WITH_CUSTOM_PREFIX "Enable support for user-generated message prefixes" ON) - option (WITH_GFLAGS "Use gflags" ON) -+option (WITH_ABSL "Use absl flags" OFF) - option (WITH_GTEST "Use Google Test" ON) - option (WITH_PKGCONFIG "Enable pkg-config support" ON) - option (WITH_SYMBOLIZE "Enable symbolize module" ON) -@@ -87,6 +88,13 @@ if (WITH_GFLAGS) - endif (gflags_FOUND) - endif (WITH_GFLAGS) - -+if (WITH_ABSL) -+ set (HAVE_ABSL_FLAGS 1) -+ set (ac_cv_have_abslflags 1) -+else (WITH_ABSL) -+set (ac_cv_have_abslflags 0) -+endif (WITH_ABSL) -+ - find_package (Threads) - find_package (Unwind) - -@@ -1025,7 +1033,7 @@ write_basic_package_version_file ( - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake - COMPATIBILITY SameMajorVersion) - --export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) -+# export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) - export (PACKAGE glog) - - get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) -diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h -index bcb12dea..1c9d9294 100644 ---- a/src/base/commandlineflags.h -+++ b/src/base/commandlineflags.h -@@ -57,6 +57,25 @@ - - #include - -+#else -+#ifdef HAVE_ABSL_FLAGS -+#include -+ -+#define FLAG(name) absl::GetFlag(FLAGS_##name) -+ -+#define DEFINE_bool(name, value, meaning) \ -+ ABSL_FLAG(bool, name, value, meaning) -+ -+#define DEFINE_int32(name, value, meaning) \ -+ ABSL_FLAG(GOOGLE_NAMESPACE::int32, name, value, meaning) -+ -+#define DEFINE_uint32(name, value, meaning) \ -+ ABSL_FLAG(GOOGLE_NAMESPACE::uint32, name, value, meaning) -+ -+#define DEFINE_string(name, value, meaning) \ -+ ABSL_FLAG(std::string, name, value, meaning) -+ -+ - #else - - #include -@@ -108,6 +127,7 @@ - } \ - using fLS::FLAGS_##name - -+#endif - #endif // HAVE_LIB_GFLAGS - - // Define GLOG_DEFINE_* using DEFINE_* . By using these macros, we -diff --git a/src/base/mutex.h b/src/base/mutex.h -index e82c597f..a58c1412 100644 ---- a/src/base/mutex.h -+++ b/src/base/mutex.h -@@ -319,11 +319,6 @@ class WriterMutexLock { - void operator=(const WriterMutexLock&); - }; - --// Catch bug where variable name is omitted, e.g. MutexLock (&mu); --#define MutexLock(x) COMPILE_ASSERT(0, mutex_lock_decl_missing_var_name) --#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name) --#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name) -- - } // namespace MUTEX_NAMESPACE - - using namespace MUTEX_NAMESPACE; -diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in -index b225b7ec..a4c58c96 100644 ---- a/src/config.h.cmake.in -+++ b/src/config.h.cmake.in -@@ -34,6 +34,8 @@ - /* define if you have google gflags library */ - #cmakedefine HAVE_LIB_GFLAGS - -+#cmakedefine HAVE_ABSL_FLAGS -+ - /* define if you have google gmock library */ - #cmakedefine HAVE_LIB_GMOCK - -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 95a573b1..54cd838f 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -89,6 +89,10 @@ - #include - #endif - -+#if @ac_cv_have_abslflags@ -+#include -+#endif -+ - #if @ac_cv_cxx11_atomic@ && __cplusplus >= 201103L - #include - #elif defined(GLOG_OS_WINDOWS) -@@ -395,6 +399,14 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo - #undef DECLARE_uint32 - #endif - -+#if @ac_cv_have_abslflags@ -+#define DECLARE_VARIABLE 1 -+#define DECLARE_bool(name) ABSL_DECLARE_FLAG(bool, name) -+#define DECLARE_int32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::int32, name) -+#define DECLARE_uint32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::uint32, name) -+#define DECLARE_string(name) ABSL_DECLARE_FLAG(std::string, name) -+#endif -+ - #ifndef DECLARE_VARIABLE - #define DECLARE_VARIABLE(type, shorttype, name, tn) \ - namespace fL##shorttype { \ -diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in -index 7526fc34..16e60f46 100644 ---- a/src/glog/vlog_is_on.h.in -+++ b/src/glog/vlog_is_on.h.in -@@ -64,6 +64,14 @@ - #include - - #if defined(__GNUC__) -+ -+#if @ac_cv_have_abslflags@ -+ extern int32_t absl_proxy_v; -+ #define VLEVEL (@ac_google_namespace@::absl_proxy_v) -+#else -+ #define VLEVEL (FLAGS_v) -+#endif -+ - // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site. - // (Normally) the first time every VLOG_IS_ON(n) site is hit, - // we determine what variable will dynamically control logging at this site: -@@ -74,7 +82,7 @@ - __extension__ \ - ({ static @ac_google_namespace@::SiteFlag vlocal__ = {NULL, NULL, 0, NULL}; \ - @ac_google_namespace@::int32 verbose_level__ = (verboselevel); \ -- (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \ -+ (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &VLEVEL, \ - __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \ - }) - #else -diff --git a/src/logging.cc b/src/logging.cc -index 4028ccc0..fc618d3a 100644 ---- a/src/logging.cc -+++ b/src/logging.cc -@@ -103,7 +103,9 @@ using std::fdopen; - #endif - - // There is no thread annotation support. -+#ifndef EXCLUSIVE_LOCKS_REQUIRED - #define EXCLUSIVE_LOCKS_REQUIRED(mu) -+#endif - - static bool BoolFromEnv(const char *varname, bool defval) { - const char* const valstr = getenv(varname); -@@ -351,8 +353,9 @@ static const char* GetAnsiColorCode(GLogColor color) { - - // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 - static uint32 MaxLogSize() { -- return (FLAGS_max_log_size > 0 && FLAGS_max_log_size < 4096 -- ? FLAGS_max_log_size -+ uint32 maxlogsize = FLAG(max_log_size); -+ return (maxlogsize > 0 && maxlogsize < 4096 -+ ? maxlogsize - : 1); - } - -@@ -721,7 +724,7 @@ inline void LogDestination::SetStderrLogging(LogSeverity min_severity) { - // Prevent any subtle race conditions by wrapping a mutex lock around - // all this stuff. - MutexLock l(&log_mutex); -- FLAGS_stderrthreshold = min_severity; -+ absl::SetFlag(&FLAGS_stderrthreshold, min_severity); - } - - inline void LogDestination::LogToStderr() { -@@ -747,8 +750,8 @@ static void ColoredWriteToStderrOrStdout(FILE* output, LogSeverity severity, - const char* message, size_t len) { - bool is_stdout = (output == stdout); - const GLogColor color = (LogDestination::terminal_supports_color() && -- ((!is_stdout && FLAGS_colorlogtostderr) || -- (is_stdout && FLAGS_colorlogtostdout))) -+ ((!is_stdout && FLAG(colorlogtostderr)) || -+ (is_stdout && FLAG(colorlogtostdout)))) - ? SeverityToColor(severity) - : COLOR_DEFAULT; - -@@ -789,7 +792,7 @@ static void ColoredWriteToStdout(LogSeverity severity, const char* message, - FILE* output = stdout; - // We also need to send logs to the stderr when the severity is - // higher or equal to the stderr threshold. -- if (severity >= FLAGS_stderrthreshold) { -+ if (severity >= FLAG(stderrthreshold)) { - output = stderr; - } - ColoredWriteToStderrOrStdout(output, severity, message, len); -@@ -808,7 +811,7 @@ static void WriteToStderr(const char* message, size_t len) { - - inline void LogDestination::MaybeLogToStderr(LogSeverity severity, - const char* message, size_t message_len, size_t prefix_len) { -- if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { -+ if ((severity >= FLAG(stderrthreshold)) || FLAG(alsologtostderr)) { - ColoredWriteToStderr(severity, message, message_len); - #ifdef GLOG_OS_WINDOWS - (void) prefix_len; -@@ -835,8 +838,8 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, - inline void LogDestination::MaybeLogToEmail(LogSeverity severity, - const char* message, size_t len) { - if (severity >= email_logging_severity_ || -- severity >= FLAGS_logemaillevel) { -- string to(FLAGS_alsologtoemail); -+ severity >= FLAG(logemaillevel)) { -+ string to(FLAG(alsologtoemail)); - if (!addresses_.empty()) { - if (!to.empty()) { - to += ","; -@@ -862,7 +865,7 @@ inline void LogDestination::MaybeLogToLogfile(LogSeverity severity, - time_t timestamp, - const char* message, - size_t len) { -- const bool should_flush = severity > FLAGS_logbuflevel; -+ const bool should_flush = severity > FLAG(logbuflevel); - LogDestination* destination = log_destination(severity); - destination->logger_->Write(should_flush, timestamp, message, len); - } -@@ -871,9 +874,9 @@ inline void LogDestination::LogToAllLogfiles(LogSeverity severity, - time_t timestamp, - const char* message, - size_t len) { -- if (FLAGS_logtostdout) { // global flag: never log to file -+ if (FLAG(logtostdout)) { // global flag: never log to file - ColoredWriteToStdout(severity, message, len); -- } else if (FLAGS_logtostderr) { // global flag: never log to file -+ } else if (FLAG(logtostderr)) { // global flag: never log to file - ColoredWriteToStderr(severity, message, len); - } else { - for (int i = severity; i >= 0; --i) { -@@ -1032,25 +1035,25 @@ void LogFileObject::FlushUnlocked(){ - bytes_since_flush_ = 0; - } - // Figure out when we are due for another flush. -- const int64 next = (FLAGS_logbufsecs -+ const int64 next = (FLAG(logbufsecs) - * static_cast(1000000)); // in usec - next_flush_time_ = CycleClock_Now() + UsecToCycles(next); - } - - bool LogFileObject::CreateLogfile(const string& time_pid_string) { - string string_filename = base_filename_; -- if (FLAGS_timestamp_in_logfile_name) { -+ if (FLAG(timestamp_in_logfile_name)) { - string_filename += time_pid_string; - } - string_filename += filename_extension_; - const char* filename = string_filename.c_str(); - //only write to files, create if non-existant. - int flags = O_WRONLY | O_CREAT; -- if (FLAGS_timestamp_in_logfile_name) { -+ if (FLAG(timestamp_in_logfile_name)) { - //demand that the file is unique for our timestamp (fail if it exists). - flags = flags | O_EXCL; - } -- int fd = open(filename, flags, FLAGS_logfile_mode); -+ int fd = open(filename, flags, FLAG(logfile_mode)); - if (fd == -1) return false; - #ifdef HAVE_FCNTL - // Mark the file close-on-exec. We don't really care if this fails -@@ -1083,7 +1086,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - file_ = fdopen(fd, "a"); // Make a FILE*. - if (file_ == NULL) { // Man, we're screwed! - close(fd); -- if (FLAGS_timestamp_in_logfile_name) { -+ if (FLAG(timestamp_in_logfile_name)) { - unlink(filename); // Erase the half-baked evidence: an unusable log file, only if we just created it. - } - return false; -@@ -1125,8 +1128,8 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - - // Make an additional link to the log file in a place specified by - // FLAGS_log_link, if indicated -- if (!FLAGS_log_link.empty()) { -- linkpath = FLAGS_log_link + "/" + linkname; -+ if (!FLAG(log_link).empty()) { -+ linkpath = FLAG(log_link) + "/" + linkname; - unlink(linkpath.c_str()); // delete old one if it exists - if (symlink(filename, linkpath.c_str()) != 0) { - // silently ignore failures -@@ -1165,7 +1168,7 @@ void LogFileObject::Write(bool force_flush, - rollover_attempt_ = 0; - - struct ::tm tm_time; -- if (FLAGS_log_utc_time) { -+ if (FLAG(log_utc_time)) { - gmtime_r(×tamp, &tm_time); - } else { - localtime_r(×tamp, &tm_time); -@@ -1253,14 +1256,14 @@ void LogFileObject::Write(bool force_flush, - << ' ' - << setw(2) << tm_time.tm_hour << ':' - << setw(2) << tm_time.tm_min << ':' -- << setw(2) << tm_time.tm_sec << (FLAGS_log_utc_time ? " UTC\n" : "\n") -+ << setw(2) << tm_time.tm_sec << (FLAG(log_utc_time) ? " UTC\n" : "\n") - << "Running on machine: " - << LogDestination::hostname() << '\n'; - - if(!g_application_fingerprint.empty()) { - file_header_stream << "Application fingerprint: " << g_application_fingerprint << '\n'; - } -- const char* const date_time_format = FLAGS_log_year_in_prefix -+ const char* const date_time_format = FLAG(log_year_in_prefix) - ? "yyyymmdd hh:mm:ss.uuuuuu" - : "mmdd hh:mm:ss.uuuuuu"; - file_header_stream << "Running duration (h:mm:ss): " -@@ -1284,7 +1287,7 @@ void LogFileObject::Write(bool force_flush, - // greater than 4096, thereby indicating an error. - errno = 0; - fwrite(message, 1, message_len, file_); -- if ( FLAGS_stop_logging_if_full_disk && -+ if ( FLAG(stop_logging_if_full_disk) && - errno == ENOSPC ) { // disk full, stop writing to disk - stop_writing = true; // until the disk is - return; -@@ -1307,7 +1310,7 @@ void LogFileObject::Write(bool force_flush, - FlushUnlocked(); - #ifdef GLOG_OS_LINUX - // Only consider files >= 3MiB -- if (FLAGS_drop_log_memory && file_length_ >= (3U << 20U)) { -+ if (FLAG(drop_log_memory) && file_length_ >= (3U << 20U)) { - // Don't evict the most recent 1-2MiB so as not to impact a tailer - // of the log file and to avoid page rounding issue on linux < 4.7 - uint32 total_drop_length = -@@ -1348,7 +1351,7 @@ void LogCleaner::Disable() { - } - - void LogCleaner::UpdateCleanUpTime() { -- const int64 next = (FLAGS_logcleansecs -+ const int64 next = (FLAG(logcleansecs) - * 1000000); // in usec - next_cleanup_time_ = CycleClock_Now() + UsecToCycles(next); - } -@@ -1664,7 +1667,7 @@ void LogMessage::Init(const char* file, - // I20201018 160715 f5d4fbb0 logging.cc:1153] - // (log level, GMT year, month, date, time, thread_id, file basename, line) - // We exclude the thread_id for the default thread. -- if (FLAGS_log_prefix && (line != kNoLogPrefix)) { -+ if (FLAG(log_prefix) && (line != kNoLogPrefix)) { - std::ios saved_fmt(NULL); - saved_fmt.copyfmt(stream()); - stream().fill('0'); -@@ -1672,7 +1675,7 @@ void LogMessage::Init(const char* file, - if (custom_prefix_callback == NULL) { - #endif - stream() << LogSeverityNames[severity][0]; -- if (FLAGS_log_year_in_prefix) { -+ if (FLAG(log_year_in_prefix)) { - stream() << setw(4) << 1900 + logmsgtime_.year(); - } - stream() << setw(2) << 1 + logmsgtime_.month() -@@ -1703,11 +1706,11 @@ void LogMessage::Init(const char* file, - } - data_->num_prefix_chars_ = data_->stream_.pcount(); - -- if (!FLAGS_log_backtrace_at.empty()) { -+ if (!FLAG(log_backtrace_at).empty()) { - char fileline[128]; - snprintf(fileline, sizeof(fileline), "%s:%d", data_->basename_, line); - #ifdef HAVE_STACKTRACE -- if (FLAGS_log_backtrace_at == fileline) { -+ if (FLAG(log_backtrace_at) == fileline) { - string stacktrace; - DumpStackTraceToString(&stacktrace); - stream() << " (stacktrace:\n" << stacktrace << ") "; -@@ -1746,7 +1749,7 @@ ostream& LogMessage::stream() { - // Flush buffered message, called by the destructor, or any other function - // that needs to synchronize the log. - void LogMessage::Flush() { -- if (data_->has_been_flushed_ || data_->severity_ < FLAGS_minloglevel) { -+ if (data_->has_been_flushed_ || data_->severity_ < FLAG(minloglevel)) { - return; - } - -@@ -1808,7 +1811,7 @@ static char fatal_message[256]; - void ReprintFatalMessage() { - if (fatal_message[0]) { - const size_t n = strlen(fatal_message); -- if (!FLAGS_logtostderr) { -+ if (!FLAG(logtostderr)) { - // Also write to stderr (don't color to avoid terminal checks) - WriteToStderr(fatal_message, n); - } -@@ -1837,8 +1840,8 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) { - // global flag: never log to file if set. Also -- don't log to a - // file if we haven't parsed the command line flags to get the - // program name. -- if (FLAGS_logtostderr || FLAGS_logtostdout || !IsGoogleLoggingInitialized()) { -- if (FLAGS_logtostdout) { -+ if (FLAG(logtostderr) || FLAG(logtostdout) || !IsGoogleLoggingInitialized()) { -+ if (FLAG(logtostdout)) { - ColoredWriteToStdout(data_->severity_, data_->message_text_, - data_->num_chars_to_log_); - } else { -@@ -1891,7 +1894,7 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) { - fatal_time = logmsgtime_.timestamp(); - } - -- if (!FLAGS_logtostderr && !FLAGS_logtostdout) { -+ if (!FLAG(logtostderr) && !FLAG(logtostdout)) { - for (int i = 0; i < NUM_SEVERITIES; ++i) { - if (LogDestination::log_destinations_[i]) { - LogDestination::log_destinations_[i]->logger_->Write(true, 0, "", 0); -@@ -2238,7 +2241,7 @@ static bool SendEmailInternal(const char*dest, const char *subject, - subject, body, dest); - } - -- string logmailer = FLAGS_logmailer; -+ string logmailer = FLAG(logmailer); - if (logmailer.empty()) { - logmailer = "/bin/mail"; - } -@@ -2338,9 +2341,9 @@ const vector& GetLoggingDirectories() { - if (logging_directories_list == NULL) { - logging_directories_list = new vector; - -- if ( !FLAGS_log_dir.empty() ) { -+ if ( !FLAG(log_dir).empty() ) { - // A dir was specified, we should use it -- logging_directories_list->push_back(FLAGS_log_dir); -+ logging_directories_list->push_back(FLAG(log_dir)); - } else { - GetTempDirectories(logging_directories_list); - #ifdef GLOG_OS_WINDOWS -@@ -2654,7 +2657,7 @@ LogMessageTime::LogMessageTime(std::tm t) { - - LogMessageTime::LogMessageTime(std::time_t timestamp, WallTime now) { - std::tm t; -- if (FLAGS_log_utc_time) -+ if (FLAG(log_utc_time)) - gmtime_r(×tamp, &t); - else - localtime_r(×tamp, &t); -@@ -2673,7 +2676,7 @@ void LogMessageTime::init(const std::tm& t, std::time_t timestamp, - void LogMessageTime::CalcGmtOffset() { - std::tm gmt_struct; - int isDst = 0; -- if ( FLAGS_log_utc_time ) { -+ if ( FLAG(log_utc_time )) { - localtime_r(×tamp_, &gmt_struct); - isDst = gmt_struct.tm_isdst; - gmt_struct = time_struct_; -diff --git a/src/raw_logging.cc b/src/raw_logging.cc -index 43159832..8532362b 100644 ---- a/src/raw_logging.cc -+++ b/src/raw_logging.cc -@@ -123,8 +123,8 @@ static char crash_buf[kLogBufSize + 1] = { 0 }; // Will end in '\0' - GLOG_ATTRIBUTE_FORMAT(printf, 4, 5) - void RawLog__(LogSeverity severity, const char* file, int line, - const char* format, ...) { -- if (!(FLAGS_logtostdout || FLAGS_logtostderr || -- severity >= FLAGS_stderrthreshold || FLAGS_alsologtostderr || -+ if (!(FLAG(logtostdout) || FLAG(logtostderr) || -+ severity >= FLAG(stderrthreshold) || FLAG(alsologtostderr) || - !IsGoogleLoggingInitialized())) { - return; // this stderr log message is suppressed - } -diff --git a/src/utilities.cc b/src/utilities.cc -index a332f1a1..a9d5102a 100644 ---- a/src/utilities.cc -+++ b/src/utilities.cc -@@ -141,7 +141,7 @@ static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) { - int depth = GetStackTrace(stack, ARRAYSIZE(stack), skip_count+1); - for (int i = 0; i < depth; i++) { - #if defined(HAVE_SYMBOLIZE) -- if (FLAGS_symbolize_stacktrace) { -+ if (FLAG(symbolize_stacktrace)) { - DumpPCAndSymbol(writerfn, arg, stack[i], " "); - } else { - DumpPC(writerfn, arg, stack[i], " "); -diff --git a/src/vlog_is_on.cc b/src/vlog_is_on.cc -index e478a366..4b7a5cae 100644 ---- a/src/vlog_is_on.cc -+++ b/src/vlog_is_on.cc -@@ -43,14 +43,24 @@ - #include - #include - #include "base/googleinit.h" -+#include "config.h" - - // glog doesn't have annotation - #define ANNOTATE_BENIGN_RACE(address, description) - - using std::string; - -+#ifdef HAVE_ABSL_FLAGS -+ -+ABSL_FLAG(int32_t, v, 0, "Show all VLOG(m) messages for m <= this." -+" Overridable by --vmodule.").OnUpdate([] { -+ GOOGLE_NAMESPACE::absl_proxy_v = absl::GetFlag(FLAGS_v); -+ }); -+ -+#else - GLOG_DEFINE_int32(v, 0, "Show all VLOG(m) messages for m <= this." - " Overridable by --vmodule."); -+#endif - - GLOG_DEFINE_string(vmodule, "", "per-module verbose level." - " Argument is a comma-separated list of =." -@@ -60,6 +70,8 @@ GLOG_DEFINE_string(vmodule, "", "per-module verbose level." - - _START_GOOGLE_NAMESPACE_ - -+int32_t absl_proxy_v = 0; -+ - namespace glog_internal_namespace_ { - - // Used by logging_unittests.cc so can't make it static here. -@@ -132,7 +144,8 @@ static void VLOG2Initializer() { - // Can now parse --vmodule flag and initialize mapping of module-specific - // logging levels. - inited_vmodule = false; -- const char* vmodule = FLAGS_vmodule.c_str(); -+ string vmodule_str = FLAG(vmodule); -+ const char* vmodule = vmodule_str.c_str(); - const char* sep; - VModuleInfo* head = NULL; - VModuleInfo* tail = NULL; -@@ -164,7 +177,7 @@ static void VLOG2Initializer() { - - // This can be called very early, so we use SpinLock and RAW_VLOG here. - int SetVLOGLevel(const char* module_pattern, int log_level) { -- int result = FLAGS_v; -+ int result = FLAG(v); - size_t const pattern_len = strlen(module_pattern); - bool found = false; - { diff --git a/pkgs/by-name/dr/dragonflydb/helio-third-party.patch b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch new file mode 100644 index 000000000000..c10bd8e89871 --- /dev/null +++ b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch @@ -0,0 +1,150 @@ +diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake +index 810a8fa..8b11922 100644 +--- a/helio/cmake/third_party.cmake ++++ b/helio/cmake/third_party.cmake +@@ -151,7 +151,7 @@ endfunction() + + FetchContent_Declare( + gtest +- URL https://github.com/google/googletest/archive/v1.15.2.tar.gz ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(gtest) +@@ -162,7 +162,7 @@ endif () + + FetchContent_Declare( + benchmark +- URL https://github.com/google/benchmark/archive/v1.9.1.tar.gz ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(benchmark) +@@ -181,7 +181,7 @@ endif () + + FetchContent_Declare( + abseil_cpp +- URL https://github.com/abseil/abseil-cpp/releases/download/20250512.1/abseil-cpp-20250512.1.tar.gz ++ DOWNLOAD_COMMAND true + PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20250512.1.patch" + ) + +@@ -204,11 +204,7 @@ if (LEGACY_GLOG) + + FetchContent_Declare( + glog +- GIT_REPOSITORY https://github.com/romange/glog +- GIT_TAG Absl +- +- GIT_PROGRESS TRUE +- GIT_SHALLOW TRUE ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(glog) +@@ -278,7 +274,7 @@ if (WITH_GPERF) + + add_third_party( + gperf +- URL https://github.com/gperftools/gperftools/archive/gperftools-2.16.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/gperf/. + + # GIT_SHALLOW TRUE + # Remove building the unneeded programs (they fail on macos) +@@ -312,9 +308,7 @@ set(MIMALLOC_INCLUDE_DIR ${THIRD_PARTY_LIB_DIR}/mimalloc/include) + set (MIMALLOC_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/mimalloc/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/mimalloc-v2.1.6.patch) + + add_third_party(mimalloc +- #GIT_REPOSITORY https://github.com/microsoft/mimalloc.git +- #GIT_TAG 0f6d8293c74796fa913e4b5eb4361f1e4734f7c6 +- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.6.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/mimalloc216/. + PATCH_COMMAND "${MIMALLOC_PATCH_COMMAND}" + # -DCMAKE_BUILD_TYPE=Release + # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug +@@ -328,7 +322,7 @@ add_third_party(mimalloc + ) + + add_third_party(jemalloc +- URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/jemalloc/. + PATCH_COMMAND ./autogen.sh + CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl + ) +@@ -336,7 +330,7 @@ add_third_party(jemalloc + + add_third_party( + xxhash +- URL https://github.com/Cyan4973/xxHash/archive/v0.8.3.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/xxhash/. + + # A bug in xxhash 0.8.1 that searches for a file that doesn't exist + PATCH_COMMAND touch /xxhsum.1 +@@ -347,7 +341,7 @@ add_third_party( + + add_third_party( + uring +- URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.8.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/uring/. + + CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/uring + BUILD_COMMAND make -C src +@@ -356,7 +350,7 @@ add_third_party( + + add_third_party( + pugixml +- URL https://github.com/zeux/pugixml/archive/refs/tags/v1.15.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/pugixml/. + ) + + if (WITH_AWS) +@@ -364,9 +358,7 @@ if (WITH_AWS) + + add_third_party( + aws +- GIT_REPOSITORY https://github.com/aws/aws-sdk-cpp.git +- GIT_TAG 3e51fa016655eeb6b6610bdf8fe7cf33ebbf3e00 +- GIT_SHALLOW TRUE ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/aws-sdk-cpp/. + PATCH_COMMAND "${AWS_PATCH_COMMAND}" + CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5" + LIB libaws-cpp-sdk-s3.a libaws-cpp-sdk-core.a libaws-crt-cpp.a libaws-c-mqtt.a libaws-c-event-stream.a libaws-c-s3.a libaws-c-auth.a libaws-c-http.a libaws-c-io.a libs2n.a libaws-c-compression.a libaws-c-cal.a libaws-c-sdkutils.a libaws-checksums.a libaws-c-common.a +@@ -376,8 +368,7 @@ endif() + if (WITH_GCP) + add_third_party( + rapidjson +- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git +- GIT_TAG ab1842a ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. + CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \ + -DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5" + LIB "none" +@@ -386,24 +377,23 @@ endif() + + add_third_party( + cares +- URL https://codeload.github.com/c-ares/c-ares/tar.gz/refs/tags/v1.34.5 ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/cares/. + CMAKE_PASS_FLAGS "-DCARES_SHARED:BOOL=OFF -DCARES_STATIC:BOOL=ON -DCARES_STATIC_PIC:BOOL=ON \ + -DCMAKE_INSTALL_LIBDIR=lib" + ) + + add_third_party( + zstd +- URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.zst ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/zstd/. + SOURCE_SUBDIR "build/cmake" +- ++ + # for debug pass : "CFLAGS=-fPIC -O0 -ggdb" + CMAKE_PASS_FLAGS "-DZSTD_BUILD_SHARED=OFF -DZSTD_BUILD_PROGRAMS=OFF -DZSTD_BUILD_TESTS=OFF" + ) + + add_third_party( + expected +- GIT_REPOSITORY https://github.com/martinmoene/expected-lite.git +- GIT_TAG f17940fabae07063cabb67abf2c8d164d3146044 # Important fixes for monadic functions ++ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/expected/. + CMAKE_PASS_FLAGS "-DEXPECTED_LITE_OPT_BUILD_TESTS=0" + LIB "none" + ) diff --git a/pkgs/by-name/dr/dragonflydb/package.nix b/pkgs/by-name/dr/dragonflydb/package.nix index 18ffa5379a97..79cfba633713 100644 --- a/pkgs/by-name/dr/dragonflydb/package.nix +++ b/pkgs/by-name/dr/dragonflydb/package.nix @@ -1,109 +1,252 @@ { fetchFromGitHub, - fetchurl, lib, stdenv, + + # Dependencies + abseil-cpp, + c-ares, + croncpp, double-conversion, - gperftools, - mimalloc, - rapidjson, - liburing, - xxHash, + expected-lite, + fast-float, + flatbuffers_23, gbenchmark, - glog, + gperftools, gtest, + hdrhistogram_c, + hnswlib, jemalloc, - gcc-unwrapped, + liburing, + lz4, + pcre2, + pugixml, + rapidjson, + re2, + re-flex, + uni-algo, + xxHash, + zstd, + + # Build tools autoconf, autoconf-archive, - automake, + automake116x, + bison, cmake, + gcc-unwrapped, ninja, + + # Runtime dependencies boost, - libunwind, libtool, + libunwind, openssl, + zlib, + + # Options + withAws ? true, + withGcp ? true, + withGperf ? true, + withPcre ? true, + withRe2 ? true, + withSearch ? true, + withAsan ? false, + withUsan ? false, }: let pname = "dragonflydb"; - version = "0.1.0"; + version = "1.34.2"; src = fetchFromGitHub { - owner = pname; + owner = "dragonflydb"; repo = "dragonfly"; tag = "v${version}"; - hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs="; + hash = "sha256-n70IB32tZDe665hVLrKC0BSSJutmYhtPJvfNa48xaqA="; fetchSubmodules = true; }; - # Needed exactly 5.4.4 for patch to work - lua = fetchurl { - url = "https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz"; - hash = "sha256-L/ibvqIqfIuRDWsAb1ukVZ7c9GiiVTfO35mI7ZD2tFA="; + aws-sdk-cpp-1-11-162 = fetchFromGitHub { + owner = "aws"; + repo = "aws-sdk-cpp"; + tag = "1.11.162"; + hash = "sha256-NxVE7H8BOetpbBkB2PTVBoHSXYm6cTp41F1LJmhtBbs="; + fetchSubmodules = true; }; - # Needed exactly 20211102.0 for patch to work - abseil-cpp_202111 = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "20211102.0"; - sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; + glog-absl = fetchFromGitHub { + owner = "romange"; + repo = "glog"; + rev = "Absl"; + hash = "sha256-68Hx3kIPgyMSdHCUpYr68Cw8V4Umtyd+4VLZc3zUb1s="; }; + + jsoncons-dragonfly = fetchFromGitHub { + owner = "dragonflydb"; + repo = "jsoncons"; + rev = "Dragonfly.178"; + hash = "sha256-cxM95DFFo5z+eImgZzJw+ykaeSDtBF+hw5qo6gnL53s="; + }; + + lua-dragonfly = fetchFromGitHub { + owner = "dragonflydb"; + repo = "lua"; + rev = "Dragonfly-5.4.6a"; + hash = "sha256-uLNe+hLihu4wMW/wstGnYdPa2bGPC5UiNE+VyNIYY2c="; + }; + + mimalloc216 = fetchFromGitHub { + owner = "microsoft"; + repo = "mimalloc"; + tag = "v2.1.6"; + hash = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M="; + }; + + mimalloc224 = fetchFromGitHub { + owner = "microsoft"; + repo = "mimalloc"; + tag = "v2.2.4"; + hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o="; + }; + + withUnwind = !stdenv.targetPlatform.isAarch64; in stdenv.mkDerivation { inherit pname version src; + patches = [ + ./external-libs.patch + ./helio-third-party.patch + ]; + postPatch = '' - mkdir -p ./build/{third_party,_deps} - ln -s ${double-conversion.src} ./build/third_party/dconv - ln -s ${mimalloc.src} ./build/third_party/mimalloc - ln -s ${rapidjson.src} ./build/third_party/rapidjson - ln -s ${gbenchmark.src} ./build/_deps/benchmark-src - ln -s ${gtest.src} ./build/_deps/gtest-src - cp -R --no-preserve=mode,ownership ${gperftools.src} ./build/third_party/gperf - cp -R --no-preserve=mode,ownership ${liburing.src} ./build/third_party/uring - cp -R --no-preserve=mode,ownership ${xxHash.src} ./build/third_party/xxhash - cp -R --no-preserve=mode,ownership ${abseil-cpp_202111} ./build/_deps/abseil_cpp-src - cp -R --no-preserve=mode,ownership ${glog.src} ./build/_deps/glog-src - chmod u+x ./build/third_party/uring/configure - cp ./build/third_party/xxhash/cli/xxhsum.{1,c} ./build/third_party/xxhash - patch -p1 -d ./build/_deps/glog-src < ${./glog.patch} - sed ' - s@REPLACEJEMALLOCURL@file://${jemalloc.src}@ - s@REPLACELUAURL@file://${lua}@ - ' ${./fixes.patch} | patch -p1 + chmod +x helio/blaze.sh + ''; + + preConfigure = '' + # Create directory for nixpkgs dependencies + mkdir -p build/_deps build/deps-nixpkgs + + # Copy FetchContent dependencies (in helio/cmake/third_party.cmake) + # These go to build/_deps/ where FetchContent expects them + cp -r --no-preserve=mode,ownership ${abseil-cpp.src} build/_deps/abseil_cpp-src + cp -r --no-preserve=mode,ownership ${gbenchmark.src} build/_deps/benchmark-src + cp -r --no-preserve=mode,ownership ${glog-absl} build/_deps/glog-src + cp -r --no-preserve=mode,ownership ${gtest.src} build/_deps/gtest-src + + # Copy add_third_party dependencies to deps-nixpkgs + cp -r --no-preserve=mode,ownership ${croncpp.src} build/deps-nixpkgs/croncpp + cp -r --no-preserve=mode,ownership ${double-conversion.src} build/deps-nixpkgs/dconv + cp -r --no-preserve=mode,ownership ${expected-lite.src} build/deps-nixpkgs/expected + cp -r --no-preserve=mode,ownership ${fast-float.src} build/deps-nixpkgs/fast_float + cp -r --no-preserve=mode,ownership ${flatbuffers_23.src} build/deps-nixpkgs/flatbuffers + cp -r --no-preserve=mode,ownership ${hdrhistogram_c.src} build/deps-nixpkgs/hdr_histogram + cp -r --no-preserve=mode,ownership ${jemalloc.src} build/deps-nixpkgs/jemalloc + cp -r --no-preserve=mode,ownership ${jsoncons-dragonfly} build/deps-nixpkgs/jsoncons + cp -r --no-preserve=mode,ownership ${liburing.src} build/deps-nixpkgs/uring + cp -r --no-preserve=mode,ownership ${lua-dragonfly} build/deps-nixpkgs/lua + cp -r --no-preserve=mode,ownership ${lz4.src} build/deps-nixpkgs/lz4 + cp -r --no-preserve=mode,ownership ${mimalloc216} build/deps-nixpkgs/mimalloc216 + cp -r --no-preserve=mode,ownership ${mimalloc224} build/deps-nixpkgs/mimalloc224 + cp -r --no-preserve=mode,ownership ${pugixml.src} build/deps-nixpkgs/pugixml + cp -r --no-preserve=mode,ownership ${re-flex.src} build/deps-nixpkgs/reflex + cp -r --no-preserve=mode,ownership ${xxHash.src} build/deps-nixpkgs/xxhash + cp -r --no-preserve=mode,ownership ${zstd.src} build/deps-nixpkgs/zstd + + # c-ares is provided as a tarball, extract it + mkdir -p build/deps-nixpkgs/cares + tar -xzf ${c-ares.src} -C build/deps-nixpkgs/cares --strip-components=1 + + ${ + if withAws then + '' + cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-162} build/deps-nixpkgs/aws-sdk-cpp + '' + else + "" + } + + ${ + if withGcp then + '' + cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson + '' + else + "" + } + + ${ + if withGperf then + '' + cp -r --no-preserve=mode,ownership ${gperftools.src} build/deps-nixpkgs/gperf + '' + else + "" + } + + ${ + if withSearch then + '' + cp -r --no-preserve=mode,ownership ${hnswlib.src} build/deps-nixpkgs/hnswlib + cp -r --no-preserve=mode,ownership ${uni-algo.src} build/deps-nixpkgs/uni-algo + '' + else + "" + } + + # Fix permissions + chmod -R u+w build/deps-nixpkgs build/_deps + chmod u+x build/deps-nixpkgs/reflex/configure + chmod u+x build/deps-nixpkgs/uring/configure + touch build/deps-nixpkgs/xxhash/xxhsum.1 ''; nativeBuildInputs = [ autoconf autoconf-archive - automake + automake116x + bison cmake ninja ]; buildInputs = [ boost - libunwind libtool openssl - ]; + zlib + ] + ++ lib.optional withPcre pcre2 + ++ lib.optional withRe2 re2 + ++ lib.optional withUnwind libunwind; cmakeFlags = [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + (lib.cmakeFeature "CMAKE_AR" "${gcc-unwrapped}/bin/gcc-ar") + (lib.cmakeFeature "CMAKE_RANLIB" "${gcc-unwrapped}/bin/gcc-ranlib") + (lib.cmakeBool "ENABLE_GIT_VERSION" false) + (lib.cmakeBool "WITH_ASAN" withAsan) + (lib.cmakeBool "WITH_AWS" withAws) + (lib.cmakeBool "WITH_GCP" withGcp) + (lib.cmakeBool "WITH_GPERF" withGperf) + (lib.cmakeBool "WITH_SEARCH" withSearch) + (lib.cmakeBool "WITH_USAN" withUsan) ]; ninjaFlags = [ "dragonfly" ]; + # dragonflydb's tests rely heavily on outdated Python packages we don't + # have in nixpkgs, and it would be a highly non-trivial endeavor to + # recreate all of them locally to get them to run properly. doCheck = false; - dontUseNinjaInstall = true; + dontUseNinjaInstall = true; installPhase = '' runHook preInstall + mkdir -p $out/bin - cp ./dragonfly $out/bin + install -Dm755 ./dragonfly $out/bin/dragonfly + runHook postInstall ''; @@ -112,6 +255,9 @@ stdenv.mkDerivation { homepage = "https://dragonflydb.io/"; license = licenses.bsl11; platforms = platforms.linux; - maintainers = with maintainers; [ yureien ]; + maintainers = with maintainers; [ + typedrat + yureien + ]; }; } From 5f938a94bcfa4151f24652359745504f4786a449 Mon Sep 17 00:00:00 2001 From: Alexis Williams Date: Fri, 31 Oct 2025 21:23:34 -0700 Subject: [PATCH 1786/2279] dragonflydb: add release notes mention --- doc/release-notes/rl-2511.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 5192f7a7d48b..75336f597b3a 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -353,6 +353,8 @@ - `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`. +- `dragonflydb` has been updated from version 0.1.0 to version 1.34.2. + ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib} From e4c1bb1c21668ee9dc597eb2ce989e58021fe9da Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 13:20:11 -0500 Subject: [PATCH 1787/2279] nodePackages.ni: alias to pkgs.ni Same package. no need for it to be here. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 51 ------------------- 4 files changed, 1 insertion(+), 53 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4846153350fb..48505c180f38 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -33,6 +33,7 @@ let in mapAliases { + "@antfu/ni" = pkgs.ni; # Added 2025-11-08 "@antora/cli" = pkgs.antora; # Added 2023-05-06 "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 "@babel/cli" = diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 37347bee4e52..f458fbe78de2 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -1,7 +1,6 @@ # Use this file to add `meta.mainProgram` to packages in `nodePackages`. { # Packages that provide multiple executables where one is clearly the `mainProgram`. - "@antfu/ni" = "ni"; "@microsoft/rush" = "rush"; # Packages that provide a single executable. diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6b644d17d2ac..ea9336d4cfc3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@antfu/ni" , "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f1f1bbb3dfd6..d1052067781d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4224,15 +4224,6 @@ let sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; }; }; - "ansis-3.17.0" = { - name = "ansis"; - packageName = "ansis"; - version = "3.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansis/-/ansis-3.17.0.tgz"; - sha512 = "0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg=="; - }; - }; "any-base-1.1.0" = { name = "any-base"; packageName = "any-base"; @@ -11721,15 +11712,6 @@ let sha512 = "vAcPiyomt1ioKAsAL2uxSABHJ4Ju/e4UeDM+g1OlR0vV4YhLGMNsdLNvZTpEDY4JCSt0E4hASCNM5t2ETtsbyg=="; }; }; - "fzf-0.5.2" = { - name = "fzf"; - packageName = "fzf"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fzf/-/fzf-0.5.2.tgz"; - sha512 = "Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q=="; - }; - }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -20280,15 +20262,6 @@ let sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="; }; }; - "package-manager-detector-1.0.0" = { - name = "package-manager-detector"; - packageName = "package-manager-detector"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.0.0.tgz"; - sha512 = "7elnH+9zMsRo7aS72w6MeRugTpdRvInmEB4Kmm9BVvPw/SLG8gXUGQ+4wF0Mys0RSWPz0B9nuBbDe8vFeA2sfg=="; - }; - }; "pacote-20.0.0" = { name = "pacote"; packageName = "pacote"; @@ -29748,30 +29721,6 @@ in bypassCache = true; reconstructLock = true; }; - "@antfu/ni" = nodeEnv.buildNodePackage { - name = "_at_antfu_slash_ni"; - packageName = "@antfu/ni"; - version = "24.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-24.2.0.tgz"; - sha512 = "+B9wzpv+KOhqbOgHjHcBAX7IwIKdDt4SFzYlxIPr4srANFJfjAABC7nU8KNFba+DYLymRe2EPSUfE7+reJb5UA=="; - }; - dependencies = [ - sources."ansis-3.17.0" - sources."fzf-0.5.2" - sources."package-manager-detector-1.0.0" - sources."tinyexec-0.3.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Use the right package manager"; - homepage = "https://github.com/antfu-collective/ni#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; From 6c3af5d19523f5c0b3f5ae4686924d96b131a7fa Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 13:50:57 -0500 Subject: [PATCH 1788/2279] json-diff: migrate from nodePackages --- pkgs/by-name/js/json-diff/package.nix | 32 ++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 52 ------------------- 4 files changed, 33 insertions(+), 53 deletions(-) create mode 100644 pkgs/by-name/js/json-diff/package.nix diff --git a/pkgs/by-name/js/json-diff/package.nix b/pkgs/by-name/js/json-diff/package.nix new file mode 100644 index 000000000000..ea94a368396f --- /dev/null +++ b/pkgs/by-name/js/json-diff/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "json-diff"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "andreyvit"; + repo = "json-diff"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b8CtttEmPUIuFba6yn0DhVsSM1RA8Jsl4+zGvk3EZ2s="; + }; + + npmDepsHash = "sha256-hpnmBD9fyudjc3dzxZ5L5mhkCfRbw7BaAHKGf76qVDU="; + + npmBuildScript = "test"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Structural diff for JSON files"; + homepage = "https://github.com/andreyvit/json-diff"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "json-diff"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 48505c180f38..5f77fefbe91b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -193,6 +193,7 @@ mapAliases { inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 inherit (pkgs) js-beautify; # Added 2025-11-06 inherit (pkgs) jshint; # Added 2025-11-06 + inherit (pkgs) json-diff; # Added 2025-11-07 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 inherit (pkgs) json-server; # Added 2025-11-06 joplin = pkgs.joplin-cli; # Added 2025-11-02 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ea9336d4cfc3..2a3e6b302f54 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -40,7 +40,6 @@ , "js-yaml" , "jsdoc" , "json" -, "json-diff" , "json-refs" , "jsonlint" , "katex" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d1052067781d..5b2dacd615f0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -741,15 +741,6 @@ let sha512 = "JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g=="; }; }; - "@ewoudenberg/difflib-0.1.0" = { - name = "_at_ewoudenberg_slash_difflib"; - packageName = "@ewoudenberg/difflib"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ewoudenberg/difflib/-/difflib-0.1.0.tgz"; - sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; - }; - }; "@exodus/schemasafe-1.3.0" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -9390,15 +9381,6 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; - "dreamopt-0.8.0" = { - name = "dreamopt"; - packageName = "dreamopt"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.8.0.tgz"; - sha512 = "vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -12837,15 +12819,6 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "heap-0.2.7" = { - name = "heap"; - packageName = "heap"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz"; - sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="; - }; - }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -35780,31 +35753,6 @@ in bypassCache = true; reconstructLock = true; }; - json-diff = nodeEnv.buildNodePackage { - name = "json-diff"; - packageName = "json-diff"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.6.tgz"; - sha512 = "tcFIPRdlc35YkYdGxcamJjllUhXWv4n2rK9oJ2RsAzV4FBkuV4ojKEDgcZ+kpKxDmJKv+PFK65+1tVVOnSeEqA=="; - }; - dependencies = [ - sources."@ewoudenberg/difflib-0.1.0" - sources."colors-1.4.0" - sources."dreamopt-0.8.0" - sources."heap-0.2.7" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON diff"; - homepage = "https://github.com/andreyvit/json-diff"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; From 983751956ff932c3357fa18b0d0d42461fce1820 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 14:56:06 -0500 Subject: [PATCH 1789/2279] commitlint: migrate from nodePackages --- pkgs/by-name/co/commitlint/package.nix | 68 +++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 403 ------------------ pkgs/top-level/all-packages.nix | 2 - 6 files changed, 69 insertions(+), 407 deletions(-) create mode 100644 pkgs/by-name/co/commitlint/package.nix diff --git a/pkgs/by-name/co/commitlint/package.nix b/pkgs/by-name/co/commitlint/package.nix new file mode 100644 index 000000000000..b273859cf1a0 --- /dev/null +++ b/pkgs/by-name/co/commitlint/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "commitlint"; + version = "20.1.0"; + + src = fetchFromGitHub { + owner = "conventional-changelog"; + repo = "commitlint"; + rev = "v${finalAttrs.version}"; + hash = "sha256-o8AnIewSmg8vRjs8LU6QwRyl2hMQ2iK5W7WL137treU="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-Kg19sEgstrWj+JLzdZFnMeb0F5lFX3Z0VPNyiYPi6nY="; + }; + + nativeBuildInputs = [ + yarnConfigHook + nodejs + ]; + + buildPhase = '' + runHook preBuild + + pkgs=("config-validator" "rules" "parse" "is-ignored" "lint" + "resolve-extends" "execute-rule" "load" "read" "types" "cli") + for p in "''${pkgs[@]}" ; do + cd @commitlint/$p/ + yarn run tsc --build --force + cd ../.. + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn install --offline --production --ignore-scripts + mkdir -p $out/bin + mkdir -p $out/lib/node_modules/@commitlint/root + mv * $out/lib/node_modules/@commitlint/root/ + ln -s $out/lib/node_modules/@commitlint/root/@commitlint/cli/cli.js $out/bin/commitlint + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/conventional-changelog/commitlint/releases/tag/v${finalAttrs.version}"; + description = "Lint your commit messages"; + homepage = "https://commitlint.js.org/"; + license = lib.licenses.mit; + mainProgram = "commitlint"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5f77fefbe91b..3c9930c12c27 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -39,6 +39,7 @@ mapAliases { "@babel/cli" = throw "@babel/cli was removed because upstream highly suggests installing it in your project instead of globally."; # Added 2025-11-06 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 + "@commitlint/cli" = pkgs.commitlint; # Added 2025-11-08 "@commitlint/config-conventional" = throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index f458fbe78de2..6979f88e5242 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -5,7 +5,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@commitlint/cli" = "commitlint"; aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2a3e6b302f54..6ffa0b2e5281 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,6 +1,5 @@ [ "@angular/cli" -, "@commitlint/cli" , "@microsoft/rush" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5b2dacd615f0..b882ae1a03f7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -444,141 +444,6 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@commitlint/config-validator-19.8.0" = { - name = "_at_commitlint_slash_config-validator"; - packageName = "@commitlint/config-validator"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-19.8.0.tgz"; - sha512 = "+r5ZvD/0hQC3w5VOHJhGcCooiAVdynFlCe2d6I9dU+PvXdV3O+fU4vipVg+6hyLbQUuCH82mz3HnT/cBQTYYuA=="; - }; - }; - "@commitlint/ensure-19.8.0" = { - name = "_at_commitlint_slash_ensure"; - packageName = "@commitlint/ensure"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-19.8.0.tgz"; - sha512 = "kNiNU4/bhEQ/wutI1tp1pVW1mQ0QbAjfPRo5v8SaxoVV+ARhkB8Wjg3BSseNYECPzWWfg/WDqQGIfV1RaBFQZg=="; - }; - }; - "@commitlint/execute-rule-19.8.0" = { - name = "_at_commitlint_slash_execute-rule"; - packageName = "@commitlint/execute-rule"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.8.0.tgz"; - sha512 = "fuLeI+EZ9x2v/+TXKAjplBJWI9CNrHnyi5nvUQGQt4WRkww/d95oVRsc9ajpt4xFrFmqMZkd/xBQHZDvALIY7A=="; - }; - }; - "@commitlint/format-19.8.0" = { - name = "_at_commitlint_slash_format"; - packageName = "@commitlint/format"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-19.8.0.tgz"; - sha512 = "EOpA8IERpQstxwp/WGnDArA7S+wlZDeTeKi98WMOvaDLKbjptuHWdOYYr790iO7kTCif/z971PKPI2PkWMfOxg=="; - }; - }; - "@commitlint/is-ignored-19.8.0" = { - name = "_at_commitlint_slash_is-ignored"; - packageName = "@commitlint/is-ignored"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.8.0.tgz"; - sha512 = "L2Jv9yUg/I+jF3zikOV0rdiHUul9X3a/oU5HIXhAJLE2+TXTnEBfqYP9G5yMw/Yb40SnR764g4fyDK6WR2xtpw=="; - }; - }; - "@commitlint/lint-19.8.0" = { - name = "_at_commitlint_slash_lint"; - packageName = "@commitlint/lint"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-19.8.0.tgz"; - sha512 = "+/NZKyWKSf39FeNpqhfMebmaLa1P90i1Nrb1SrA7oSU5GNN/lksA4z6+ZTnsft01YfhRZSYMbgGsARXvkr/VLQ=="; - }; - }; - "@commitlint/load-19.8.0" = { - name = "_at_commitlint_slash_load"; - packageName = "@commitlint/load"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-19.8.0.tgz"; - sha512 = "4rvmm3ff81Sfb+mcWT5WKlyOa+Hd33WSbirTVUer0wjS1Hv/Hzr07Uv1ULIV9DkimZKNyOwXn593c+h8lsDQPQ=="; - }; - }; - "@commitlint/message-19.8.0" = { - name = "_at_commitlint_slash_message"; - packageName = "@commitlint/message"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-19.8.0.tgz"; - sha512 = "qs/5Vi9bYjf+ZV40bvdCyBn5DvbuelhR6qewLE8Bh476F7KnNyLfdM/ETJ4cp96WgeeHo6tesA2TMXS0sh5X4A=="; - }; - }; - "@commitlint/parse-19.8.0" = { - name = "_at_commitlint_slash_parse"; - packageName = "@commitlint/parse"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-19.8.0.tgz"; - sha512 = "YNIKAc4EXvNeAvyeEnzgvm1VyAe0/b3Wax7pjJSwXuhqIQ1/t2hD3OYRXb6D5/GffIvaX82RbjD+nWtMZCLL7Q=="; - }; - }; - "@commitlint/read-19.8.0" = { - name = "_at_commitlint_slash_read"; - packageName = "@commitlint/read"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-19.8.0.tgz"; - sha512 = "6ywxOGYajcxK1y1MfzrOnwsXO6nnErna88gRWEl3qqOOP8MDu/DTeRkGLXBFIZuRZ7mm5yyxU5BmeUvMpNte5w=="; - }; - }; - "@commitlint/resolve-extends-19.8.0" = { - name = "_at_commitlint_slash_resolve-extends"; - packageName = "@commitlint/resolve-extends"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.8.0.tgz"; - sha512 = "CLanRQwuG2LPfFVvrkTrBR/L/DMy3+ETsgBqW1OvRxmzp/bbVJW0Xw23LnnExgYcsaFtos967lul1CsbsnJlzQ=="; - }; - }; - "@commitlint/rules-19.8.0" = { - name = "_at_commitlint_slash_rules"; - packageName = "@commitlint/rules"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-19.8.0.tgz"; - sha512 = "IZ5IE90h6DSWNuNK/cwjABLAKdy8tP8OgGVGbXe1noBEX5hSsu00uRlLu6JuruiXjWJz2dZc+YSw3H0UZyl/mA=="; - }; - }; - "@commitlint/to-lines-19.8.0" = { - name = "_at_commitlint_slash_to-lines"; - packageName = "@commitlint/to-lines"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-19.8.0.tgz"; - sha512 = "3CKLUw41Cur8VMjh16y8LcsOaKbmQjAKCWlXx6B0vOUREplp6em9uIVhI8Cv934qiwkbi2+uv+mVZPnXJi1o9A=="; - }; - }; - "@commitlint/top-level-19.8.0" = { - name = "_at_commitlint_slash_top-level"; - packageName = "@commitlint/top-level"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-19.8.0.tgz"; - sha512 = "Rphgoc/omYZisoNkcfaBRPQr4myZEHhLPx2/vTXNLjiCw4RgfPR1wEgUpJ9OOmDCiv5ZyIExhprNLhteqH4FuQ=="; - }; - }; - "@commitlint/types-19.8.0" = { - name = "_at_commitlint_slash_types"; - packageName = "@commitlint/types"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-19.8.0.tgz"; - sha512 = "LRjP623jPyf3Poyfb0ohMj8I3ORyBDOwXAgxxVPbSD0unJuW2mJWeiRfaQinjtccMqC5Wy1HOMfa4btKjbNxbg=="; - }; - }; "@conventional-changelog/git-client-1.0.1" = { name = "_at_conventional-changelog_slash_git-client"; packageName = "@conventional-changelog/git-client"; @@ -3027,15 +2892,6 @@ let sha512 = "3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ=="; }; }; - "@types/conventional-commits-parser-5.0.1" = { - name = "_at_types_slash_conventional-commits-parser"; - packageName = "@types/conventional-commits-parser"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.1.tgz"; - sha512 = "7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ=="; - }; - }; "@types/cors-2.8.17" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; @@ -7590,15 +7446,6 @@ let sha512 = "tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w=="; }; }; - "conventional-changelog-angular-7.0.0" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz"; - sha512 = "ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ=="; - }; - }; "conventional-changelog-angular-8.0.0" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -7716,15 +7563,6 @@ let sha512 = "tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q=="; }; }; - "conventional-commits-parser-5.0.0" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz"; - sha512 = "ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA=="; - }; - }; "conventional-commits-parser-6.1.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; @@ -7887,15 +7725,6 @@ let sha512 = "itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg=="; }; }; - "cosmiconfig-typescript-loader-6.1.0" = { - name = "cosmiconfig-typescript-loader"; - packageName = "cosmiconfig-typescript-loader"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.1.0.tgz"; - sha512 = "tJ1w35ZRUiM5FeTzT7DtYWAFFv37ZLqSRkGi2oeCK1gPhvaWjkAtfXvLmvE1pRfxxp9aQo6ba/Pvg1dKj05D4g=="; - }; - }; "cp-file-10.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -8400,15 +8229,6 @@ let sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="; }; }; - "dargs-8.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz"; - sha512 = "wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw=="; - }; - }; "dash-ast-1.0.0" = { name = "dash-ast"; packageName = "dash-ast"; @@ -11199,15 +11019,6 @@ let sha512 = "v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw=="; }; }; - "find-up-7.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz"; - sha512 = "YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g=="; - }; - }; "find-up-simple-1.0.1" = { name = "find-up-simple"; packageName = "find-up-simple"; @@ -11964,15 +11775,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-raw-commits-4.0.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz"; - sha512 = "ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ=="; - }; - }; "git-raw-commits-5.0.0" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -13386,15 +13188,6 @@ let sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; - "import-meta-resolve-4.1.0" = { - name = "import-meta-resolve"; - packageName = "import-meta-resolve"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz"; - sha512 = "I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw=="; - }; - }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -14700,15 +14493,6 @@ let sha512 = "9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w=="; }; }; - "is-text-path-2.0.0" = { - name = "is-text-path"; - packageName = "is-text-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz"; - sha512 = "+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw=="; - }; - }; "is-typed-array-1.1.15" = { name = "is-typed-array"; packageName = "is-typed-array"; @@ -16329,15 +16113,6 @@ let sha512 = "yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q=="; }; }; - "lodash.kebabcase-4.1.1" = { - name = "lodash.kebabcase"; - packageName = "lodash.kebabcase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g=="; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -16356,15 +16131,6 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "lodash.mergewith-4.6.2" = { - name = "lodash.mergewith"; - packageName = "lodash.mergewith"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; - sha512 = "GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="; - }; - }; "lodash.omitby-4.6.0" = { name = "lodash.omitby"; packageName = "lodash.omitby"; @@ -16383,24 +16149,6 @@ let sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; - "lodash.snakecase-4.1.1" = { - name = "lodash.snakecase"; - packageName = "lodash.snakecase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; - sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; - }; - }; - "lodash.startcase-4.4.0" = { - name = "lodash.startcase"; - packageName = "lodash.startcase"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz"; - sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg=="; - }; - }; "lodash.template-4.5.0" = { name = "lodash.template"; packageName = "lodash.template"; @@ -16491,15 +16239,6 @@ let sha512 = "7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="; }; }; - "lodash.upperfirst-4.3.1" = { - name = "lodash.upperfirst"; - packageName = "lodash.upperfirst"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; - sha512 = "sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg=="; - }; - }; "lodash.zip-4.2.0" = { name = "lodash.zip"; packageName = "lodash.zip"; @@ -24798,15 +24537,6 @@ let sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; - "split2-4.2.0" = { - name = "split2"; - packageName = "split2"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz"; - sha512 = "UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="; - }; - }; "sprintf-js-1.0.3" = { name = "sprintf-js"; packageName = "sprintf-js"; @@ -25842,15 +25572,6 @@ let sha512 = "3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA=="; }; }; - "text-extensions-2.4.0" = { - name = "text-extensions"; - packageName = "text-extensions"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz"; - sha512 = "te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g=="; - }; - }; "text-hex-1.0.0" = { name = "text-hex"; packageName = "text-hex"; @@ -29694,130 +29415,6 @@ in bypassCache = true; reconstructLock = true; }; - "@commitlint/cli" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_cli"; - packageName = "@commitlint/cli"; - version = "19.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-19.8.0.tgz"; - sha512 = "t/fCrLVu+Ru01h0DtlgHZXbHV2Y8gKocTR5elDOqIRUzQd0/6hpt2VIWOj9b3NDo7y4/gfxeR2zRtXq/qO6iUg=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@commitlint/config-validator-19.8.0" - sources."@commitlint/ensure-19.8.0" - sources."@commitlint/execute-rule-19.8.0" - sources."@commitlint/format-19.8.0" - sources."@commitlint/is-ignored-19.8.0" - sources."@commitlint/lint-19.8.0" - sources."@commitlint/load-19.8.0" - sources."@commitlint/message-19.8.0" - sources."@commitlint/parse-19.8.0" - sources."@commitlint/read-19.8.0" - sources."@commitlint/resolve-extends-19.8.0" - sources."@commitlint/rules-19.8.0" - sources."@commitlint/to-lines-19.8.0" - sources."@commitlint/top-level-19.8.0" - sources."@commitlint/types-19.8.0" - sources."@types/conventional-commits-parser-5.0.1" - sources."@types/node-22.13.10" - sources."JSONStream-1.3.5" - sources."ajv-8.17.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-ify-1.0.0" - sources."callsites-3.1.0" - sources."chalk-5.4.1" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."compare-func-2.0.0" - sources."conventional-changelog-angular-7.0.0" - sources."conventional-commits-parser-5.0.0" - sources."cosmiconfig-9.0.0" - sources."cosmiconfig-typescript-loader-6.1.0" - sources."dargs-8.1.0" - sources."dot-prop-5.3.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."error-ex-1.3.2" - sources."escalade-3.2.0" - sources."fast-deep-equal-3.1.3" - sources."fast-uri-3.0.6" - sources."find-up-7.0.0" - sources."get-caller-file-2.0.5" - sources."git-raw-commits-4.0.0" - sources."global-directory-4.0.1" - ( - sources."import-fresh-3.3.1" - // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - } - ) - sources."import-meta-resolve-4.1.0" - sources."ini-4.1.1" - sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-obj-2.0.0" - sources."is-text-path-2.0.0" - sources."jiti-2.4.2" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-1.0.0" - sources."jsonparse-1.3.1" - sources."lines-and-columns-1.2.4" - sources."locate-path-7.2.0" - sources."lodash.camelcase-4.3.0" - sources."lodash.isplainobject-4.0.6" - sources."lodash.kebabcase-4.1.1" - sources."lodash.merge-4.6.2" - sources."lodash.mergewith-4.6.2" - sources."lodash.snakecase-4.1.1" - sources."lodash.startcase-4.4.0" - sources."lodash.uniq-4.5.0" - sources."lodash.upperfirst-4.3.1" - sources."meow-12.1.1" - sources."minimist-1.2.8" - sources."p-limit-4.0.0" - sources."p-locate-6.0.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-exists-5.0.0" - sources."picocolors-1.1.1" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."resolve-from-5.0.0" - sources."semver-7.7.1" - sources."split2-4.2.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."text-extensions-2.4.0" - sources."through-2.3.8" - sources."tinyexec-0.3.2" - sources."typescript-5.8.2" - sources."undici-types-6.20.0" - sources."unicorn-magic-0.1.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yocto-queue-1.2.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Lint your commit messages"; - homepage = "https://commitlint.js.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b166db126cb..b5c15f512d01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1202,8 +1202,6 @@ with pkgs; cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { }; - commitlint = nodePackages."@commitlint/cli"; - datalad = with python3Packages; toPythonApplication datalad; datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; From 2a5661fe789ba584a17a22b3fe3c85670a0b136a Mon Sep 17 00:00:00 2001 From: flurie Date: Sat, 8 Nov 2025 16:14:48 -0500 Subject: [PATCH 1790/2279] aeron-cpp: fix build on darwin --- pkgs/by-name/ae/aeron-cpp/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix index 015ff45435e7..5b084c51c9a6 100644 --- a/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -4,6 +4,7 @@ cmake, fetchFromGitHub, fetchMavenArtifact, + fixDarwinDylibNames, jdk11, lib, libbsd, @@ -54,11 +55,16 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - autoPatchelfHook cmake jdk11 makeWrapper patchelf + ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ] + ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; configurePhase = '' @@ -113,6 +119,12 @@ stdenv.mkDerivation { runHook postInstall ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + for lib in $out/lib/*.dylib; do + install_name_tool -change "@rpath/$(basename $lib)" "$lib" "$out/bin/aeronmd" + done + ''; + meta = with lib; { description = "Aeron Messaging C++ Library"; homepage = "https://aeron.io/"; From de16317b4be8f19de69e5c04cdbcb01063b946ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:20:21 +0100 Subject: [PATCH 1791/2279] python312Packages.mypy-boto3-controltower: 1.40.60 -> 1.40.69 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 16cddd338585..54b9d5812fec 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -358,8 +358,8 @@ in "sha256-BiKly8tW0MFacKF8mG80xsITdxegCcG3sKal7axoGf0="; mypy-boto3-controltower = - buildMypyBoto3Package "controltower" "1.40.60" - "sha256-1xHVUCYTzIWYU7RLk8MzqF3/5qfItTeIXC7um4ZgIwI="; + buildMypyBoto3Package "controltower" "1.40.69" + "sha256-kjvZbq00bwjGVPkPcSypkkMC0vIKURAJDI3RUpCPL2I="; mypy-boto3-cur = buildMypyBoto3Package "cur" "1.40.58" From d09aa3bc2624a90716cafd0237d8eb49980b5261 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:20:29 +0100 Subject: [PATCH 1792/2279] python312Packages.mypy-boto3-ec2: 1.40.64 -> 1.40.69 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 54b9d5812fec..202ea5f16e83 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ in "sha256-eKwS+FXicnxiHr2aTDG+ih6kDxQ24NLCkI9XPt2LjvQ="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.40.64" - "sha256-6+jjuG6iqXLjjuztY1FX/exSl5BjdKsrg1EOQM1w0Io="; + buildMypyBoto3Package "ec2" "1.40.69" + "sha256-WUUBMnOX+mCVBrmWCy9fBIPuLOnk71djASEli0pKPZ8="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.40.57" From 34247b4e3ce12b443cee53f3bd6cf08b021eb914 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:20:51 +0100 Subject: [PATCH 1793/2279] python312Packages.mypy-boto3-kms: 1.40.63 -> 1.40.69 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 202ea5f16e83..05b889364b5e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -761,8 +761,8 @@ in "sha256-lViXLfbEMpMenVxZmcp2cfhd0SqH2IiMPOIaOdimU00="; mypy-boto3-kms = - buildMypyBoto3Package "kms" "1.40.63" - "sha256-TI+hBy1rbDzEaxb4aTQ5PbZyhGNChowdlmjDvVKltIU="; + buildMypyBoto3Package "kms" "1.40.69" + "sha256-bLWUM5Ol9WZGqReXlyeduBlXFmnSZorLL4HmbBpBZBM="; mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.40.55" From f32f9f4986d16aa9453ed9935094850dbca6f6d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:21:06 +0100 Subject: [PATCH 1794/2279] python312Packages.mypy-boto3-opensearch: 1.40.61 -> 1.40.69 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 05b889364b5e..53f03cd81889 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -969,8 +969,8 @@ in "sha256-hjgvlTcA18OeMpJIgpl+ml4zSc73HXrUrM0adOzScl4="; mypy-boto3-opensearch = - buildMypyBoto3Package "opensearch" "1.40.61" - "sha256-B5yKX/xElj3pjsLItXJNm5eV+KPmU/ivVz6MR6g88s0="; + buildMypyBoto3Package "opensearch" "1.40.69" + "sha256-ql9SD9ZZ2k54A2oZkSS3wWFfswetl5/oVoGyzYb29wI="; mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.40.58" From 85677d4fd822d94dbd8e4a6a9059431b78c2e963 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:21:35 +0100 Subject: [PATCH 1795/2279] python312Packages.mypy-boto3-vpc-lattice: 1.40.59 -> 1.40.69 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 53f03cd81889..dc27ac602e39 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1385,8 +1385,8 @@ in "sha256-6usEXd0rpBSaLBKHawPIiPzqfHoNCGVO8c2p0eBqrvs="; mypy-boto3-vpc-lattice = - buildMypyBoto3Package "vpc-lattice" "1.40.59" - "sha256-39fPl4F2Xiz6+AN8HeGi33Yjj9mfxvU3ZmklLY0STMk="; + buildMypyBoto3Package "vpc-lattice" "1.40.69" + "sha256-pzWCGZbQ6idUKwNWxGyg45Z4rRzdReADX1u+934VmEs="; mypy-boto3-waf = buildMypyBoto3Package "waf" "1.40.64" From 5f42e29bd506c3032282b6b8db53084175c057b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:21:42 +0100 Subject: [PATCH 1796/2279] python313Packages.botocore-stubs: 1.40.67 -> 1.40.69 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 24206df5f31c..caae8ea2628b 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.40.67"; + version = "1.40.69"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-hk+f7UJy1+YrSlHaOxRe30J0AsH5l4YSpETtHo/fncc="; + hash = "sha256-MdG7mlFA35uoPW1NZraJmHZyeYUN5Q4oyq3jFSRLCng="; }; nativeBuildInputs = [ setuptools ]; From 4c05d5ce9dcbbe6e8223ad5495a329951f4f0b1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:21:47 +0100 Subject: [PATCH 1797/2279] python313Packages.boto3-stubs: 1.40.64 -> 1.40.69 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index f9f690d775ab..470f3220f7de 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.64"; + version = "1.40.69"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-r0p/tnvaDBJ3r81FolBlYFVn0mCor9NLvfF5nSSSM08="; + hash = "sha256-JEEhZyxhS1hCbxYw9Whagh9KjP9J3u1ZoofZ2Rx6TWQ="; }; build-system = [ setuptools ]; From 95ae2ac1388dfc7993dd5710d6f9264fab34fed0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:23:42 +0100 Subject: [PATCH 1798/2279] python313Packages.asteval: modernize --- pkgs/development/python-modules/asteval/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 68aec3379bf4..20949f3e581d 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools-scm, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "1.0.7"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "lmfit"; repo = "asteval"; @@ -39,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "AST evaluator of Python expression using ast module"; homepage = "https://github.com/lmfit/asteval"; - changelog = "https://github.com/lmfit/asteval/releases/tag/${version}"; + changelog = "https://github.com/lmfit/asteval/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From ce24f735858513b63840b3bab216ee1e4ec76773 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 8 Nov 2025 22:24:42 +0100 Subject: [PATCH 1799/2279] yaziPlugins.bookmarks: init at 0.2.5-unstable-2025-07-09 --- .../ya/yazi/plugins/bookmarks/default.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix b/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix new file mode 100644 index 000000000000..bb97c06b595e --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/bookmarks/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "bookmarks.yazi"; + version = "0.2.5-unstable-2025-07-09"; + + src = fetchFromGitHub { + owner = "dedukun"; + repo = "bookmarks.yazi"; + rev = "9ef1254d8afe88aba21cd56a186f4485dd532ab8"; + hash = "sha256-GQFBRB2aQqmmuKZ0BpcCAC4r0JFKqIANZNhUC98SlwY="; + }; + + meta = { + description = "Yazi plugin that adds the basic functionality of vi-like marks"; + homepage = "https://github.com/dedukun/bookmarks.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eljamm ]; + }; +} From a4f1c91d195f826b466e035ac58e8deafb52f9f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:31:26 +0100 Subject: [PATCH 1800/2279] python313Packages.iamdata: 0.1.202511061 -> 0.1.202511081 Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202511061...v0.1.202511081 Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511081 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index b553f1be0878..fde5b9ed486e 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511061"; + version = "0.1.202511081"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-SEbER6oe5BK/6HpvMh+UD7rvGyPNJ1zxLD9LNis8QJw="; + hash = "sha256-0yV5yZ0gElw2p8UjwU6ujkXu1DV2cmOPlG9XgObUNUA="; }; __darwinAllowLocalNetworking = true; From ce4d7b5e2d194f77a27f43a4b10d82088dfbd79c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 8 Nov 2025 21:51:24 +0000 Subject: [PATCH 1801/2279] rebels-in-the-sky: 1.1.0 -> 1.1.2 --- pkgs/by-name/re/rebels-in-the-sky/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix index 67574890a98b..633a78f640e3 100644 --- a/pkgs/by-name/re/rebels-in-the-sky/package.nix +++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebels-in-the-sky"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "ricott1"; repo = "rebels-in-the-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-wkYzYKFoMn+cKZUaQn9GRxYXXe60ea6UFjamdrxjJFs="; + hash = "sha256-37sStLh2gZm5aV2czvV7lU+aCUyed8/ZKPRUb02AQQw="; }; - cargoHash = "sha256-6qLIrUa5wvh4TQhl/JQLV0QKtgSQZNT4l6Z+2121BmY="; + cargoHash = "sha256-qj9Utd8mICP7Ulx86PWNusV/7OvfaI4u3qvbp69kYP0="; patches = lib.optionals (!withRadio) [ ./disable-radio.patch From f18a27f91b9045ce211e9907358df431fa920b41 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Nov 2025 22:20:40 -0500 Subject: [PATCH 1802/2279] wxwidgets_3_3: fix darwin build failure --- pkgs/by-name/wx/wxwidgets_3_3/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index 9f16a12edbb5..7a8236a7792f 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -86,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}" "--with-osx_cocoa" "--with-libiconv" "--with-urlsession" # for wxWebRequest From 2df0b9e7281fd0385f2c8d28ed74bf58064cdacb Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Nov 2025 22:20:49 -0500 Subject: [PATCH 1803/2279] wxGTK32: fix darwin build failure --- pkgs/by-name/wx/wxGTK32/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index 80a179152dfb..ef47cfef5bab 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}" "--with-osx_cocoa" "--with-libiconv" "--with-urlsession" # for wxWebRequest From 52a618d7bb281f32cc877de61982bd0a26da1ba6 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 7 Nov 2025 22:25:19 -0500 Subject: [PATCH 1804/2279] wxGTK31: fix darwin build failure --- pkgs/by-name/wx/wxGTK31/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix index e474550d6223..b9176a248730 100644 --- a/pkgs/by-name/wx/wxGTK31/package.nix +++ b/pkgs/by-name/wx/wxGTK31/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}" "--with-osx_cocoa" "--with-libiconv" ] From cd1230cbb4988b4215a1827671124aa82ab899cd Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 8 Nov 2025 16:56:03 -0500 Subject: [PATCH 1805/2279] audacity: fix darwin build failure We link binaries with /usr/lib/libSystem.B.dylib but patchPhase was patching upstream fix_bundle script so that it was overriding references to it with @loader_path/../Frameworks, breaking the build. --- pkgs/by-name/au/audacity/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 3f4110c6c7f7..919298baf10e 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ - --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" + --replace-fail "path.startswith('/usr/lib/')" "path.startswith('/usr/lib/') or path.startswith('${builtins.storeDir}')" '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ From 52696ff186b66fc6cdfe95c257c9bfc35f1bdf9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:57:55 +0100 Subject: [PATCH 1806/2279] python313Packages.meshtastic: 2.7.3 -> 2.7.4 Diff: https://github.com/meshtastic/python/compare/2.7.3...2.7.4 Changelog: https://github.com/meshtastic/python/releases/tag/2.7.4 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 2c321fa6e721..d3a95fba1bd7 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.7.3"; + version = "2.7.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "python"; tag = version; - hash = "sha256-9p9tDc74WpH0+8orI69bW2Yj7Cow4v7M3cotIbk/mcw="; + hash = "sha256-fIr80k++BwA3UFgeS9Fgq6fpOOIcK4jj7bjfjqkc6ug="; }; pythonRelaxDeps = [ From 84c49e758cd3539d25581b5fe5b1e1845d06a27d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 21 Oct 2025 13:34:57 +0000 Subject: [PATCH 1807/2279] supercell-wx: 0.4.9 -> 0.5.3, cleanup Diff: https://github.com/dpaulat/supercell-wx/compare/v0.4.9-release...v0.5.3-release Changelog: https://github.com/dpaulat/supercell-wx/releases/tag/v0.5.3-release Co-authored-by: aware70 <7832566+aware70@users.noreply.github.com> --- pkgs/by-name/su/supercell-wx/package.nix | 176 ++++++++++-------- .../patches/explicit-link-aws-crt.patch | 6 +- .../patches/fix-cmake-install.patch | 27 +-- .../patches/fix-find-opengl.patch | 27 +++ .../patches/skip-git-versioning.patch | 8 +- .../patches/use-find-package.patch | 34 ++-- 6 files changed, 165 insertions(+), 113 deletions(-) create mode 100644 pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index 587444f6e36b..1f4f94076ee6 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -1,44 +1,50 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, - fetchpatch, - aws-sdk-cpp, - bzip2, + replaceVars, + tracy, + + # nativeBuildInputs cmake, ninja, - zlib, - openssl, - curl, - glew, - geos, + qt6, + + # buildInputs + aws-sdk-cpp, boost, - spdlog, - stb, + bzip2, + geos, + geographiclib, + glew, + glm, + gtest, + howard-hinnant-date, + libSM, libcpr, libpng, - libSM, - geographiclib, - howard-hinnant-date, - re2, - gtest, - glm, - qt6, onetbb, - tracy, - replaceVars, + openssl, python3, + range-v3, + re2, + spdlog, + stb, + zlib, }: let gtestSkip = [ # Skip tests requiring network access - "AwsLevel*DataProvider.FindKeyNow" "AwsLevel*DataProvider.FindKeyFixed" - "AwsLevel*DataProvider.LoadObjectByKey" - "AwsLevel*DataProvider.Refresh" + "AwsLevel*DataProvider.FindKeyNow" "AwsLevel*DataProvider.GetAvailableProducts" "AwsLevel*DataProvider.GetTimePointsByDate" + "AwsLevel*DataProvider.LoadObjectByKey" "AwsLevel*DataProvider.Prune" + "AwsLevel*DataProvider.Refresh" + "IemApiProviderTest.*" + "NtpClient.*" + "NwsApiProviderTest.*" "UpdateManagerTest.CheckForUpdates" "WarningsProvider*\"https" @@ -50,47 +56,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "supercell-wx"; - version = "0.4.9"; + version = "0.5.3"; + src = fetchFromGitHub { owner = "dpaulat"; repo = "supercell-wx"; - rev = "refs/tags/v${finalAttrs.version}-release"; - sha256 = "sha256-3fVUxbGosN4Y4h8BJXUV7DNv7VZTma+IsV94+Zt8DCA="; + tag = "v${finalAttrs.version}-release"; fetchSubmodules = true; + hash = "sha256-1n1WXBLco2TpyhS8KA1tk6HzRIXLqS6YV3aYagoQiTM="; }; - meta = { - homepage = "https://supercell-wx.rtfd.io"; - downloadPage = "https://github.com/dpaulat/supercell-wx/releases"; - description = "Live visualization of NEXRAD weather data and alerts"; - longDescription = '' - Supercell Wx is a free, open source application to visualize live and - archive NEXRAD Level 2 and Level 3 data, and severe weather alerts. - It displays continuously updating weather data on top of a responsive - map, providing the capability to monitor weather events using - reflectivity, velocity, and other products. - ''; - license = lib.licenses.mit; - mainProgram = "supercell-wx"; - platforms = [ - "x86_64-linux" - # "aarch64-linux" - ]; - maintainers = with lib.maintainers; [ aware70 ]; - }; - - env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow -DQT_NO_USE_NODISCARD_FILE_OPEN"; - env.GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}"; - - doCheck = true; - - # These tests aren't built by 'all', but ctest still tries to run them. - cmakeFlags = [ - "-DCMAKE_CTEST_ARGUMENTS=-E;'test_mln_core|test_mln_widgets'" - "-DSTB_INCLUDE_DIR=${stb}/include/stb" - "-DFETCHCONTENT_SOURCE_DIR_TRACY=${tracy.src}" - ]; - patches = [ # These are for Nix compatibility {{{ ./patches/use-find-package.patch # Replace some vendored dependencies with Nix provided versions @@ -105,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { # These may be or already are submitted upstream {{{ ./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp ./patches/fix-qt-6.10.patch + ./patches/fix-find-opengl.patch # }}} ]; @@ -114,6 +90,28 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "CMAKE_SOURCE_DIR" "PROJECT_SOURCE_DIR" ''; + env = { + CXXFLAGS = lib.concatStringsSep " " [ + "-Wno-error=deprecated-declarations" + "-Wno-error=maybe-uninitialized" + "-Wno-error=restrict" + "-Wno-error=stringop-overflow" + "-DQT_NO_USE_NODISCARD_FILE_OPEN" + ]; + GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}"; + }; + + cmakeFlags = [ + # CMake Error at external/aws-sdk-cpp/crt/aws-crt-cpp/cmake/EnforceSubmoduleVersions.cmake:18 (message): + # ENFORCE_SUBMODULE_VERSIONS is ON but Git was not found. + (lib.cmakeBool "ENFORCE_SUBMODULE_VERSIONS" false) + + # These tests aren't built by 'all', but ctest still tries to run them. + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;'test_mln_core|test_mln_widgets'") + (lib.cmakeFeature "STB_INCLUDE_DIR" "${stb}/include/stb") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TRACY" "${tracy.src}") + ]; + nativeBuildInputs = [ cmake ninja @@ -121,36 +119,37 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - zlib - openssl - qt6.qtbase - qt6.qttools - qt6.qtmultimedia - qt6.qtpositioning - qt6.qtimageformats aws-sdk-cpp - howard-hinnant-date boost - onetbb - glew + bzip2 geos - spdlog - stb - libcpr - libpng - libSM - re2 - openssl # FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ? (geographiclib.overrideAttrs { outputs = [ "out" ]; }) - gtest + glew glm - bzip2 + gtest + howard-hinnant-date + libSM + libcpr + libpng + onetbb + openssl (python3.withPackages (ps: [ ps.geopandas + ps.jinja2 ])) + qt6.qtbase + qt6.qtimageformats + qt6.qtmultimedia + qt6.qtpositioning + qt6.qttools + re2 + range-v3 + spdlog + stb + zlib ]; # Currently crashes on wayland; must force X11 @@ -158,10 +157,33 @@ stdenv.mkDerivation (finalAttrs: { "--set QT_QPA_PLATFORM xcb" ]; + doCheck = true; + # Install .desktop file and icons postInstall = '' install -m0644 -D "$src/scwx-qt/res/linux/supercell-wx.desktop" "$out/share/applications/supercell-wx.desktop" install -m0644 -D "$src/scwx-qt/res/icons/scwx-256.png" "$out/share/icons/hicolor/256x256/apps/supercell-wx.png" install -m0644 -D "$src/scwx-qt/res/icons/scwx-64.png" "$out/share/icons/hicolor/64x64/apps/supercell-wx.png" ''; + + meta = { + homepage = "https://supercell-wx.rtfd.io"; + downloadPage = "https://github.com/dpaulat/supercell-wx/releases"; + description = "Live visualization of NEXRAD weather data and alerts"; + changelog = "https://github.com/dpaulat/supercell-wx/releases/tag/${finalAttrs.src.tag}"; + longDescription = '' + Supercell Wx is a free, open source application to visualize live and + archive NEXRAD Level 2 and Level 3 data, and severe weather alerts. + It displays continuously updating weather data on top of a responsive + map, providing the capability to monitor weather events using + reflectivity, velocity, and other products. + ''; + license = lib.licenses.mit; + mainProgram = "supercell-wx"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + maintainers = with lib.maintainers; [ aware70 ]; + }; }) diff --git a/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch b/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch index ecd9471dd7de..3fca9577a889 100644 --- a/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch +++ b/pkgs/by-name/su/supercell-wx/patches/explicit-link-aws-crt.patch @@ -1,12 +1,12 @@ diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake -index 47ada181..a1beea15 100644 +index 36911947..451efc13 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake -@@ -280,6 +280,7 @@ endif() +@@ -320,6 +320,7 @@ endif() target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core aws-cpp-sdk-s3 + aws-crt-cpp cpr::cpr LibXml2::LibXml2 - re2::re2 + OpenSSL::Crypto diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch b/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch index 88e38047756f..4db8401e3e94 100644 --- a/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch +++ b/pkgs/by-name/su/supercell-wx/patches/fix-cmake-install.patch @@ -1,22 +1,24 @@ diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake -index cda6c7f..32d807a 100644 +index 648b6578..4833b9c2 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake -@@ -601,6 +601,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets - Boost::json +@@ -776,6 +776,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Boost::timer + Boost::atomic QMapLibre::Core + QMapLibre::Widgets $<$:opengl32> + $<$:SetupAPI> Fontconfig::Fontconfig - GeographicLib::GeographicLib -@@ -615,40 +616,13 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets +@@ -793,18 +794,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets target_link_libraries(supercell-wx PRIVATE scwx-qt wxdata) --# Set DT_RUNPATH for Linux targets --set_target_properties(MLNQtCore PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core --set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") +-if (LINUX) +- # Set DT_RUNPATH for Linux targets +- set_target_properties(MLNQtCore PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core +- set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") +-endif() - install(TARGETS supercell-wx - MLNQtCore # QMapLibre::Core @@ -26,7 +28,8 @@ index cda6c7f..32d807a 100644 - "^(/usr)?/lib/.*\\.so(\\..*)?" RUNTIME COMPONENT supercell-wx - LIBRARY + BUNDLE +@@ -819,24 +809,6 @@ install(TARGETS supercell-wx COMPONENT supercell-wx OPTIONAL) @@ -48,6 +51,6 @@ index cda6c7f..32d807a 100644 -install(SCRIPT ${deploy_script_scwx} - COMPONENT supercell-wx) - - if (MSVC) - set(CPACK_PACKAGE_NAME "Supercell Wx") - set(CPACK_PACKAGE_VENDOR "Dan Paulat") + if (APPLE) + # Install additional script to fix up the bundle + install(CODE [[ diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch b/pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch new file mode 100644 index 000000000000..f3aebc9c99e0 --- /dev/null +++ b/pkgs/by-name/su/supercell-wx/patches/fix-find-opengl.patch @@ -0,0 +1,27 @@ +diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake +index 648b6578..3f1d8070 100644 +--- a/scwx-qt/scwx-qt.cmake ++++ b/scwx-qt/scwx-qt.cmake +@@ -18,7 +18,7 @@ find_package(Fontconfig) + find_package(geographiclib) + find_package(geos) + find_package(glm) +-find_package(OpenGL) ++find_package(OpenGL REQUIRED) + find_package(Python COMPONENTS Interpreter) + find_package(SQLite3) + +@@ -759,12 +759,7 @@ if (LINUX) + target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient) + endif() + +-if (LINUX) +- find_package(mesa-glu REQUIRED) +- target_link_libraries(scwx-qt PUBLIC mesa-glu::mesa-glu) +-else() +- target_link_libraries(scwx-qt PUBLIC OpenGL::GLU) +-endif() ++target_link_libraries(scwx-qt PUBLIC OpenGL::GLU) + + target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets + Qt${QT_VERSION_MAJOR}::OpenGLWidgets diff --git a/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch b/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch index 7f7ce9a50ad8..842d4118256a 100644 --- a/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch +++ b/pkgs/by-name/su/supercell-wx/patches/skip-git-versioning.patch @@ -1,5 +1,5 @@ diff --git a/scwx-qt/tools/generate_versions.py b/scwx-qt/tools/generate_versions.py -index c6c94020..3fcdcf08 100644 +index c6c94020..000f6e6e 100644 --- a/scwx-qt/tools/generate_versions.py +++ b/scwx-qt/tools/generate_versions.py @@ -1,6 +1,5 @@ @@ -9,7 +9,7 @@ index c6c94020..3fcdcf08 100644 import json import os import pathlib -@@ -110,27 +109,22 @@ def ParseArguments(): +@@ -110,27 +109,23 @@ def ParseArguments(): required = True) return parser.parse_args() @@ -25,7 +25,7 @@ index c6c94020..3fcdcf08 100644 print("Collecting version info") versionInfo = VersionInfo() -- + - repo = git.Repo(args.gitRepo_, search_parent_directories = True) - - commitString = str(repo.head.commit)[:10] @@ -43,7 +43,7 @@ index c6c94020..3fcdcf08 100644 - versionInfo.copyrightYear_ = copyrightYear - versionInfo.resourceDir_ = resourceDir + versionInfo.commitString_ = "@rev@" -+ versionInfo.copyrightYear_ = GetYearFromLicense(args.gitRepo_ / 'LICENSE.txt') ++ versionInfo.copyrightYear_ = GetYearFromLicense(args.gitRepo_ / "LICENSE.txt") + versionInfo.resourceDir_ = str(args.gitRepo_).replace("\\", "\\\\") versionInfo.versionString_ = args.version_ diff --git a/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch b/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch index 945a58c6c80d..58f1eba3baa9 100644 --- a/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch +++ b/pkgs/by-name/su/supercell-wx/patches/use-find-package.patch @@ -1,63 +1,63 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 2137ae62..041cb87d 100644 +index 1039e96e..16f2c84a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -14,7 +14,7 @@ set_property(DIRECTORY +@@ -15,7 +15,7 @@ set_property(DIRECTORY units.cmake qt6ct.cmake) -include(aws-sdk-cpp.cmake) +find_package(AWSSDK CONFIG REQUIRED) include(date.cmake) + include(glad.cmake) include(hsluv-c.cmake) - include(imgui.cmake) diff --git a/external/stb.cmake b/external/stb.cmake -index 570af425..f9817226 100644 +index 570af425..f2e7b2c8 100644 --- a/external/stb.cmake +++ b/external/stb.cmake -@@ -1,4 +1,3 @@ +@@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 3.24) set(PROJECT_NAME scwx-stb) - + -set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE) +# Nix: set STB_INCLUDE_DIR in cmake flags diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake -index 09ea6fe3..c20a2cb6 100644 +index 4833b9c2..641fc637 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake -@@ -11,14 +11,15 @@ set(CMAKE_AUTORCC ON) - set(CMAKE_CXX_STANDARD 20) - set(CMAKE_CXX_STANDARD_REQUIRED ON) +@@ -13,14 +13,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + + OPTION(SCWX_DISABLE_CONSOLE "Disables the Windows console in release mode" ON) -find_package(Boost) -+find_package(Boost REQUIRED COMPONENTS json timer) ++find_package(Boost REQUIRED COMPONENTS json timer atomic) find_package(Fontconfig) -find_package(geographiclib) +find_package(GeographicLib) find_package(geos) - find_package(GLEW) find_package(glm) + find_package(OpenGL) find_package(Python COMPONENTS Interpreter) find_package(SQLite3) +find_package(PNG) find_package(QT NAMES Qt6 COMPONENTS Gui -@@ -699,6 +700,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets - imgui +@@ -789,6 +790,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets qt6ct-common + qt6ct-widgets SQLite::SQLite3 + PNG::PNG wxdata) target_link_libraries(supercell-wx PRIVATE scwx-qt diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake -index 94b0e3a7..a36c2c81 100644 +index 451efc13..86cbb42b 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake -@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.24) +@@ -4,7 +4,8 @@ project(scwx-data) - project(scwx-data) + include(CheckCXXSymbolExists) -find_package(Boost) +find_package(Boost REQUIRED COMPONENTS iostreams) From 3e7615cdc26a664ecc4dea0770f57af443fe7a6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 22:59:45 +0100 Subject: [PATCH 1808/2279] circup: 2.1.2 -> 2.3.0 Changelog: https://github.com/adafruit/circup/releases/tag/2.3.0 --- pkgs/by-name/ci/circup/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix index 2f4ac456ecbb..c7399218c2c4 100644 --- a/pkgs/by-name/ci/circup/package.nix +++ b/pkgs/by-name/ci/circup/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "2.1.2"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "circup"; tag = version; - hash = "sha256-lmuxqkZVByJwnfHj4yljWQwTvdLnguq3hZm6a7LN6Xo="; + hash = "sha256-o42gzdv69+BO5kTconZaMQBv89GzuFprf/UoZjF29oI="; }; pythonRelaxDeps = [ "semver" ]; @@ -42,6 +42,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Test requires network access "test_libraries_from_imports_bad" + "test_install_auto_file_bad" ]; meta = with lib; { From de3b605591b43dc5a6d01d1a7c9a3b5ecb8e58ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 23:01:22 +0100 Subject: [PATCH 1809/2279] python313Packages.meshtastic: modernize --- pkgs/development/python-modules/meshtastic/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index d3a95fba1bd7..872ce7fda7bc 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -23,7 +23,6 @@ pyserial, pytap2, pytestCheckHook, - pythonOlder, pyyaml, requests, riden, @@ -37,8 +36,6 @@ buildPythonPackage rec { version = "2.7.4"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "meshtastic"; repo = "python"; @@ -126,7 +123,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for talking to Meshtastic devices"; homepage = "https://github.com/meshtastic/python"; - changelog = "https://github.com/meshtastic/python/releases/tag/${version}"; + changelog = "https://github.com/meshtastic/python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 0df801e2760f5224e429efdbcb5b13aa46eb8b44 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 8 Nov 2025 14:02:29 -0800 Subject: [PATCH 1810/2279] python-aliases: correct error message for gpapi --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7cf00fbaa665..6031507b5b91 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -183,7 +183,7 @@ mapAliases { GitPython = throw "'GitPython' has been renamed to/replaced by 'gitpython'"; # Converted to throw 2025-10-29 google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29 googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2025-10-29 - gpapi = throw "'gpapi' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09 + gpapi = throw "'gpapi' has been superseded by google-api-python-client"; # Added 2025-11-09 gplaycli = throw "'gplaycli' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09 gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29 grappelli_safe = throw "'grappelli_safe' has been renamed to/replaced by 'grappelli-safe'"; # Converted to throw 2025-10-29 From 9b46c7ea31ee1dca7fc8852b0df2880150fed061 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Nov 2025 21:31:18 +0000 Subject: [PATCH 1811/2279] python3Packages.pytorch-lightning: 2.5.5 -> 2.5.6 Diff: https://github.com/Lightning-AI/pytorch-lightning/compare/2.5.5...2.5.6 Changelog: https://github.com/Lightning-AI/pytorch-lightning/releases/tag/2.5.6 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index d8e90c7c0cc2..979f6c4b0fa8 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.5.5"; + version = "2.5.6"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; tag = version; - hash = "sha256-8CDVvgaxnFWO4Fl5lW/+cn/1WZCgVXYys86iOVNYUfY="; + hash = "sha256-ojmE0d6Wy4UqQu4kBBE2qtQ4AYqplHOB7wJ7hEte664="; }; preConfigure = '' From 713fb409041ed94038f23420a205ee939990a6aa Mon Sep 17 00:00:00 2001 From: eymeric Date: Sat, 8 Nov 2025 22:28:23 +0100 Subject: [PATCH 1812/2279] lmms: fix cmake 4 compatibility --- pkgs/applications/audio/lmms/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index d4c45a283603..1f550fd09771 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -70,7 +70,21 @@ mkDerivation rec { }) ]; - cmakeFlags = [ "-DWANT_QT5=ON" ]; + prePatch = '' + # Update CMake minimum required version and policies + substituteInPlace CMakeLists.txt --replace 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)' 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)' + substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0026 OLD)' 'CMAKE_POLICY(SET CMP0026 NEW)' + substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0050 OLD)' 'CMAKE_POLICY(SET CMP0050 NEW)' + substituteInPlace CMakeLists.txt --replace 'GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)' 'SET(BIN2RES $)' + ''; + + cmakeFlags = [ + "-DWANT_QT5=ON" + ] + ++ lib.optionals (lib.versionOlder version "11.4") [ + # Fix the build with CMake 4. + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + ]; meta = with lib; { description = "DAW similar to FL Studio (music production software)"; From da03bcff091fbd8d3d018a4dc60548ba2904e793 Mon Sep 17 00:00:00 2001 From: eymeric Date: Sat, 8 Nov 2025 22:54:16 +0100 Subject: [PATCH 1813/2279] lmms: reenable all architectures --- pkgs/applications/audio/lmms/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 1f550fd09771..416dd6c06174 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -91,10 +91,7 @@ mkDerivation rec { mainProgram = "lmms"; homepage = "https://lmms.io"; license = licenses.gpl2Plus; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; + platforms = platforms.linux; maintainers = [ ]; }; } From fb8e1da05b9208836512e79d29a1fa2f035e2cbf Mon Sep 17 00:00:00 2001 From: Oleksandr Usov Date: Fri, 17 Oct 2025 20:50:48 +0100 Subject: [PATCH 1814/2279] mrtg: gcc14 broke detection of print format specifiers --- .../mrtg/configure-long-long-format-gcc14.patch | 10 ++++++++++ pkgs/by-name/mr/mrtg/package.nix | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch diff --git a/pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch b/pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch new file mode 100644 index 000000000000..6159854d4d91 --- /dev/null +++ b/pkgs/by-name/mr/mrtg/configure-long-long-format-gcc14.patch @@ -0,0 +1,10 @@ +--- mrtg-2.17.10/configure.bak 2025-10-17 20:44:24.878718603 +0100 ++++ mrtg-2.17-10/configure 2025-10-17 20:44:40.343747835 +0100 +@@ -3664,6 +3664,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include ++#include + int main() + { + long long b, a = -0x3AFAFAFAFAFAFAFALL; diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix index 9c5e89f7bd74..7cc2b9095fa4 100644 --- a/pkgs/by-name/mr/mrtg/package.nix +++ b/pkgs/by-name/mr/mrtg/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + makeWrapper, fetchurl, perl, gd, @@ -24,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w="; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ # add support for ipv6 snmp: # https://github.com/oetiker/mrtg/blob/433ebfa5fc043971b46a5cd975fb642c76e3e49d/src/bin/mrtg#L331-L341 @@ -32,6 +35,20 @@ stdenv.mkDerivation rec { rrdtool ]; + patches = [ + # gcc14 broke detection of printf format specifiers + # building from master seems to be fixed upstream, so next release can (likely) drop the patch + # just keep the CFLAGS below + ./configure-long-long-format-gcc14.patch + ]; + env.NIX_CFLAGS_COMPILE = "-Werror"; + env.NIX_CFLAGS_LINK = "-lm"; + + postInstall = '' + # mrtg wants plain C locale + wrapProgram $out/bin/mrtg --set LANG C + ''; + meta = with lib; { description = "Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; From d1911335cc7475921fe7d46aed0f66a4747f0f4d Mon Sep 17 00:00:00 2001 From: Oleksandr Usov Date: Sat, 8 Nov 2025 22:31:21 +0000 Subject: [PATCH 1815/2279] maintainers: add usovalx --- maintainers/maintainer-list.nix | 5 +++++ pkgs/by-name/mr/mrtg/package.nix | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 535ef1d43934..77b2ee7f6571 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27146,6 +27146,11 @@ githubId = 120451; name = "Urban Skudnik"; }; + usovalx = { + name = "Oleksandr Usov"; + github = "usovalx"; + githubId = 1041626; + }; usrfriendly = { name = "Arin Lares"; email = "arinlares@gmail.com"; diff --git a/pkgs/by-name/mr/mrtg/package.nix b/pkgs/by-name/mr/mrtg/package.nix index 7cc2b9095fa4..c7cb5d605fba 100644 --- a/pkgs/by-name/mr/mrtg/package.nix +++ b/pkgs/by-name/mr/mrtg/package.nix @@ -53,7 +53,10 @@ stdenv.mkDerivation rec { description = "Multi Router Traffic Grapher"; homepage = "https://oss.oetiker.ch/mrtg/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ robberer ]; + maintainers = with maintainers; [ + robberer + usovalx + ]; platforms = platforms.unix; }; } From af0f9f884d1b59e9b1fd0dc8834022efc3ae4d65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 23:51:14 +0100 Subject: [PATCH 1816/2279] python313Packages.philipstv: modernize --- pkgs/development/python-modules/philipstv/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/philipstv/default.nix b/pkgs/development/python-modules/philipstv/default.nix index 5f0231d9e695..82ecfccb3130 100644 --- a/pkgs/development/python-modules/philipstv/default.nix +++ b/pkgs/development/python-modules/philipstv/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, poetry-core, poetry-dynamic-versioning, installShellFiles, @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "3.0.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bcyran"; repo = "philipstv"; @@ -65,7 +62,7 @@ buildPythonPackage rec { meta = { description = "CLI and library to control Philips Android-powered TVs"; homepage = "https://github.com/bcyran/philipstv"; - changelog = "https://github.com/bcyran/philipstv/releases/tag/${version}"; + changelog = "https://github.com/bcyran/philipstv/releases/tag/${src.tag}"; license = lib.licenses.mit; mainProgram = "philipstv"; maintainers = with lib.maintainers; [ bcyran ]; From 2c42578129d67a6a2319986ea1c8bf0f7b39bdfb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 22:53:11 +0000 Subject: [PATCH 1817/2279] python3Packages.finetuning-scheduler: fix ReduceLROnPlateau import https://github.com/speediedan/finetuning-scheduler/pull/21 --- .../python-modules/finetuning-scheduler/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 113e77b2dca2..85b46d882a52 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -27,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-AfkrWuqpFS71Zrh5NsamzxMitKCsqPF50F9zTDdDhRg="; }; + # See https://github.com/speediedan/finetuning-scheduler/pull/21 + postPatch = '' + substituteInPlace src/finetuning_scheduler/strategy_adapters/base.py \ + --replace-fail \ + "from lightning.fabric.utilities.types import ReduceLROnPlateau" \ + "from torch.optim.lr_scheduler import ReduceLROnPlateau" + ''; + build-system = [ setuptools ]; pythonRelaxDeps = [ From c9d159af9e79248a8a28062f576de813eef4df93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 Nov 2025 23:53:28 +0100 Subject: [PATCH 1818/2279] python313Packages.htmldate: modernize --- pkgs/development/python-modules/htmldate/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 830b271a5e7a..b6664646514a 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -1,6 +1,5 @@ { lib, - backports-datetime-fromisoformat, buildPythonPackage, charset-normalizer, dateparser, @@ -9,7 +8,6 @@ lxml, pytestCheckHook, python-dateutil, - pythonOlder, setuptools, urllib3, }: @@ -19,8 +17,6 @@ buildPythonPackage rec { version = "1.9.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "adbar"; repo = "htmldate"; @@ -45,13 +41,11 @@ buildPythonPackage rec { faust-cchardet urllib3 ] - ++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ] ++ urllib3.optional-dependencies.brotli; all = [ faust-cchardet urllib3 ] - ++ lib.optionals (pythonOlder "3.11") [ backports-datetime-fromisoformat ] ++ urllib3.optional-dependencies.brotli; }; From 70bf527a7bb32cec8a7809d633865bda091b067c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 22:57:32 +0000 Subject: [PATCH 1819/2279] python3Packages.lerobot: relax av dependency --- pkgs/development/python-modules/lerobot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix index 6111f49275a0..a49cb26b1ec1 100644 --- a/pkgs/development/python-modules/lerobot/default.nix +++ b/pkgs/development/python-modules/lerobot/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; pythonRelaxDeps = [ + "av" "datasets" "draccus" "gymnasium" From 0ebff31f162f5961a59df6c304b5ecd8e23a7ad8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Nov 2025 00:02:45 +0100 Subject: [PATCH 1820/2279] python313Packages.alexapy: 1.29.8 -> 1.29.9 Diff: https://gitlab.com/keatontaylor/alexapy/-/compare/v1.29.8...v1.29.9 Changelog: https://gitlab.com/keatontaylor/alexapy/-/blob/v1.29.9/CHANGELOG.md --- 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 100547acf298..5d4d34aca69f 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "alexapy"; - version = "1.29.8"; + version = "1.29.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "keatontaylor"; repo = "alexapy"; tag = "v${version}"; - hash = "sha256-AmczPJK7v1ymRT3XUUNzFR8GmDr9eZYGRH2FL3RvPsE="; + hash = "sha256-Ecj4IQd0UJuNcGqSj48WrULyOwkbNh1YITkj0ftS7yY="; }; pythonRelaxDeps = [ "aiofiles" ]; From 445143845dc761030ca9a9c7ffedc15b0c16d823 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Nov 2025 00:06:10 +0100 Subject: [PATCH 1821/2279] qovery-cli: 1.53.0 -> 1.54.0 Diff: https://github.com/Qovery/qovery-cli/compare/v1.53.0...v1.54.0 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v1.54.0 --- pkgs/by-name/qo/qovery-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index ab8083942882..8f4b5a9b204b 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "qovery-cli"; - version = "1.53.0"; + version = "1.54.0"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-kE45z/uObUcmjiYm7zO14Lhroe7PkD0pSYnRw4HbHcc="; + hash = "sha256-6z5s6bVzPYUHI3rBEddQT933Lj+hbcBK+safi5pHVO4="; }; - vendorHash = "sha256-TDvlICfKLtrG/0KPpfrN61wpUZejaJGiRR4DUBNEllY="; + vendorHash = "sha256-1TprPzZb+Q9QcoGop6CAmnyqSU3dQ5CSAS0hsnQeWPw="; env.CGO_ENABLED = 0; From 1f31b6d00cff70435dce480978a2e93d42773040 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 8 Nov 2025 22:48:09 +0100 Subject: [PATCH 1822/2279] nix-output-monitor: 2.1.6 -> 2.1.8 --- pkgs/by-name/ni/nix-output-monitor/generated-package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix index e97ec3c342b0..d4875a9f860e 100644 --- a/pkgs/by-name/ni/nix-output-monitor/generated-package.nix +++ b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix @@ -38,10 +38,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.1.6"; + version = "2.1.8"; src = fetchzip { - url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.6.tar.gz"; - sha256 = "0v291s6lx9rxlw38a3329gc37nyl2x24blyrf9rv8lzxc1q4bz31"; + url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.8.tar.gz"; + sha256 = "09zpz9dbllaqngkg6hz0vl4sx3kbvlp4cdk6lqa0kgszrwsdwl9r"; }; isLibrary = true; isExecutable = true; From 4730c5d4033e41eee8faf0210d877c946c5e0676 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 23:06:25 +0000 Subject: [PATCH 1823/2279] python3Packages.whisperx: relax av dependency --- pkgs/development/python-modules/whisperx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index 5d6455de1321..235bca7af2fe 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; pythonRelaxDeps = [ + "av" "numpy" "pandas" "pyannote-audio" From 73a427b2c7199e7458375ed6f0b9a0dfd555ae2e Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 4 Nov 2025 19:22:03 +0000 Subject: [PATCH 1824/2279] melos: 7.1.1 -> 7.3.0 Diff: https://github.com/invertase/melos/compare/melos-v7.1.1...melos-v7.3.0 --- pkgs/by-name/me/melos/add-generic-main.patch | 73 +++++++++++++++----- pkgs/by-name/me/melos/package.nix | 8 +-- pkgs/by-name/me/melos/pubspec.lock.json | 36 +++++++--- 3 files changed, 86 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch index a00de578ce6d..8e90ac427171 100644 --- a/pkgs/by-name/me/melos/add-generic-main.patch +++ b/pkgs/by-name/me/melos/add-generic-main.patch @@ -1,11 +1,13 @@ diff --git a/bin/melos.dart b/bin/melos.dart -index 0db7013..218276f 100644 +index 2476436..bd79fad 100644 --- a/packages/melos/bin/melos.dart +++ b/packages/melos/bin/melos.dart -@@ -1,11 +1,37 @@ -+import 'dart:io'; +@@ -1,11 +1,72 @@ import 'package:cli_launcher/cli_launcher.dart'; import 'package:melos/src/command_runner.dart'; ++import 'dart:io'; ++import 'package:yaml/yaml.dart'; ++import 'package:path/path.dart' as path; -Future main(List arguments) async => launchExecutable( - arguments, @@ -15,12 +17,13 @@ index 0db7013..218276f 100644 - entrypoint: melosEntryPoint, - ), -); -+Future main(List arguments) async { -+ final melosYamlPath = findMelosYaml(); ++final ExecutableName executableName = ExecutableName('melos'); + -+ if (melosYamlPath == null) { -+ print('Error: melos.yaml not found in the project.'); -+ // Handle the error as needed ++Future main(List arguments) async { ++ final workspaceRoot = _findLocalInstallation(Directory.current); ++ ++ if (workspaceRoot == null) { ++ print("Error: Could not find your work "); + return; + } + @@ -29,22 +32,54 @@ index 0db7013..218276f 100644 + LaunchContext( + directory: Directory.current, + localInstallation: ExecutableInstallation( -+ name: ExecutableName('melos'), ++ name: executableName, + isSelf: false, -+ packageRoot: melosYamlPath, ++ packageRoot: workspaceRoot, + ), + ), + ); +} + -+Directory? findMelosYaml() { -+ var directory = Directory.current; -+ while (directory.path != directory.parent.path) { -+ final melosYamlPath = '${directory.path}/melos.yaml'; -+ if (File(melosYamlPath).existsSync()) { -+ return directory; -+ } -+ directory = directory.parent; ++// Stolen then simplified from https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L249 ++Directory? _findLocalInstallation( ++ Directory start, ++) { ++ if (path.equals(start.path, start.parent.path)) { ++ return null; + } -+ return null; ++ ++ final pubspecFile = File(path.join(start.path, 'pubspec.yaml')); ++ if (pubspecFile.existsSync()) { ++ final pubspecString = pubspecFile.readAsStringSync(); ++ String? name; ++ YamlMap? dependencies; ++ YamlMap? devDependencies; ++ ++ try { ++ final pubspecYaml = loadYamlDocument( ++ pubspecString, ++ sourceUrl: pubspecFile.uri, ++ ); ++ final pubspec = pubspecYaml.contents as YamlMap; ++ name = pubspec['name'] as String?; ++ dependencies = pubspec['dependencies'] as YamlMap?; ++ devDependencies = pubspec['dev_dependencies'] as YamlMap?; ++ } catch (error, stackTrace) { ++ throw StateError( ++ 'Could not parse pubspec.yaml at ${start.path}.\n$error\n$stackTrace', ++ ); ++ } ++ ++ final isSelf = name == executableName.package; ++ ++ if ((isSelf) || ++ (dependencies != null && ++ dependencies.containsKey(executableName.package)) || ++ (devDependencies != null && ++ devDependencies.containsKey(executableName.package))) { ++ return start; ++ } ++ } ++ ++ return _findLocalInstallation(start.parent); +} diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index 791b674f1cda..6aad5b405e11 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -4,12 +4,12 @@ buildDartApplication, }: let - version = "7.1.1"; + version = "7.3.0"; src = fetchFromGitHub { owner = "invertase"; repo = "melos"; tag = "melos-v${version}"; - hash = "sha256-i75fbo0lqDszo2pDtkWXQMt+3IoWsK7t05YU2IjqTmw="; + hash = "sha256-XTEhH8F54BoXJ1QNhUIZszHQoDwP0Za1LPQ6Dv9sR08="; }; in buildDartApplication { @@ -17,8 +17,8 @@ buildDartApplication { inherit version src; patches = [ - # This patch (created a melos 6.1.0) modify the method melos use to find path to the root of the projects. - # It is needed because when melos is in the nixstore, it break it and fail to find the projects root with melos.yaml + # Patch melos entrypoint to bypass cli_launcher which throws because it does not find melos in the "classic" folders eg : .dart_tool or pub cache. + # https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L236 ./add-generic-main.patch ]; diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json index 35aba4873f96..744a351566ba 100644 --- a/pkgs/by-name/me/melos/pubspec.lock.json +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0eb33edbbe99a02e73b8bbeb6f2b65972023d902117ee8d1bf0ea1a79f83aa7b", + "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", "url": "https://pub.dev" }, "source": "hosted", - "version": "90.0.0" + "version": "91.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "711e3a890bb529bf55f07d73b8706f4b7504ad77e90d2f205626b116c048583f", + "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.0" + "version": "8.4.1" }, "ansi_styles": { "dependency": "transitive", @@ -184,11 +184,11 @@ "dependency": "transitive", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "dart_style": { "dependency": "transitive", @@ -364,11 +364,11 @@ "dependency": "transitive", "description": { "name": "mustache_template", - "sha256": "d9aa84d114368b7f1727b7014b85bb0b234daeafe1518824c82d32703b3964f6", + "sha256": "daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.0.2" }, "node_preamble": { "dependency": "transitive", @@ -400,6 +400,16 @@ "source": "hosted", "version": "1.9.1" }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, "platform": { "dependency": "transitive", "description": { @@ -690,6 +700,16 @@ "source": "hosted", "version": "1.2.1" }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.1" + }, "yaml": { "dependency": "direct dev", "description": { From 0a9b910a0d2a09ca50542fba8a7e3bee7ac3905f Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 18:21:29 -0500 Subject: [PATCH 1825/2279] gridtracker2: 2.250914.1 -> 2.251106.7, remove in-tree lockfile, add update script --- .../by-name/gr/gridtracker2/package-lock.json | 6721 ----------------- pkgs/by-name/gr/gridtracker2/package.nix | 18 +- 2 files changed, 7 insertions(+), 6732 deletions(-) delete mode 100644 pkgs/by-name/gr/gridtracker2/package-lock.json diff --git a/pkgs/by-name/gr/gridtracker2/package-lock.json b/pkgs/by-name/gr/gridtracker2/package-lock.json deleted file mode 100644 index 3bdeac72dadd..000000000000 --- a/pkgs/by-name/gr/gridtracker2/package-lock.json +++ /dev/null @@ -1,6721 +0,0 @@ -{ - "name": "GridTracker2", - "version": "2.250914.1", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "GridTracker2", - "version": "2.250914.1", - "hasInstallScript": true, - "dependencies": { - "@electron-toolkit/preload": "^3.0.1", - "@electron-toolkit/utils": "^3.0.0", - "@electron/remote": "^2.1.2", - "electron-log": "^5.2.0", - "electron-updater": "6.6.5", - "mqtt": "^5.10.1" - }, - "devDependencies": { - "@electron-toolkit/eslint-config": "^1.0.2", - "@electron-toolkit/eslint-config-prettier": "^2.0.0", - "electron": "35.7.5", - "electron-builder": "26.0.12", - "eslint": "^8.57.0", - "eslint_d": "^14.0.4", - "prettier": "^3.3.2" - } - }, - "node_modules/@babel/runtime": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", - "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@develar/schema-utils": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", - "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.0", - "ajv-keywords": "^3.4.1" - }, - "engines": { - "node": ">= 8.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/@electron-toolkit/eslint-config": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config/-/eslint-config-1.0.2.tgz", - "integrity": "sha512-GJVuMsxBHfVARfmUoSTCHT0e/QfWlVbXcGk3tgoku0ad6tLjydbv2LpvKi02+Sy2WiEz9L9SkGSw090ukT/F0A==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "eslint": ">= 8.0.0" - } - }, - "node_modules/@electron-toolkit/eslint-config-prettier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config-prettier/-/eslint-config-prettier-2.0.0.tgz", - "integrity": "sha512-L+uG1FvJcAZkPZpSi6B1pmdpyJFyOxWDTjr1Vs47vSryxv/EX1Ch6o4HVsachlDq3fMEkDgojuP2F3ZvVZMoLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-config-prettier": "^9.1.0", - "eslint-plugin-prettier": "^5.0.1" - }, - "peerDependencies": { - "eslint": ">= 8.0.0", - "prettier": ">= 3.0.0" - } - }, - "node_modules/@electron-toolkit/preload": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.2.tgz", - "integrity": "sha512-TWWPToXd8qPRfSXwzf5KVhpXMfONaUuRAZJHsKthKgZR/+LqX1dZVSSClQ8OTAEduvLGdecljCsoT2jSshfoUg==", - "license": "MIT", - "peerDependencies": { - "electron": ">=13.0.0" - } - }, - "node_modules/@electron-toolkit/utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@electron-toolkit/utils/-/utils-3.0.0.tgz", - "integrity": "sha512-GaXHDhiT7KCvMJjXdp/QqpYinq69T/Pdl49Z1XLf8mKGf63dnsODMWyrmIjEQ0z/vG7dO8qF3fvmI6Eb2lUNZA==", - "license": "MIT", - "peerDependencies": { - "electron": ">=13.0.0" - } - }, - "node_modules/@electron/asar": { - "version": "3.2.18", - "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.18.tgz", - "integrity": "sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==", - "dev": true, - "license": "MIT", - "dependencies": { - "commander": "^5.0.0", - "glob": "^7.1.6", - "minimatch": "^3.0.4" - }, - "bin": { - "asar": "bin/asar.js" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/@electron/asar/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@electron/fuses": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz", - "integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.1", - "fs-extra": "^9.0.1", - "minimist": "^1.2.5" - }, - "bin": { - "electron-fuses": "dist/bin.js" - } - }, - "node_modules/@electron/fuses/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/fuses/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/fuses/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/get": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", - "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", - "got": "^11.8.5", - "progress": "^2.0.3", - "semver": "^6.2.0", - "sumchecker": "^3.0.1" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "global-agent": "^3.0.0" - } - }, - "node_modules/@electron/node-gyp": { - "version": "10.2.0-electron.1", - "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", - "integrity": "sha512-4MSBTT8y07YUDqf69/vSh80Hh791epYqGtWHO3zSKhYFwQg+gx9wi1PqbqP6YqC4WMsNxZ5l9oDmnWdK5pfCKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^8.1.0", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.2.1", - "nopt": "^6.0.0", - "proc-log": "^2.0.1", - "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": ">=12.13.0" - } - }, - "node_modules/@electron/node-gyp/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@electron/node-gyp/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@electron/node-gyp/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/node-gyp/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/notarize": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz", - "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^9.0.1", - "promise-retry": "^2.0.1" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/notarize/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/notarize/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/notarize/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/osx-sign": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz", - "integrity": "sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "compare-version": "^0.1.2", - "debug": "^4.3.4", - "fs-extra": "^10.0.0", - "isbinaryfile": "^4.0.8", - "minimist": "^1.2.6", - "plist": "^3.0.5" - }, - "bin": { - "electron-osx-flat": "bin/electron-osx-flat.js", - "electron-osx-sign": "bin/electron-osx-sign.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@electron/osx-sign/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", - "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/@electron/osx-sign/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/osx-sign/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/rebuild": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.0.tgz", - "integrity": "sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2", - "@malept/cross-spawn-promise": "^2.0.0", - "chalk": "^4.0.0", - "debug": "^4.1.1", - "detect-libc": "^2.0.1", - "fs-extra": "^10.0.0", - "got": "^11.7.0", - "node-abi": "^3.45.0", - "node-api-version": "^0.2.0", - "ora": "^5.1.0", - "read-binary-file-arch": "^1.0.6", - "semver": "^7.3.5", - "tar": "^6.0.5", - "yargs": "^17.0.1" - }, - "bin": { - "electron-rebuild": "lib/cli.js" - }, - "engines": { - "node": ">=12.13.0" - } - }, - "node_modules/@electron/rebuild/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/rebuild/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/rebuild/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/rebuild/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/remote": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.3.tgz", - "integrity": "sha512-XlpxC8S4ttj/v2d+PKp9na/3Ev8bV7YWNL7Cw5b9MAWgTphEml7iYgbc7V0r9D6yDOfOkj06bchZgOZdlWJGNA==", - "license": "MIT", - "peerDependencies": { - "electron": ">= 13.0.0" - } - }, - "node_modules/@electron/universal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz", - "integrity": "sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@electron/asar": "^3.2.7", - "@malept/cross-spawn-promise": "^2.0.0", - "debug": "^4.3.1", - "dir-compare": "^4.2.0", - "fs-extra": "^11.1.1", - "minimatch": "^9.0.3", - "plist": "^3.1.0" - }, - "engines": { - "node": ">=16.4" - } - }, - "node_modules/@electron/universal/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@electron/universal/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/@electron/universal/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/universal/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@electron/universal/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/windows-sign": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz", - "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==", - "dev": true, - "license": "BSD-2-Clause", - "optional": true, - "peer": true, - "dependencies": { - "cross-dirname": "^0.1.0", - "debug": "^4.3.4", - "fs-extra": "^11.1.1", - "minimist": "^1.2.8", - "postject": "^1.0.0-alpha.6" - }, - "bin": { - "electron-windows-sign": "bin/electron-windows-sign.js" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/@electron/windows-sign/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/@electron/windows-sign/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/windows-sign/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", - "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/config-array": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", - "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/object-schema": "^2.1.6", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/config-helpers": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz", - "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/core": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz", - "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@types/json-schema": "^7.0.15" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/plugin-kit": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz", - "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/core": "^0.15.2", - "levn": "^0.4.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18.0" - } - }, - "node_modules/@humanfs/node": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", - "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.4.0" - }, - "engines": { - "node": ">=18.18.0" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@humanwhocodes/retry": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", - "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@malept/cross-spawn-promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz", - "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/malept" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" - } - ], - "license": "Apache-2.0", - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "engines": { - "node": ">= 12.13.0" - } - }, - "node_modules/@malept/flatpak-bundler": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", - "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^9.0.0", - "lodash": "^4.17.15", - "tmp-promise": "^3.0.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@malept/flatpak-bundler/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@npmcli/fs/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dev": true, - "license": "MIT", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@pkgr/core": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz", - "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/pkgr" - } - }, - "node_modules/@sindresorhus/is": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", - "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", - "license": "MIT", - "dependencies": { - "defer-to-connect": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/@types/cacheable-request": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", - "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", - "license": "MIT", - "dependencies": { - "@types/http-cache-semantics": "*", - "@types/keyv": "^3.1.4", - "@types/node": "*", - "@types/responselike": "^1.0.0" - } - }, - "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/ms": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/fs-extra": { - "version": "9.0.13", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", - "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", - "license": "MIT" - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/keyv": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", - "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", - "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/node": { - "version": "22.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.3.tgz", - "integrity": "sha512-gTVM8js2twdtqM+AE2PdGEe9zGQY4UvmFjan9rZcVb6FGdStfjWoWejdmy4CfWVO9rh5MiYQGZloKAGkJt8lMw==", - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, - "node_modules/@types/plist": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", - "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@types/node": "*", - "xmlbuilder": ">=11.0.1" - } - }, - "node_modules/@types/readable-stream": { - "version": "4.0.21", - "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.21.tgz", - "integrity": "sha512-19eKVv9tugr03IgfXlA9UVUVRbW6IuqRO5B92Dl4a6pT7K8uaGrNS0GkxiZD0BOk6PLuXl5FhWl//eX/pzYdTQ==", - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/responselike": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", - "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/verror": { - "version": "1.10.11", - "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.11.tgz", - "integrity": "sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/@types/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/yauzl": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", - "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", - "license": "MIT", - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true, - "license": "ISC" - }, - "node_modules/@xmldom/xmldom": { - "version": "0.8.11", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz", - "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/7zip-bin": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", - "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", - "dev": true, - "license": "MIT" - }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "license": "MIT", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, - "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/agent-base": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", - "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, - "node_modules/agentkeepalive": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", - "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/app-builder-bin": { - "version": "5.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz", - "integrity": "sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==", - "dev": true, - "license": "MIT" - }, - "node_modules/app-builder-lib": { - "version": "26.0.12", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.0.12.tgz", - "integrity": "sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@develar/schema-utils": "~2.6.5", - "@electron/asar": "3.2.18", - "@electron/fuses": "^1.8.0", - "@electron/notarize": "2.5.0", - "@electron/osx-sign": "1.3.1", - "@electron/rebuild": "3.7.0", - "@electron/universal": "2.0.1", - "@malept/flatpak-bundler": "^0.4.0", - "@types/fs-extra": "9.0.13", - "async-exit-hook": "^2.0.1", - "builder-util": "26.0.11", - "builder-util-runtime": "9.3.1", - "chromium-pickle-js": "^0.2.0", - "config-file-ts": "0.2.8-rc1", - "debug": "^4.3.4", - "dotenv": "^16.4.5", - "dotenv-expand": "^11.0.6", - "ejs": "^3.1.8", - "electron-publish": "26.0.11", - "fs-extra": "^10.1.0", - "hosted-git-info": "^4.1.0", - "is-ci": "^3.0.0", - "isbinaryfile": "^5.0.0", - "js-yaml": "^4.1.0", - "json5": "^2.2.3", - "lazy-val": "^1.0.5", - "minimatch": "^10.0.0", - "plist": "3.1.0", - "resedit": "^1.7.0", - "semver": "^7.3.8", - "tar": "^6.1.12", - "temp-file": "^3.4.0", - "tiny-async-pool": "1.3.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "dmg-builder": "26.0.12", - "electron-builder-squirrel-windows": "26.0.12" - } - }, - "node_modules/app-builder-lib/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/app-builder-lib/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/app-builder-lib/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/app-builder-lib/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, - "license": "MIT" - }, - "node_modules/async-exit-hook": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", - "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/bl": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.3.tgz", - "integrity": "sha512-nHB8B5roHlGX5TFsWeiQJijdddZIOHuv1eL2cM2kHnG3qR91CYLsysGe+CvxQfEd23EKD0eJf4lto0frTbddKA==", - "license": "MIT", - "dependencies": { - "@types/readable-stream": "^4.0.0", - "buffer": "^6.0.3", - "inherits": "^2.0.4", - "readable-stream": "^4.2.0" - } - }, - "node_modules/bl/node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "node_modules/boolean": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", - "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "license": "MIT", - "optional": true - }, - "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/broker-factory": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.9.tgz", - "integrity": "sha512-MzvndyD6EcbkBtX4NXm/HfdO1+cOR5ONNdMCXEKfHpxGdMtuDz7+o+nJf7HMtyPH1sUVf/lEIP+DMluC5PgaBQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.3", - "fast-unique-numbers": "^9.0.23", - "tslib": "^2.8.1", - "worker-factory": "^7.0.45" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "license": "MIT", - "engines": { - "node": "*" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "license": "MIT" - }, - "node_modules/builder-util": { - "version": "26.0.11", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.0.11.tgz", - "integrity": "sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/debug": "^4.1.6", - "7zip-bin": "~5.2.0", - "app-builder-bin": "5.0.0-alpha.12", - "builder-util-runtime": "9.3.1", - "chalk": "^4.1.2", - "cross-spawn": "^7.0.6", - "debug": "^4.3.4", - "fs-extra": "^10.1.0", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.0", - "is-ci": "^3.0.0", - "js-yaml": "^4.1.0", - "sanitize-filename": "^1.6.3", - "source-map-support": "^0.5.19", - "stat-mode": "^1.0.0", - "temp-file": "^3.4.0", - "tiny-async-pool": "1.3.0" - } - }, - "node_modules/builder-util-runtime": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz", - "integrity": "sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.4", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/builder-util/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/builder-util/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/builder-util/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cacheable-lookup": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "license": "MIT", - "engines": { - "node": ">=10.6.0" - } - }, - "node_modules/cacheable-request": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", - "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", - "license": "MIT", - "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^4.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^6.0.1", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/chromium-pickle-js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", - "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==", - "dev": true, - "license": "MIT" - }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "license": "MIT", - "dependencies": { - "restore-cursor": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cli-spinners": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", - "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/clone-response": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", - "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", - "license": "MIT", - "dependencies": { - "mimic-response": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/commist": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz", - "integrity": "sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw==", - "license": "MIT" - }, - "node_modules/compare-version": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", - "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/concat-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", - "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", - "engines": [ - "node >= 6.0" - ], - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/concat-stream/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/config-file-ts": { - "version": "0.2.8-rc1", - "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz", - "integrity": "sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "glob": "^10.3.12", - "typescript": "^5.4.3" - } - }, - "node_modules/config-file-ts/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/config-file-ts/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/config-file-ts/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/config-file-ts/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/crc": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", - "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "buffer": "^5.1.0" - } - }, - "node_modules/cross-dirname": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz", - "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "license": "MIT", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/defaults": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "license": "MIT", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "license": "MIT", - "optional": true, - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/detect-libc": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", - "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, - "node_modules/detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "license": "MIT", - "optional": true - }, - "node_modules/dir-compare": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz", - "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimatch": "^3.0.5", - "p-limit": "^3.1.0 " - } - }, - "node_modules/dir-compare/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/dmg-builder": { - "version": "26.0.12", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.0.12.tgz", - "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==", - "dev": true, - "license": "MIT", - "dependencies": { - "app-builder-lib": "26.0.12", - "builder-util": "26.0.11", - "builder-util-runtime": "9.3.1", - "fs-extra": "^10.1.0", - "iconv-lite": "^0.6.2", - "js-yaml": "^4.1.0" - }, - "optionalDependencies": { - "dmg-license": "^1.0.11" - } - }, - "node_modules/dmg-builder/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/dmg-builder/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/dmg-builder/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/dmg-license": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", - "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "@types/plist": "^3.0.1", - "@types/verror": "^1.10.3", - "ajv": "^6.10.0", - "crc": "^3.8.0", - "iconv-corefoundation": "^1.1.7", - "plist": "^3.0.4", - "smart-buffer": "^4.0.2", - "verror": "^1.10.0" - }, - "bin": { - "dmg-license": "bin/dmg-license.js" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dotenv": { - "version": "16.6.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", - "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dotenv-expand": { - "version": "11.0.7", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", - "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dotenv": "^16.4.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://dotenvx.com" - } - }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT" - }, - "node_modules/ejs": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", - "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "jake": "^10.8.5" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/electron": { - "version": "35.7.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz", - "integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@electron/get": "^2.0.0", - "@types/node": "^22.7.7", - "extract-zip": "^2.0.1" - }, - "bin": { - "electron": "cli.js" - }, - "engines": { - "node": ">= 12.20.55" - } - }, - "node_modules/electron-builder": { - "version": "26.0.12", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.0.12.tgz", - "integrity": "sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "app-builder-lib": "26.0.12", - "builder-util": "26.0.11", - "builder-util-runtime": "9.3.1", - "chalk": "^4.1.2", - "dmg-builder": "26.0.12", - "fs-extra": "^10.1.0", - "is-ci": "^3.0.0", - "lazy-val": "^1.0.5", - "simple-update-notifier": "2.0.0", - "yargs": "^17.6.2" - }, - "bin": { - "electron-builder": "cli.js", - "install-app-deps": "install-app-deps.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/electron-builder-squirrel-windows": { - "version": "26.0.12", - "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.0.12.tgz", - "integrity": "sha512-kpwXM7c/ayRUbYVErQbsZ0nQZX4aLHQrPEG9C4h9vuJCXylwFH8a7Jgi2VpKIObzCXO7LKHiCw4KdioFLFOgqA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "app-builder-lib": "26.0.12", - "builder-util": "26.0.11", - "electron-winstaller": "5.4.0" - } - }, - "node_modules/electron-builder/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-builder/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/electron-builder/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/electron-log": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.3.tgz", - "integrity": "sha512-sOUsM3LjZdugatazSQ/XTyNcw8dfvH1SYhXWiJyfYodAAKOZdHs0txPiLDXFzOZbhXgAgshQkshH2ccq0feyLQ==", - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, - "node_modules/electron-publish": { - "version": "26.0.11", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.0.11.tgz", - "integrity": "sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/fs-extra": "^9.0.11", - "builder-util": "26.0.11", - "builder-util-runtime": "9.3.1", - "chalk": "^4.1.2", - "form-data": "^4.0.0", - "fs-extra": "^10.1.0", - "lazy-val": "^1.0.5", - "mime": "^2.5.2" - } - }, - "node_modules/electron-publish/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-publish/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/electron-publish/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/electron-updater": { - "version": "6.6.5", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.6.5.tgz", - "integrity": "sha512-jnk38WfByl2Pb0cje02xls/pJkvkq3AQZI7usDCLriU23adkerLTkRrugbCPuUxUOa79nY1g/rokHPWHZFBKyA==", - "license": "MIT", - "dependencies": { - "builder-util-runtime": "9.3.2", - "fs-extra": "^10.1.0", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "lodash.escaperegexp": "^4.1.2", - "lodash.isequal": "^4.5.0", - "semver": "^7.6.3", - "tiny-typed-emitter": "^2.1.0" - } - }, - "node_modules/electron-updater/node_modules/builder-util-runtime": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.3.2.tgz", - "integrity": "sha512-7QDXJ1FwT6d9ZhG4kuObUUPY8/ENBS/Ky26O4hR5vbeoRGavgekS2Jxv+8sCn/v23aPGU2DXRWEeJuijN2ooYA==", - "license": "MIT", - "dependencies": { - "debug": "^4.3.4", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/electron-updater/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-updater/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/electron-updater/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/electron-updater/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/electron-winstaller": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz", - "integrity": "sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@electron/asar": "^3.2.1", - "debug": "^4.1.1", - "fs-extra": "^7.0.1", - "lodash": "^4.17.21", - "temp": "^0.9.0" - }, - "engines": { - "node": ">=8.0.0" - }, - "optionalDependencies": { - "@electron/windows-sign": "^1.1.2" - } - }, - "node_modules/electron-winstaller/node_modules/fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", - "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "license": "MIT" - }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-set-tostringtag": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "has-tostringtag": "^1.0.2", - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "license": "MIT", - "optional": true - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint_d": { - "version": "14.3.0", - "resolved": "https://registry.npmjs.org/eslint_d/-/eslint_d-14.3.0.tgz", - "integrity": "sha512-Y8IRgZsOlYrSipIeaHpmuFu5+TEUDNZcgNKx2ARSUJp3DZCsFW9+V2bBhXCDQmBSolqjn2jZVZ5FBuhy0s3z2w==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.7", - "eslint": "^9.8.0", - "supports-color": "^7.2.0" - }, - "bin": { - "eslint_d": "bin/eslint_d.js" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/eslint_d/node_modules/@eslint/eslintrc": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", - "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint_d/node_modules/@eslint/js": { - "version": "9.35.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.35.0.tgz", - "integrity": "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://eslint.org/donate" - } - }, - "node_modules/eslint_d/node_modules/eslint": { - "version": "9.35.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.35.0.tgz", - "integrity": "sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.8.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.21.0", - "@eslint/config-helpers": "^0.3.1", - "@eslint/core": "^0.15.2", - "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.35.0", - "@eslint/plugin-kit": "^0.3.5", - "@humanfs/node": "^0.16.6", - "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.2", - "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.6", - "debug": "^4.3.2", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.4.0", - "eslint-visitor-keys": "^4.2.1", - "espree": "^10.4.0", - "esquery": "^1.5.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^8.0.0", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://eslint.org/donate" - }, - "peerDependencies": { - "jiti": "*" - }, - "peerDependenciesMeta": { - "jiti": { - "optional": true - } - } - }, - "node_modules/eslint_d/node_modules/eslint-scope": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", - "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint_d/node_modules/eslint-visitor-keys": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint_d/node_modules/espree": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", - "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.15.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint_d/node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/eslint_d/node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/eslint_d/node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint_d/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/eslint-config-prettier": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz", - "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==", - "dev": true, - "license": "MIT", - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-plugin-prettier": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz", - "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==", - "dev": true, - "license": "MIT", - "dependencies": { - "prettier-linter-helpers": "^1.0.0", - "synckit": "^0.11.7" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint-plugin-prettier" - }, - "peerDependencies": { - "@types/eslint": ">=8.0.0", - "eslint": ">=8.0.0", - "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", - "prettier": ">=3.0.0" - }, - "peerDependenciesMeta": { - "@types/eslint": { - "optional": true - }, - "eslint-config-prettier": { - "optional": true - } - } - }, - "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "license": "MIT", - "engines": { - "node": ">=0.8.x" - } - }, - "node_modules/exponential-backoff": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", - "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "license": "BSD-2-Clause", - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, - "node_modules/extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "license": "MIT", - "optional": true - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-diff": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", - "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-unique-numbers": { - "version": "9.0.23", - "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-9.0.23.tgz", - "integrity": "sha512-jcRIaHo46nfvyvKRMaFSKXmez4jALQ3Qw49gxM5F4siz8HqkyKPPEexpCOYwBSJI1HovrDr4fEedM8QAJ7oX3w==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.3", - "tslib": "^2.8.1" - }, - "engines": { - "node": ">=18.2.0" - } - }, - "node_modules/fastq": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "license": "MIT", - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "license": "MIT", - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "license": "MIT", - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", - "dev": true, - "license": "ISC" - }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/global-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", - "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "es6-error": "^4.1.1", - "matcher": "^3.0.0", - "roarr": "^2.15.3", - "semver": "^7.3.2", - "serialize-error": "^7.0.1" - }, - "engines": { - "node": ">=10.0" - } - }, - "node_modules/global-agent/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globalthis": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "define-properties": "^1.2.1", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/got": { - "version": "11.8.6", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", - "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", - "license": "MIT", - "dependencies": { - "@sindresorhus/is": "^4.0.0", - "@szmarczak/http-timer": "^4.0.5", - "@types/cacheable-request": "^6.0.1", - "@types/responselike": "^1.0.0", - "cacheable-lookup": "^5.0.3", - "cacheable-request": "^7.0.2", - "decompress-response": "^6.0.0", - "http2-wrapper": "^1.0.0-beta.5.2", - "lowercase-keys": "^2.0.0", - "p-cancelable": "^2.0.0", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=10.19.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "license": "ISC" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "license": "MIT", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-symbols": "^1.0.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/help-me": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz", - "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==", - "license": "MIT" - }, - "node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", - "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", - "license": "BSD-2-Clause" - }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/http2-wrapper": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", - "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "license": "MIT", - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.0.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.0.0" - } - }, - "node_modules/iconv-corefoundation": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", - "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==", - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "cli-truncate": "^2.1.0", - "node-addon-api": "^1.6.3" - }, - "engines": { - "node": "^8.11.2 || >=10" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, - "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", - "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true, - "license": "ISC" - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" - }, - "node_modules/ip-address": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", - "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", - "license": "MIT", - "engines": { - "node": ">= 12" - } - }, - "node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isbinaryfile": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.6.tgz", - "integrity": "sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 18.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jake": { - "version": "10.9.4", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz", - "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "async": "^3.2.6", - "filelist": "^1.0.4", - "picocolors": "^1.1.1" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "license": "MIT" - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "license": "ISC", - "optional": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "license": "MIT", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "license": "MIT", - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/lazy-val": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", - "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", - "license": "MIT" - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true, - "license": "MIT" - }, - "node_modules/lodash.escaperegexp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==", - "license": "MIT" - }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", - "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.", - "license": "MIT" - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "license": "ISC", - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/make-fetch-happen/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/make-fetch-happen/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/matcher": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", - "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", - "license": "MIT", - "optional": true, - "dependencies": { - "escape-string-regexp": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "license": "MIT", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/minimatch": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz", - "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==", - "dev": true, - "license": "ISC", - "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "license": "MIT", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mqtt": { - "version": "5.14.1", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.14.1.tgz", - "integrity": "sha512-NxkPxE70Uq3Ph7goefQa7ggSsVzHrayCD0OyxlJgITN/EbzlZN+JEPmaAZdxP1LsIT5FamDyILoQTF72W7Nnbw==", - "license": "MIT", - "dependencies": { - "@types/readable-stream": "^4.0.21", - "@types/ws": "^8.18.1", - "commist": "^3.2.0", - "concat-stream": "^2.0.0", - "debug": "^4.4.1", - "help-me": "^5.0.0", - "lru-cache": "^10.4.3", - "minimist": "^1.2.8", - "mqtt-packet": "^9.0.2", - "number-allocator": "^1.0.14", - "readable-stream": "^4.7.0", - "rfdc": "^1.4.1", - "socks": "^2.8.6", - "split2": "^4.2.0", - "worker-timers": "^8.0.23", - "ws": "^8.18.3" - }, - "bin": { - "mqtt": "build/bin/mqtt.js", - "mqtt_pub": "build/bin/pub.js", - "mqtt_sub": "build/bin/sub.js" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/mqtt-packet": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.2.tgz", - "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==", - "license": "MIT", - "dependencies": { - "bl": "^6.0.8", - "debug": "^4.3.4", - "process-nextick-args": "^2.0.1" - } - }, - "node_modules/mqtt/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "license": "ISC" - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "license": "MIT" - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "license": "MIT" - }, - "node_modules/negotiator": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-abi": { - "version": "3.77.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz", - "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-abi/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-addon-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/node-api-version": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.1.tgz", - "integrity": "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.3.5" - } - }, - "node_modules/node-api-version/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/number-allocator": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz", - "integrity": "sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==", - "license": "MIT", - "dependencies": { - "debug": "^4.3.1", - "js-sdsl": "4.3.0" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "license": "MIT", - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/ora/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/p-cancelable": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/pe-library": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz", - "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12", - "npm": ">=6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/jet2jet" - } - }, - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "license": "MIT" - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "license": "ISC" - }, - "node_modules/plist": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", - "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@xmldom/xmldom": "^0.8.8", - "base64-js": "^1.5.1", - "xmlbuilder": "^15.1.1" - }, - "engines": { - "node": ">=10.4.0" - } - }, - "node_modules/postject": { - "version": "1.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz", - "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "commander": "^9.4.0" - }, - "bin": { - "postject": "dist/cli.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/postject/node_modules/commander": { - "version": "9.5.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", - "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": "^12.20.0 || >=14" - } - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/prettier": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", - "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-diff": "^1.1.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/proc-log": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz", - "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "license": "MIT", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "license": "MIT" - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true, - "license": "ISC" - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pump": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", - "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/read-binary-file-arch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", - "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.3.4" - }, - "bin": { - "read-binary-file-arch": "cli.js" - } - }, - "node_modules/readable-stream": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", - "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", - "license": "MIT", - "dependencies": { - "abort-controller": "^3.0.0", - "buffer": "^6.0.3", - "events": "^3.3.0", - "process": "^0.11.10", - "string_decoder": "^1.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/readable-stream/node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resedit": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz", - "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "pe-library": "^0.4.1" - }, - "engines": { - "node": ">=12", - "npm": ">=6" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/jet2jet" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "license": "MIT" - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/responselike": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", - "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", - "license": "MIT", - "dependencies": { - "lowercase-keys": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "dev": true, - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rfdc": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", - "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", - "license": "MIT" - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/roarr": { - "version": "2.15.4", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", - "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "license": "MIT" - }, - "node_modules/sanitize-filename": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", - "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", - "dev": true, - "license": "WTFPL OR ISC", - "dependencies": { - "truncate-utf8-bytes": "^1.0.0" - } - }, - "node_modules/sax": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", - "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", - "license": "ISC" - }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "license": "MIT", - "optional": true - }, - "node_modules/serialize-error": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", - "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", - "license": "MIT", - "optional": true, - "dependencies": { - "type-fest": "^0.13.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/serialize-error/node_modules/type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "license": "(MIT OR CC0-1.0)", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "license": "MIT", - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", - "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", - "license": "MIT", - "dependencies": { - "ip-address": "^10.0.1", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/socks-proxy-agent/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/split2": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", - "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", - "license": "ISC", - "engines": { - "node": ">= 10.x" - } - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "license": "BSD-3-Clause", - "optional": true - }, - "node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "license": "ISC", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/stat-mode": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", - "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sumchecker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "license": "Apache-2.0", - "dependencies": { - "debug": "^4.1.0" - }, - "engines": { - "node": ">= 8.0" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/synckit": { - "version": "0.11.11", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz", - "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@pkgr/core": "^0.2.9" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/synckit" - } - }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dev": true, - "license": "ISC", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/temp": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", - "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "mkdirp": "^0.5.1", - "rimraf": "~2.6.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/temp-file": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", - "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", - "dev": true, - "license": "MIT", - "dependencies": { - "async-exit-hook": "^2.0.1", - "fs-extra": "^10.0.0" - } - }, - "node_modules/temp-file/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/temp-file/node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/temp-file/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/temp/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/temp/node_modules/rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dev": true, - "license": "ISC", - "peer": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, - "node_modules/tiny-async-pool": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz", - "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^5.5.0" - } - }, - "node_modules/tiny-async-pool/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/tiny-typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", - "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==", - "license": "MIT" - }, - "node_modules/tmp": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", - "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.14" - } - }, - "node_modules/tmp-promise": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", - "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "tmp": "^0.2.0" - } - }, - "node_modules/truncate-utf8-bytes": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", - "dev": true, - "license": "WTFPL", - "dependencies": { - "utf8-byte-length": "^1.0.1" - } - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "license": "MIT", - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", - "license": "MIT" - }, - "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", - "license": "MIT" - }, - "node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/utf8-byte-length": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz", - "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==", - "dev": true, - "license": "(WTFPL OR MIT)" - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, - "node_modules/verror": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "dev": true, - "license": "MIT", - "dependencies": { - "defaults": "^1.0.3" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/worker-factory": { - "version": "7.0.45", - "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.45.tgz", - "integrity": "sha512-FFPCiSv7MD6ZDEfiik/ErM8IrIAWajaXhezLyCo3v0FjhUWud6GXnG2BiTE91jLywXGAVCT8IF48Hhr+D/omMw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.3", - "fast-unique-numbers": "^9.0.23", - "tslib": "^2.8.1" - } - }, - "node_modules/worker-timers": { - "version": "8.0.24", - "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.24.tgz", - "integrity": "sha512-Ydu/7TRHlxIRjYSGDge1F92L7y9kzInpwR4CkocRVObPE0eRqC6d+0GFh52Hm+m520RHVKiytOERtCUu5sQDVQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.3", - "tslib": "^2.8.1", - "worker-timers-broker": "^8.0.10", - "worker-timers-worker": "^9.0.10" - } - }, - "node_modules/worker-timers-broker": { - "version": "8.0.10", - "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-8.0.10.tgz", - "integrity": "sha512-xvo/9GiuduENbJNdWnvZtkriIkjBKKVbMyw7GXvrBu3n1JHemzZgxqaCcCBNlpfXnRXXF4ekqvXWLh1gb65b8w==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.3", - "broker-factory": "^3.1.9", - "fast-unique-numbers": "^9.0.23", - "tslib": "^2.8.1", - "worker-timers-worker": "^9.0.10" - } - }, - "node_modules/worker-timers-worker": { - "version": "9.0.10", - "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-9.0.10.tgz", - "integrity": "sha512-cfCmAkuoN+nGGJShta/g7CQVP3h7rvQA642EQg72fOHCWP5S2P83rLxDiaGv811Hd+19Cgdqt/tpRBIZ5kj/dw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.28.3", - "tslib": "^2.8.1", - "worker-factory": "^7.0.45" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "license": "ISC" - }, - "node_modules/ws": { - "version": "8.18.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", - "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xmlbuilder": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", - "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.0" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "license": "ISC" - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "license": "MIT", - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index 5efab3b56bf1..c299a65b464d 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -7,22 +7,20 @@ fetchFromGitLab, makeBinaryWrapper, makeDesktopItem, + nix-update-script, }: -let - version = "2.250914.1"; -in buildNpmPackage (finalAttrs: { pname = "gridtracker2"; - inherit version; + version = "2.251106.7"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker2"; - tag = "v${version}"; - hash = "sha256-ME68kGRlIRPs5tUOGb3g2CXJKC52QuMuTMc1ctAMzlk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-g1njDFodCHvILZZNrI/exAqWLZsbNBGHy3jlzo3uLJ8="; }; - npmDepsHash = "sha256-MUXwJPo/A0gxtUbM3MOWfMcspM1losuDhc5XTc2oqCo="; + npmDepsHash = "sha256-8bhOfLLsNSK+/mXku5ukLr65bfk+RwC3SyOGRHndqVQ="; nativeBuildInputs = [ makeBinaryWrapper @@ -50,10 +48,6 @@ buildNpmPackage (finalAttrs: { }) ]; - postPatch = '' - install -Dvm644 ${./package-lock.json} package-lock.json - ''; - buildPhase = '' runHook preBuild '' @@ -108,6 +102,8 @@ buildNpmPackage (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Warehouse of amateur radio information"; homepage = "https://gridtracker.org/"; From a592a5733f9a48fb4f6a9901f3f3149e630dd38d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 00:36:01 +0100 Subject: [PATCH 1826/2279] python3Packages.cron-converter: disable failing test I bisected this one to 0b3b48fb5f6, which makes no sense, so I don't currently have an idea why it fails. --- .../python-modules/cron-converter/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cron-converter/default.nix b/pkgs/development/python-modules/cron-converter/default.nix index e6c6f9afe1f0..0865b9cefd6b 100644 --- a/pkgs/development/python-modules/cron-converter/default.nix +++ b/pkgs/development/python-modules/cron-converter/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - unittestCheckHook, setuptools, python-dateutil, python, @@ -19,13 +18,21 @@ buildPythonPackage rec { hash = "sha256-XpkpEMurRrhq1S4XnhPRW5CCBk+HzljOSQfZ98VJ7UE="; }; + postPatch = '' + # Timezone does not match + substituteInPlace tests/integration/tests_cron_seeker.py \ + --replace-fail "test_timezone" "dont_test_timezone" + ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ python-dateutil ]; + dependencies = [ python-dateutil ]; checkPhase = '' + runHook preCheck ${python.interpreter} -m unittest discover -s tests/unit -v ${python.interpreter} -m unittest discover -s tests/integration -v + runHook postCheck ''; pythonImportsCheck = [ "cron_converter" ]; From 498c0daa5f2002ca0d691d87ed6b1fb622af0b52 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 19:04:32 -0500 Subject: [PATCH 1827/2279] svelte-language-server: cleanup No more custom update script or vendored lockfile! --- .../svelte-language-server/package-lock.json | 2011 ----------------- .../sv/svelte-language-server/package.nix | 76 +- .../sv/svelte-language-server/update.sh | 30 - 3 files changed, 59 insertions(+), 2058 deletions(-) delete mode 100644 pkgs/by-name/sv/svelte-language-server/package-lock.json delete mode 100755 pkgs/by-name/sv/svelte-language-server/update.sh diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json deleted file mode 100644 index 803047ea156f..000000000000 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ /dev/null @@ -1,2011 +0,0 @@ -{ - "name": "svelte-language-server", - "version": "0.17.21", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "svelte-language-server", - "version": "0.17.21", - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "@vscode/emmet-helper": "2.8.4", - "chokidar": "^4.0.1", - "estree-walker": "^2.0.1", - "fdir": "^6.2.0", - "globrex": "^0.1.2", - "lodash": "^4.17.21", - "prettier": "~3.3.3", - "prettier-plugin-svelte": "^3.4.0", - "svelte": "^4.2.19", - "svelte2tsx": "~0.7.45", - "typescript": "^5.9.2", - "typescript-auto-import-cache": "^0.3.6", - "vscode-css-languageservice": "~6.3.5", - "vscode-html-languageservice": "~5.4.0", - "vscode-languageserver": "9.0.1", - "vscode-languageserver-protocol": "3.17.5", - "vscode-languageserver-types": "3.17.5", - "vscode-uri": "~3.1.0" - }, - "bin": { - "svelteserver": "bin/server.js" - }, - "devDependencies": { - "@types/estree": "^0.0.42", - "@types/globrex": "^0.1.4", - "@types/lodash": "^4.14.116", - "@types/mocha": "^9.1.0", - "@types/node": "^18.0.0", - "@types/sinon": "^7.5.2", - "cross-env": "^7.0.2", - "mocha": "^9.2.0", - "sinon": "^11.0.0", - "ts-node": "^10.0.0" - }, - "engines": { - "node": ">= 18.0.0" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "license": "Apache-2.0", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "node_modules/@emmetio/abbreviation": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", - "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", - "license": "MIT", - "dependencies": { - "@emmetio/scanner": "^1.0.4" - } - }, - "node_modules/@emmetio/css-abbreviation": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", - "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", - "license": "MIT", - "dependencies": { - "@emmetio/scanner": "^1.0.4" - } - }, - "node_modules/@emmetio/scanner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", - "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==", - "license": "MIT" - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/fake-timers": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", - "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^1.7.0" - } - }, - "node_modules/@sinonjs/samsam": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz", - "integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^1.6.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" - } - }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", - "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "dev": true, - "license": "(Unlicense OR Apache-2.0)" - }, - "node_modules/@tsconfig/node10": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", - "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/estree": { - "version": "0.0.42", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz", - "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/globrex": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@types/globrex/-/globrex-0.1.4.tgz", - "integrity": "sha512-qm82zaOxfn8Us/GGjNrQQ1XfCBUDV86DxQgIQq/p1zGHlt0xnbUiabNjN9rZUhMNvvIE2gg8iTW+GMfw0TnnLg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/mocha": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", - "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/node": { - "version": "18.19.130", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz", - "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~5.26.4" - } - }, - "node_modules/@types/sinon": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", - "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@ungap/promise-all-settled": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", - "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", - "dev": true, - "license": "ISC" - }, - "node_modules/@vscode/emmet-helper": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", - "integrity": "sha512-lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg==", - "license": "MIT", - "dependencies": { - "emmet": "^2.3.0", - "jsonc-parser": "^2.3.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "^3.15.1", - "vscode-nls": "^5.0.0", - "vscode-uri": "^2.1.2" - } - }, - "node_modules/@vscode/emmet-helper/node_modules/vscode-uri": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", - "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==", - "license": "MIT" - }, - "node_modules/@vscode/l10n": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==", - "license": "MIT" - }, - "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true, - "license": "MIT" - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, - "node_modules/aria-query": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz", - "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==", - "license": "Apache-2.0", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/axobject-query": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", - "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", - "license": "Apache-2.0", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true, - "license": "ISC" - }, - "node_modules/camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chalk/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "license": "MIT", - "dependencies": { - "readdirp": "^4.0.1" - }, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/code-red": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz", - "integrity": "sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==", - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15", - "@types/estree": "^1.0.1", - "acorn": "^8.10.0", - "estree-walker": "^3.0.3", - "periscopic": "^3.1.0" - } - }, - "node_modules/code-red/node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "license": "MIT" - }, - "node_modules/code-red/node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/cross-env": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "bin": { - "cross-env": "src/bin/cross-env.js", - "cross-env-shell": "src/bin/cross-env-shell.js" - }, - "engines": { - "node": ">=10.14", - "npm": ">=6", - "yarn": ">=1" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/css-tree": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", - "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", - "license": "MIT", - "dependencies": { - "mdn-data": "2.0.30", - "source-map-js": "^1.0.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" - } - }, - "node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, - "license": "MIT" - }, - "node_modules/decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/dedent-js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz", - "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==", - "license": "MIT" - }, - "node_modules/diff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", - "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/emmet": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.11.tgz", - "integrity": "sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==", - "license": "MIT", - "workspaces": [ - "./packages/scanner", - "./packages/abbreviation", - "./packages/css-abbreviation", - "./" - ], - "dependencies": { - "@emmetio/abbreviation": "^2.3.3", - "@emmetio/css-abbreviation": "^2.1.8" - } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "license": "MIT" - }, - "node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "license": "MIT", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "license": "BSD-3-Clause", - "bin": { - "flat": "cli.js" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dev": true, - "license": "ISC", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/globrex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", - "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", - "license": "MIT" - }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4.x" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "license": "MIT", - "bin": { - "he": "bin/he" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "license": "ISC", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-reference": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz", - "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==", - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.6" - } - }, - "node_modules/is-reference/node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "license": "MIT" - }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "license": "ISC" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsonc-parser": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", - "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==", - "license": "MIT" - }, - "node_modules/just-extend": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", - "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true, - "license": "MIT" - }, - "node_modules/locate-character": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz", - "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==", - "license": "MIT" - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" - }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", - "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", - "dev": true, - "license": "MIT" - }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "license": "MIT", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/magic-string": { - "version": "0.30.19", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz", - "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==", - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.5" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true, - "license": "ISC" - }, - "node_modules/mdn-data": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", - "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", - "license": "CC0-1.0" - }, - "node_modules/minimatch": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", - "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mocha": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", - "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@ungap/promise-all-settled": "1.1.2", - "ansi-colors": "4.1.1", - "browser-stdout": "1.3.1", - "chokidar": "3.5.3", - "debug": "4.3.3", - "diff": "5.0.0", - "escape-string-regexp": "4.0.0", - "find-up": "5.0.0", - "glob": "7.2.0", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "4.1.0", - "log-symbols": "4.1.0", - "minimatch": "4.2.1", - "ms": "2.1.3", - "nanoid": "3.3.1", - "serialize-javascript": "6.0.0", - "strip-json-comments": "3.1.1", - "supports-color": "8.1.1", - "which": "2.0.2", - "workerpool": "6.2.0", - "yargs": "16.2.0", - "yargs-parser": "20.2.4", - "yargs-unparser": "2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" - } - }, - "node_modules/mocha/node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/mocha/node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/nanoid": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", - "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", - "dev": true, - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/nise": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", - "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^11.2.2", - "@sinonjs/text-encoding": "^0.7.2", - "just-extend": "^6.2.0", - "path-to-regexp": "^6.2.1" - } - }, - "node_modules/nise/node_modules/@sinonjs/commons": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz", - "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/periscopic": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz", - "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==", - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0", - "estree-walker": "^3.0.0", - "is-reference": "^3.0.0" - } - }, - "node_modules/periscopic/node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "license": "MIT" - }, - "node_modules/periscopic/node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0" - } - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "devOptional": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/prettier-plugin-svelte": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.4.0.tgz", - "integrity": "sha512-pn1ra/0mPObzqoIQn/vUTR3ZZI6UuZ0sHqMK5x2jMLGrs53h0sXhkVuDcrlssHwIMk7FYrMjHBPoUSyyEEDlBQ==", - "license": "MIT", - "peerDependencies": { - "prettier": "^3.0.0", - "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" - } - }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, - "node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", - "license": "MIT", - "engines": { - "node": ">= 14.18.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/scule": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz", - "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==", - "license": "MIT" - }, - "node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "license": "MIT", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/sinon": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.2.tgz", - "integrity": "sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==", - "deprecated": "16.1.1", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^1.8.3", - "@sinonjs/fake-timers": "^7.1.2", - "@sinonjs/samsam": "^6.0.2", - "diff": "^5.0.0", - "nise": "^5.1.0", - "supports-color": "^7.2.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/sinon" - } - }, - "node_modules/sinon/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/svelte": { - "version": "4.2.20", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.20.tgz", - "integrity": "sha512-eeEgGc2DtiUil5ANdtd8vPwt9AgaMdnuUFnPft9F5oMvU/FHu5IHFic+p1dR/UOB7XU2mX2yHW+NcTch4DCh5Q==", - "license": "MIT", - "dependencies": { - "@ampproject/remapping": "^2.2.1", - "@jridgewell/sourcemap-codec": "^1.4.15", - "@jridgewell/trace-mapping": "^0.3.18", - "@types/estree": "^1.0.1", - "acorn": "^8.9.0", - "aria-query": "^5.3.0", - "axobject-query": "^4.0.0", - "code-red": "^1.0.3", - "css-tree": "^2.3.1", - "estree-walker": "^3.0.3", - "is-reference": "^3.0.1", - "locate-character": "^3.0.0", - "magic-string": "^0.30.4", - "periscopic": "^3.1.0" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/svelte/node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "license": "MIT" - }, - "node_modules/svelte/node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0" - } - }, - "node_modules/svelte2tsx": { - "version": "0.7.45", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.45.tgz", - "integrity": "sha512-cSci+mYGygYBHIZLHlm/jYlEc1acjAHqaQaDFHdEBpUueM9kSTnPpvPtSl5VkJOU1qSJ7h1K+6F/LIUYiqC8VA==", - "license": "MIT", - "dependencies": { - "dedent-js": "^1.0.1", - "scule": "^1.3.0" - }, - "peerDependencies": { - "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0", - "typescript": "^4.9.4 || ^5.0.0" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/ts-node/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/typescript-auto-import-cache": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.6.tgz", - "integrity": "sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ==", - "license": "MIT", - "dependencies": { - "semver": "^7.3.8" - } - }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true, - "license": "MIT" - }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true, - "license": "MIT" - }, - "node_modules/vscode-css-languageservice": { - "version": "6.3.8", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.8.tgz", - "integrity": "sha512-dBk/9ullEjIMbfSYAohGpDOisOVU1x2MQHOeU12ohGJQI7+r0PCimBwaa/pWpxl/vH4f7ibrBfxIZY3anGmHKQ==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/vscode-html-languageservice": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.4.0.tgz", - "integrity": "sha512-9/cbc90BSYCghmHI7/VbWettHZdC7WYpz2g5gBK6UDUI1MkZbM773Q12uAYJx9jzAiNHPpyo6KzcwmcnugncAQ==", - "license": "MIT", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.12", - "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.1.0" - } - }, - "node_modules/vscode-jsonrpc": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", - "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/vscode-languageserver": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", - "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", - "license": "MIT", - "dependencies": { - "vscode-languageserver-protocol": "3.17.5" - }, - "bin": { - "installServerIntoExtension": "bin/installServerIntoExtension" - } - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", - "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", - "license": "MIT", - "dependencies": { - "vscode-jsonrpc": "8.2.0", - "vscode-languageserver-types": "3.17.5" - } - }, - "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", - "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", - "license": "MIT" - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.5", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", - "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", - "license": "MIT" - }, - "node_modules/vscode-nls": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==", - "license": "MIT" - }, - "node_modules/vscode-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", - "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", - "license": "MIT" - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/workerpool": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", - "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.4", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-unparser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", - "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", - "dev": true, - "license": "MIT", - "dependencies": { - "camelcase": "^6.0.0", - "decamelize": "^4.0.0", - "flat": "^5.0.2", - "is-plain-obj": "^2.1.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - } - } -} diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index fd6f70afe676..523dba7c1e10 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -1,31 +1,73 @@ { lib, - buildNpmPackage, - fetchurl, + stdenv, + fetchFromGitHub, + pnpm, + nodejs, + makeBinaryWrapper, + nix-update-script, }: -let - version = "0.17.21"; -in -buildNpmPackage { +stdenv.mkDerivation (finalAttrs: { pname = "svelte-language-server"; - inherit version; + version = "0.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-zRUeAocuEyoaBUrCDkqxJhMY7ryv9y7hYQC5/CsL2NM="; + src = fetchFromGitHub { + owner = "sveltejs"; + repo = "language-tools"; + tag = "svelte-language-server@${finalAttrs.version}"; + hash = "sha256-HNd4M7bFTN0oFdO44w8Rgz45mDLrJ/ksZKB0iPw6t1s="; }; - npmDepsHash = "sha256-0nad0gdQhl3nwHbmDyLCfnIfgn4ixBbZn/oy3THDniw="; + pnpmWorkspaces = [ "svelte-language-server..." ]; - postPatch = '' - ln -s ${./package-lock.json} package-lock.json + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + fetcherVersion = 2; + hash = "sha256-J279yrHRyG6QyUedXmYwv6Kcuz/9pGwvu6dUELIFeu8="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + pnpm run --filter=svelte-language-server... build + + runHook postBuild ''; - dontNpmBuild = true; + installPhase = '' + runHook preInstall - npmFlags = [ "--legacy-peer-deps" ]; + pnpm install --filter=svelte-language-server... --prod --frozen-lockfile --offline --force --ignore-scripts + mkdir -p $out/lib/node_modules/svelte-language-server/ + mkdir -p $out/bin - passthru.updateScript = ./update.sh; + mv {packages,node_modules} $out/lib/node_modules/svelte-language-server/ + + makeWrapper ${lib.getExe nodejs} $out/bin/svelteserver \ + --add-flags "$out/lib/node_modules/svelte-language-server/packages/language-server/bin/server.js" \ + --set NODE_PATH "$out/lib/node_modules/svelte-language-server/packages/language-server/node_modules/" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--use-github-releases" + "--version-regex" + "svelte-language-server@(.*)" + ]; + }; meta = { description = "Language server (implementing the language server protocol) for Svelte"; @@ -35,4 +77,4 @@ buildNpmPackage { mainProgram = "svelteserver"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sv/svelte-language-server/update.sh b/pkgs/by-name/sv/svelte-language-server/update.sh deleted file mode 100755 index 40d1ef0175dc..000000000000 --- a/pkgs/by-name/sv/svelte-language-server/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget - -set -euo pipefail -pushd "$(dirname "${BASH_SOURCE[0]}")" - -version=$(npm view svelte-language-server version) -tarball="svelte-language-server-$version.tgz" -url="https://registry.npmjs.org/svelte-language-server/-/$tarball" - -if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then - echo "Already up to date!" - exit 0 -fi - -sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix - -sha256=$(nix-prefetch-url "$url") -src_hash=$(nix-hash --type sha256 --to-sri "$sha256") -sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix - -rm -f package-lock.json package.json *.tgz -wget "$url" -tar xf "$tarball" --strip-components=1 package/package.json -npm i --package-lock-only -npm_hash=$(prefetch-npm-deps package-lock.json) -sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix -rm -f package.json *.tgz - -popd From be4be0370ffc3dd852fd4c062f971b6eac47f8f4 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Sat, 8 Nov 2025 16:25:37 -0800 Subject: [PATCH 1828/2279] nixosTests.nix-config: fix build by unsetting NIX_PATH This fixes the build failure of `nixosTests.nix-config`. The test was failing because NIX_PATH overrides the contents of config. See also: https://github.com/NixOS/nix/issues/13849 --- nixos/tests/nix-config.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/nix-config.nix b/nixos/tests/nix-config.nix index b39baf3f6b50..005dd71b2f63 100644 --- a/nixos/tests/nix-config.nix +++ b/nixos/tests/nix-config.nix @@ -14,7 +14,8 @@ start_all() machine.wait_for_unit("nix-daemon.socket") # regression test for the workaround for https://github.com/NixOS/nix/issues/9487 - print(machine.succeed("nix-instantiate --find-file extra")) - print(machine.succeed("nix-instantiate --find-file nonextra")) + # unset NIX_PATH because environtment overrides the config + print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file extra")) + print(machine.succeed("env -u NIX_PATH nix-instantiate --find-file nonextra")) ''; } From f4de2b7d91b52775798eb759125b59a30e0b89c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 00:28:53 +0000 Subject: [PATCH 1829/2279] codebook: 0.3.16 -> 0.3.17 --- pkgs/by-name/co/codebook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index 45d274a0adec..b6424d909826 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.16"; + version = "0.3.17"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-kunYcWwb4b8ryQYZpG623RcyZaiWTGTKCXjfUq8iz+o="; + hash = "sha256-5LTblBxYuz/ErESSLPZ4EHlLID8XvhCDQkKxUyEWcmM="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-cHcSmTEW4xpZkrv4a2lgTlK2VU7+kOvZiEo//jrnd8E="; + cargoHash = "sha256-jkYtXrNJTaxrAWpB7ZYsj/LA2tUWVReAnF2cb4TpwE0="; # Integration tests require internet access for dictionaries doCheck = false; From 17029d07c4b18d7571db128f059628dfee4a376b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 00:36:26 +0000 Subject: [PATCH 1830/2279] firebase-tools: 14.20.0 -> 14.24.1 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 36e6d61f4941..df9d5950bf75 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.20.0"; + version = "14.24.1"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-CX/2luy78Du6gsGG3ex0Q5amu93MqebTUF9of7D6H4M="; + hash = "sha256-eXADtJFQWC5Qf013fkJ4AdukyaKlc5Rorys/jNG9f+E="; }; - npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc="; + npmDepsHash = "sha256-m5Rz2JH9e/rJ4tKwNiiZb7wnOmeMDxYuUrVx6QZy25w="; # No more package-lock.json in upstream src postPatch = '' From 9e33d07cfadde9b64466a54b27e31db4bc4f7ff1 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 8 Nov 2025 19:21:41 -0500 Subject: [PATCH 1831/2279] spek: fix build failure due to ffmpeg=8 --- pkgs/by-name/sp/spek/ffmpeg8-compat.patch | 74 +++++++++++++++++++++++ pkgs/by-name/sp/spek/package.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/by-name/sp/spek/ffmpeg8-compat.patch diff --git a/pkgs/by-name/sp/spek/ffmpeg8-compat.patch b/pkgs/by-name/sp/spek/ffmpeg8-compat.patch new file mode 100644 index 000000000000..59d6dd608854 --- /dev/null +++ b/pkgs/by-name/sp/spek/ffmpeg8-compat.patch @@ -0,0 +1,74 @@ +From df8402575f1550d79c751051e9006fd3b7fa0fe0 Mon Sep 17 00:00:00 2001 +From: Hannes Braun +Date: Thu, 9 Oct 2025 20:28:34 +0200 +Subject: [PATCH] Fix compatibility with FFmpeg 8 + +--- + src/spek-fft.cc | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/spek-fft.cc b/src/spek-fft.cc +index 3105213f..00d4fa5c 100644 +--- a/src/spek-fft.cc ++++ b/src/spek-fft.cc +@@ -2,7 +2,7 @@ + + #define __STDC_CONSTANT_MACROS + extern "C" { +-#include ++#include + } + + #include "spek-fft.h" +@@ -16,7 +16,10 @@ class FFTPlanImpl : public FFTPlan + void execute() override; + + private: +- struct RDFTContext *cx; ++ struct AVTXContext *cx; ++ av_tx_fn tx; ++ float* tmp; ++ const int len; + }; + + std::unique_ptr FFT::create(int nbits) +@@ -24,27 +27,31 @@ std::unique_ptr FFT::create(int nbits) + return std::unique_ptr(new FFTPlanImpl(nbits)); + } + +-FFTPlanImpl::FFTPlanImpl(int nbits) : FFTPlan(nbits), cx(av_rdft_init(nbits, DFT_R2C)) ++FFTPlanImpl::FFTPlanImpl(int nbits) : FFTPlan(nbits), len(1 << nbits) + { ++ const float scale = 1.0; ++ av_tx_init(&this->cx, &this->tx, AV_TX_FLOAT_RDFT, 0, this->len, &scale, 0); ++ this->tmp = (float*) av_malloc((this->len + 2) * sizeof(float)); + } + + FFTPlanImpl::~FFTPlanImpl() + { +- av_rdft_end(this->cx); ++ av_tx_uninit(&this->cx); ++ av_freep(&this->tmp); + } + + void FFTPlanImpl::execute() + { +- av_rdft_calc(this->cx, this->get_input()); ++ this->tx(this->cx, this->tmp, this->get_input(), sizeof(AVComplexFloat)); + + // Calculate magnitudes. + int n = this->get_input_size(); + float n2 = n * n; +- this->set_output(0, 10.0f * log10f(this->get_input(0) * this->get_input(0) / n2)); +- this->set_output(n / 2, 10.0f * log10f(this->get_input(1) * this->get_input(1) / n2)); ++ this->set_output(0, 10.0f * log10f(this->tmp[0] * this->tmp[0] / n2)); + for (int i = 1; i < n / 2; i++) { +- float re = this->get_input(i * 2); +- float im = this->get_input(i * 2 + 1); ++ float re = this->tmp[i * 2]; ++ float im = this->tmp[i * 2 + 1]; + this->set_output(i, 10.0f * log10f((re * re + im * im) / n2)); + } ++ this->set_output(n / 2, 10.0f * log10f(this->tmp[this->len] * this->tmp[this->len] / n2)); + } + diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix index 5ff36e44fdbd..1abbb0b2a2d8 100644 --- a/pkgs/by-name/sp/spek/package.nix +++ b/pkgs/by-name/sp/spek/package.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./autoconf.patch + # https://github.com/alexkay/spek/pull/338 + ./ffmpeg8-compat.patch ]; nativeBuildInputs = [ From 02fa87d7f0d37c62bd8c34c0898f1378a5a3fe4e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 8 Nov 2025 18:16:43 -0500 Subject: [PATCH 1832/2279] golly: fix build failure (missing distutils) --- pkgs/by-name/go/golly/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix index 5c291cdaf216..4372f564c8c2 100644 --- a/pkgs/by-name/go/golly/package.nix +++ b/pkgs/by-name/go/golly/package.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - (python3.withPackages (ps: [ ps.setuptools ])) + (python3.withPackages (ps: [ + ps.setuptools + ps.distutils + ])) wrapGAppsHook3 ]; From 930ce25af3297b59ff39df42f733145f5d81b97a Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 18:42:31 -0500 Subject: [PATCH 1833/2279] yarn-lock-converter: clean up build Removes custom update script, in-tree lockfile, and makes it use the yarn tooling for the package since that's what upstream uses --- .../ya/yarn-lock-converter/package-lock.json | 592 ------------------ .../ya/yarn-lock-converter/package.nix | 67 +- .../ya/yarn-lock-converter/source.json | 6 - pkgs/by-name/ya/yarn-lock-converter/update.sh | 25 - 4 files changed, 41 insertions(+), 649 deletions(-) delete mode 100644 pkgs/by-name/ya/yarn-lock-converter/package-lock.json delete mode 100644 pkgs/by-name/ya/yarn-lock-converter/source.json delete mode 100755 pkgs/by-name/ya/yarn-lock-converter/update.sh diff --git a/pkgs/by-name/ya/yarn-lock-converter/package-lock.json b/pkgs/by-name/ya/yarn-lock-converter/package-lock.json deleted file mode 100644 index aa50ffec8d5b..000000000000 --- a/pkgs/by-name/ya/yarn-lock-converter/package-lock.json +++ /dev/null @@ -1,592 +0,0 @@ -{ - "name": "@vht/yarn-lock-converter", - "version": "0.0.2", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@vht/yarn-lock-converter", - "version": "0.0.2", - "license": "MIT", - "dependencies": { - "@yarnpkg/lockfile": "^1.1.0", - "cacache": "^15.3.0", - "js-yaml": "^4.1.0", - "yargs": "^17.3.1" - }, - "bin": { - "yarn-lock-converter": "index.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==" - }, - "node_modules/@npmcli/fs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", - "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", - "dependencies": { - "@gar/promisify": "^1.0.1", - "semver": "^7.3.5" - } - }, - "node_modules/@npmcli/move-file": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", - "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" - }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/cacache": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", - "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", - "dependencies": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==" - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tar": { - "version": "6.1.14", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz", - "integrity": "sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dependencies": { - "unique-slug": "^2.0.0" - } - }, - "node_modules/unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dependencies": { - "imurmurhash": "^0.1.4" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "engines": { - "node": ">=12" - } - } - } -} diff --git a/pkgs/by-name/ya/yarn-lock-converter/package.nix b/pkgs/by-name/ya/yarn-lock-converter/package.nix index 4bba600ea020..d63720de804e 100644 --- a/pkgs/by-name/ya/yarn-lock-converter/package.nix +++ b/pkgs/by-name/ya/yarn-lock-converter/package.nix @@ -1,51 +1,66 @@ { lib, - buildNpmPackage, - fetchurl, + stdenv, + fetchFromGitHub, nodejs, testers, yarn-lock-converter, + yarn-berry_3, + makeBinaryWrapper, + nix-update-script, }: - -let - source = lib.importJSON ./source.json; -in -buildNpmPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "yarn-lock-converter"; - inherit (source) version; + version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@vht/yarn-lock-converter/-/yarn-lock-converter-${version}.tgz"; - hash = "sha256-CP1wI33fgtp4GSjasktbfWuUjGzCuK3XR+p64aPAryQ="; + src = fetchFromGitHub { + owner = "vht"; + repo = "yarn-lock-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AFetTjQZwXjlgLFE9YWHt82j3y8Ej25HYLed3tw/IxU="; }; - npmDepsHash = source.deps; + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-dpZJYiRJzd6QbrRJccXpEkkNgtbBJ669lY5UQmcy8Yg="; + }; - dontBuild = true; + nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + yarn-berry_3 + makeBinaryWrapper + ]; - nativeBuildInputs = [ nodejs ]; + installPhase = '' + runHook preInstall - postPatch = '' - # Use generated package-lock.json as upstream does not provide one - ln -s ${./package-lock.json} package-lock.json + yarn config set nodeLinker "node-modules" + yarn install --mode=skip-build --inline-builds + mkdir -p $out/lib/node_modules/yarn-lock-converter + chmod +x ./index.js + rm yarn.lock README.md package.json + mkdir $out/bin + mv * $out/lib/node_modules/yarn-lock-converter/ + + makeWrapper ${lib.getExe nodejs} $out/bin/yarn-lock-converter \ + --add-flags "$out/lib/node_modules/yarn-lock-converter/index.js" + + runHook postInstall ''; - postInstall = '' - mv $out/bin/@vht/yarn-lock-converter $out/bin/yarn-lock-converter - rmdir $out/bin/@vht - ''; passthru = { tests.version = testers.testVersion { package = yarn-lock-converter; }; - updateScript = ./update.sh; + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Converts modern Yarn v2+ yarn.lock files into a Yarn v1 format"; homepage = "https://github.com/VHT/yarn-lock-converter"; - license = licenses.mit; - maintainers = with maintainers; [ gador ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; mainProgram = "yarn-lock-converter"; }; -} +}) diff --git a/pkgs/by-name/ya/yarn-lock-converter/source.json b/pkgs/by-name/ya/yarn-lock-converter/source.json deleted file mode 100644 index a897b7c9fb67..000000000000 --- a/pkgs/by-name/ya/yarn-lock-converter/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "0.0.2", - "integrity": "sha512-58Oy9qP081Jr+h9EOYB0ItCQ7IfU0RBbkHN4AQR3h6aPDjIOPYTiEyczmTfsLQcAyCFl0MV1kU8QL1xBALKkYw==", - "filename": "vht-yarn-lock-converter-0.0.2.tgz", - "deps": "sha256-GCTjZ3x+ZgE762yUWQZzEOOwfAr7W0z/cySlehRILf4=" -} diff --git a/pkgs/by-name/ya/yarn-lock-converter/update.sh b/pkgs/by-name/ya/yarn-lock-converter/update.sh deleted file mode 100755 index 72d46b470f28..000000000000 --- a/pkgs/by-name/ya/yarn-lock-converter/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils -# shellcheck shell=bash - -set -exuo pipefail - -cd -- "$(dirname -- "${BASH_SOURCE[0]}")" - -TMPDIR="$(mktemp -d)" -trap 'rm -r -- "$TMPDIR"' EXIT - -pushd -- "$TMPDIR" -npm pack "@vht/yarn-lock-converter" --json | jq '.[0] | { version, integrity, filename }' > source.json -bsdtar -x -f "$(jq -r .filename source.json)" - -pushd package -npm install --package-lock-only -popd - -DEPS="$(prefetch-npm-deps package/package-lock.json)" -jq ".deps = \"$DEPS\"" source.json | sponge source.json - -popd - -cp -t . -- "$TMPDIR/source.json" "$TMPDIR/package/package-lock.json" From 9127923bde3691c7515cdc456ec1266f5d988f9c Mon Sep 17 00:00:00 2001 From: Leon Hubrich Date: Sat, 8 Nov 2025 16:09:55 +0100 Subject: [PATCH 1834/2279] technitium-dns-server: 13.6.0 -> 14.0.0 --- .../nuget-deps.json | 19 +++++++++++++++++-- .../technitium-dns-server-library/package.nix | 7 ++++--- .../te/technitium-dns-server/nuget-deps.json | 19 +++++++++++++++++-- .../te/technitium-dns-server/package.nix | 8 ++++---- 4 files changed, 42 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json index 9291a64bd73b..27256167cce8 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json @@ -1,7 +1,22 @@ [ { "pname": "BouncyCastle.Cryptography", - "version": "2.5.1", - "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + "version": "2.6.2", + "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, + { + "pname": "QRCoder", + "version": "1.7.0", + "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU=" + }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" } ] diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 5a66e52496fe..5d826f5dfb69 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -7,23 +7,24 @@ }: buildDotnetModule rec { pname = "technitium-dns-server-library"; - version = "dns-server-v13.6.0"; + version = "dns-server-v14.0.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = version; - hash = "sha256-P1LVn//4xL/MZoy7thw+zYlAZVTfjSivyAiuhixAoHs="; + hash = "sha256-vQAYNXSXWWuEMLj+zWQIM5A4BYcyiUlfp7+Ttk4R+MA="; name = "${pname}-${version}"; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; nugetDeps = ./nuget-deps.json; projectFile = [ "TechnitiumLibrary.ByteTree/TechnitiumLibrary.ByteTree.csproj" "TechnitiumLibrary.Net/TechnitiumLibrary.Net.csproj" + "TechnitiumLibrary.Security.OTP/TechnitiumLibrary.Security.OTP.csproj" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json index 9291a64bd73b..27256167cce8 100644 --- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json @@ -1,7 +1,22 @@ [ { "pname": "BouncyCastle.Cryptography", - "version": "2.5.1", - "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + "version": "2.6.2", + "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, + { + "pname": "QRCoder", + "version": "1.7.0", + "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU=" + }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" } ] diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index dcf44fab3ee5..dcfe49aa3060 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -10,18 +10,18 @@ }: buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.6.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${version}"; - hash = "sha256-2OSuLGWdaiiPxyW0Uvq736wHKa7S3CHv79cmZZ86GRE="; + hash = "sha256-h7lcm9gKaCIPccg4Mxp78qSgygAuFyRPd1jPfmkoarU="; name = "${pname}-${version}"; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; nugetDeps = ./nuget-deps.json; From 0826c4c43fb6a6240aaf75b8b59f9f40cbd7eb31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 01:10:56 +0000 Subject: [PATCH 1835/2279] gatus: 5.30.0 -> 5.31.0 --- pkgs/by-name/ga/gatus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index 17f51ca2fb2a..43efdfa76d7b 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.30.0"; + version = "5.31.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-iQp/oIEuyD+lVf20BH3fMScUtRxvEVrbu1zoJE5YkVI="; + hash = "sha256-thLS6pAlnu7XcQHritr28CnzmpIOgIcEPIch2IwhZfQ="; }; - vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8="; + vendorHash = "sha256-VaD/cTf9D00gr6+9gKadK4aTwqhmJN/+cohwNvckxyw="; subPackages = [ "." ]; From 7663f1c46cbef7ea42cf58af6699486c7790052c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 01:19:27 +0000 Subject: [PATCH 1836/2279] hyprlandPlugins.hyprsplit: 0.51.1 -> 0.52.0 --- .../window-managers/hyprwm/hyprland-plugins/hyprsplit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 7e1ed6968617..5849a4f07741 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin (finalAttrs: { pluginName = "hyprsplit"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; tag = "v${finalAttrs.version}"; - hash = "sha256-7cnfq7fXgJHkmHyvRwx8UsUdUwUEN4A1vUGgsSb4SmI="; + hash = "sha256-XlOZr7BKii0ch24ZtOqjeVl1+uGewW5XQTSteKxXg9c="; }; nativeBuildInputs = [ From 14826cc558d7023da18fbc3701c4a8ca44a20d59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 01:31:23 +0000 Subject: [PATCH 1837/2279] remnote: 1.21.24 -> 1.22.0 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index aeeaaf4751df..24592f216214 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.21.24"; + version = "1.22.0"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-jJ7I5Xgq6RHZ4pT8VTMikX1f38C9FqLtJaSSgc2rWHA="; + hash = "sha256-4zIUPAQV814fmvIrHP+Dvn9eNeSY/Zmn0G2nr7llto8="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 6c8850d1e17ac78caac46eb52abb7c40bd4cdce4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 01:49:22 +0000 Subject: [PATCH 1838/2279] hyprgraphics: 0.2.0 -> 0.3.0 --- pkgs/by-name/hy/hyprgraphics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index d6f1b1ea5bd0..6350cc6553aa 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprgraphics"; tag = "v${finalAttrs.version}"; - hash = "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc="; + hash = "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA="; }; nativeBuildInputs = [ From 8d2e2814cf205cea94c043a220c905bc336d026e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 01:50:42 +0000 Subject: [PATCH 1839/2279] tmuxp: 1.55.0 -> 1.56.0 --- pkgs/by-name/tm/tmuxp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix index 399cd8560c4b..590072e7f7f4 100644 --- a/pkgs/by-name/tm/tmuxp/package.nix +++ b/pkgs/by-name/tm/tmuxp/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.55.0"; + version = "1.56.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-reC609nY1kdmQInAphAfmSTZQQqitTD88EBv/4mU3h0="; + hash = "sha256-6Nc6JHNZM6OUgoOfpD4wCDUlLAb2kLBplm1IjuVG/q8="; }; build-system = with python3Packages; [ From a65655104f1ae81512718bbab3246d001faa91de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 17:43:14 -0800 Subject: [PATCH 1840/2279] python3Packages.aioamazondevices: 6.5.6 -> 8.0.1 Diff: https://github.com/chemelli74/aioamazondevices/compare/v6.5.6...v8.0.1 Changelog: https://github.com/chemelli74/aioamazondevices/blob/v8.0.1/CHANGELOG.md --- pkgs/development/python-modules/aioamazondevices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix index c6380fc0d7fe..8be76a60d0b3 100644 --- a/pkgs/development/python-modules/aioamazondevices/default.nix +++ b/pkgs/development/python-modules/aioamazondevices/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aioamazondevices"; - version = "6.5.6"; + version = "8.0.1"; pyproject = true; src = fetchFromGitHub { owner = "chemelli74"; repo = "aioamazondevices"; tag = "v${version}"; - hash = "sha256-OgcOsRKqSU3k4myfHmOYaXW259LDgYWj0gXPLwabVIM="; + hash = "sha256-q8wmBBXZSu69BAZ1wY4/tlW/usiWwlwVCnAEOOZs5TE="; }; build-system = [ poetry-core ]; From 663028e7ed243ab046775db889d610bf60d1984a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 17:43:38 -0800 Subject: [PATCH 1841/2279] python3Packages.onedrive-personal-sdk: 0.0.15 -> 0.0.16 Diff: https://github.com/zweckj/onedrive-personal-sdk/compare/v0.0.15...v0.0.16 Changelog: https://github.com/zweckj/onedrive-personal-sdk/releases/tag/v0.0.16 --- .../python-modules/onedrive-personal-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index 6fecc2fdcfba..a14ec083152b 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-XKFTwaerAtN0GEZGpJ4Uq81cIrENEkNFhqqqM+eNVII="; + hash = "sha256-zGzJtfgOuEfAaL+26jnEZzhKJLhRpBTYPBWzIHqwtXw="; }; build-system = [ setuptools ]; From fe2a7f9f1a504b13a29357b4dd24ce463214d436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 17:52:35 -0800 Subject: [PATCH 1842/2279] python3Packages.tuya-device-sharing-sdk: 0.2.4 -> 0.2.5 Diff: https://github.com/tuya/tuya-device-sharing-sdk/compare/e29d52f65e0db5f64b0ea7064a177cf6a0c4d51e...b2156585daefa39fcd2feff964e9be53124697f1 --- .../tuya-device-sharing-sdk/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index 733d0adffe24..a2d7027b1a45 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, requests, paho-mqtt, @@ -9,22 +9,21 @@ }: let pname = "tuya-device-sharing-sdk"; - version = "0.2.4"; + version = "0.2.5"; in buildPythonPackage { inherit pname version; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-4RwsuFg2ukvM0rplCZKJx85DbJTpJnhkCVDnfT4r4A8="; + src = fetchFromGitHub { + owner = "tuya"; + repo = "tuya-device-sharing-sdk"; + # no tags on GitHub: https://github.com/tuya/tuya-device-sharing-sdk/issues/2 + # no sdist on PyPI: https://github.com/tuya/tuya-device-sharing-sdk/issues/41 + rev = "b2156585daefa39fcd2feff964e9be53124697f1"; + hash = "sha256-ypAS8tzO4Wyc8pVjSiGaNNl+2fkFNcC3Ftql3l2B8k8="; }; - # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 - postPatch = '' - touch requirements.txt - ''; - build-system = [ setuptools ]; dependencies = [ From b1d47aef4104eaaf1aef2855c11b93c70644f9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 17:22:17 -0800 Subject: [PATCH 1843/2279] home-assistant.intents: 2025.10.28 -> 2025.11.7 Diff: https://github.com/OHF-Voice/intents-package/compare/2025.10.28...2025.11.7 Changelog: https://github.com/OHF-Voice/intents-package/releases/tag/2025.11.7 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 9c13d0fa3359..b9783b457519 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2025.10.28"; + version = "2025.11.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; tag = version; fetchSubmodules = true; - hash = "sha256-Svnw9Jd0E4pMFfa/Do7YsFzdXLzsGmhu8amo+zYDvus="; + hash = "sha256-F6QctdjF6xoQ3d49MdOUb/8CHgV84wxZHUrGGmiYYcs="; }; build-system = [ From b6d0b748168ab4d6d34d419cd54c18d311e080aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 17:13:39 -0800 Subject: [PATCH 1844/2279] home-assistant: 2025.11.0 -> 2025.11.1 Diff: https://github.com/home-assistant/core/compare/2025.11.0...2025.11.1 Changelog: https://github.com/home-assistant/core/releases/tag/2025.11.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 17bbdd7bf250..9b0fb0e4f36b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.11.0"; + version = "2025.11.1"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index af962a1d269f..c38d38cd4b74 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -299,7 +299,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.11.0"; + hassVersion = "2025.11.1"; in python.pkgs.buildPythonApplication rec { @@ -320,13 +320,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-+syn/y2ukZKsnCniZxodRWVcCE3AcvUKt80L2XslKKI="; + hash = "sha256-39OY9lKlqnv3QdIdJ698cMTBrF41SxbqQfz6N32mD5s="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-JSWr+yGvpXYc6Bw3B+xVLpYokVM11dsJZBWYy+W4bH4="; + hash = "sha256-W9xuWfz9lCQXaPg+O313mzMxvBfY64CrU7vwNjra/3k="; }; build-system = with python.pkgs; [ From 0f211302be6d9635d5b40a718a0d58bdb017df1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 18:00:33 -0800 Subject: [PATCH 1845/2279] home-assistant: update OUR_VERSION_IS_NEWER_THAN --- pkgs/servers/home-assistant/update-component-packages.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 471e576a6150..ab29b720baad 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -69,7 +69,9 @@ EXTRA_COMPONENT_DEPS = { OUR_VERSION_IS_NEWER_THAN = { "blinkstick": "1.2.0", "gps3": "0.33.3", + "proxmoxer": "2.2.0", "pybluez": "0.22", + "pyps4-2ndscreen": "1.3.1", } From 95acb919e1f4daf5d6e694c1719a2e80c55129da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 18:45:09 -0800 Subject: [PATCH 1846/2279] python3Packages.apscheduler: add meta.changelog --- pkgs/development/python-modules/apscheduler/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index f11fe2e37d8e..df2323ee730f 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -69,10 +69,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "apscheduler" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/agronholm/apscheduler/releases/tag/${src.tag}"; description = "Library that lets you schedule your Python code to be executed"; homepage = "https://github.com/agronholm/apscheduler"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From 75820299368f1af3209cbd0772e2350956621ecf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:07:17 +0000 Subject: [PATCH 1847/2279] python3Packages.onedrive-personal-sdk: 0.0.15 -> 0.0.16 --- .../python-modules/onedrive-personal-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index 6fecc2fdcfba..a14ec083152b 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-XKFTwaerAtN0GEZGpJ4Uq81cIrENEkNFhqqqM+eNVII="; + hash = "sha256-zGzJtfgOuEfAaL+26jnEZzhKJLhRpBTYPBWzIHqwtXw="; }; build-system = [ setuptools ]; From 0ee005db2ae9cc55d2d9b3f6bc40f9e5954907b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:13:50 +0000 Subject: [PATCH 1848/2279] amp-cli: 0.0.1762056193-g37ad2e -> 0.0.1762646500-gac8d42 --- pkgs/by-name/am/amp-cli/package-lock.json | 9 +++++---- pkgs/by-name/am/amp-cli/package.nix | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 7a393abfde79..07772645fe4e 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1762056193-g37ad2e" + "@sourcegraph/amp": "^0.0.1762646500-gac8d42" } }, "node_modules/@napi-rs/keyring": { @@ -228,9 +228,10 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1762056193-g37ad2e", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1762056193-g37ad2e.tgz", - "integrity": "sha512-dWhc7ajnw1QGCYwrOGwCbpyzedf5n2RoTCM97ibpzgpphDLCdyGTXh2XTC6mrxM2CNQLp5jJaWxvcDk9nM80Vg==", + "version": "0.0.1762646500-gac8d42", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1762646500-gac8d42.tgz", + "integrity": "sha512-+1w32tuDcCTUSULBwWeVrOLYGIvS1z/hNWSG4p9v5TC40asudJ6DVHSgIEO4alY4v8lJ3NnDQ1t8FrdwClZi6g==", + "license": "Sourcegraph Commercial License", "dependencies": { "@napi-rs/keyring": "1.1.9" }, diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 0dfeb0d3eac1..887211dc4916 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1762056193-g37ad2e"; + version = "0.0.1762646500-gac8d42"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-so/nlX4N9qhNLsK0OllmpfiqzyEBtPrt7KD/MoAChGc="; + hash = "sha256-jChd6cb2IBmEBu/gbCywaHJpN2Mj3EUp8YSKQ9HQd0A="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-xhN5XJs8E7yCRQWRPlH9iZyh5FocUjFMto5QweaV8aI="; + npmDepsHash = "sha256-uuGqTutlApLDDFHlK+ACrox5B2KpJGYJP6M4CeCj2v0="; propagatedBuildInputs = [ ripgrep From 29121bd2f0a0fa528c0116c2f9a74df9aa9966a0 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Sat, 8 Nov 2025 19:14:56 -0800 Subject: [PATCH 1849/2279] treemd: init at 0.1.2 --- pkgs/by-name/tr/treemd/package.nix | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/tr/treemd/package.nix diff --git a/pkgs/by-name/tr/treemd/package.nix b/pkgs/by-name/tr/treemd/package.nix new file mode 100644 index 000000000000..8b2344206f12 --- /dev/null +++ b/pkgs/by-name/tr/treemd/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "treemd"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "Epistates"; + repo = "treemd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PloG2eYelsp0Y3bG2ZNgSuwwPnKufBWwLW2TMQBGu1M="; + }; + + cargoHash = "sha256-jX2X90Kk8iAVVNm/r37v+0X1WSXje/GRr0Tv0ZzuwWI="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI/CLI markdown navigator with tree-based structural navigation"; + homepage = "https://github.com/Epistates/treemd"; + changelog = "https://github.com/Epistates/treemd/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yiyu ]; + mainProgram = "treemd"; + }; +}) From 344ea83a38708440d091f953ea67677f166cc363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 19:16:22 -0800 Subject: [PATCH 1850/2279] python3Packages.homeassistant-stubs: 2025.11.0 -> 2025.11.1 Diff: https://github.com/KapJI/homeassistant-stubs/compare/2025.11.0...2025.11.1 Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.11.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index ebeca4ab7b43..33a2bd1a11a8 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.11.0"; + version = "2025.11.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-/A/25x0FMu4MXMHhOZ1MF9Qpw+UgA2OUc/HZaJm9bsQ="; + hash = "sha256-OuW2hsYQ/KvCiu1Hfq6g/nryQ5R0Th5GmoR574DMXfU="; }; build-system = [ From e3f80ba2be13f3ca7e2382aa07b5cf8f911d94b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:21:34 +0000 Subject: [PATCH 1851/2279] python3Packages.pylacus: 1.19.0 -> 1.19.1 --- pkgs/development/python-modules/pylacus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 10551ce6489e..51384b2aa280 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-Ezp/aFTETvU1bOZZvMlZn0XmaLWoOd6l8s0n5lIqV2w="; + hash = "sha256-aOTXz/77ZeX0xiMeUIaqDrtpMvIM7Idp+3rYeXJ4bpg="; }; build-system = [ poetry-core ]; From 577e746964d8b1be603ee45560a0f1b317fd8c53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:29:31 +0000 Subject: [PATCH 1852/2279] stratis-cli: 3.8.2 -> 3.8.3 --- pkgs/by-name/st/stratis-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stratis-cli/package.nix b/pkgs/by-name/st/stratis-cli/package.nix index 952a0ba60d21..39d024528dc9 100644 --- a/pkgs/by-name/st/stratis-cli/package.nix +++ b/pkgs/by-name/st/stratis-cli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.8.2"; + version = "3.8.3"; pyproject = true; src = fetchFromGitHub { owner = "stratis-storage"; repo = "stratis-cli"; tag = "v${version}"; - hash = "sha256-0evuBr3ziiWKkR0FDjZ9BXrfRpQR7JtHsm/sYE8pIbg="; + hash = "sha256-wkFInG/sbHxyi5UIjIANxsTd9BrIHuyAfYG4DvqLsmU="; }; build-system = with python3Packages; [ From a3f9f17062f89dbab9af4e42b23211788eacfbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 19:41:12 -0800 Subject: [PATCH 1853/2279] python3Packages.sse-starlette: 3.0.2 -> 3.0.3 Diff: https://github.com/sysid/sse-starlette/compare/v3.0.2...v3.0.3 Changelog: https://github.com/sysid/sse-starlette/blob/v3.0.3/CHANGELOG.md --- .../python-modules/sse-starlette/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index 7298d302a41b..97227795ec1c 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -1,19 +1,21 @@ { lib, + aiosqlite, anyio, asgi-lifespan, async-timeout, buildPythonPackage, + daphne, fastapi, fetchFromGitHub, + granian, httpx, portend, psutil, pytest-asyncio, pytestCheckHook, - pythonOlder, - requests, setuptools, + sqlalchemy, starlette, tenacity, testcontainers, @@ -22,27 +24,33 @@ buildPythonPackage rec { pname = "sse-starlette"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "sysid"; repo = "sse-starlette"; tag = "v${version}"; - hash = "sha256-9NI6CUcK5AqITKxtCMz9Z1+Ke87u2y2E0LlwsFUDhgw="; + hash = "sha256-2QCagK4OIVJJ54uedJFVjcGyRo2j1415iNjDIa67/mo="; }; build-system = [ setuptools ]; dependencies = [ anyio - starlette ]; optional-dependencies = { - examples = [ fastapi ]; + daphne = [ daphne ]; + examples = [ + aiosqlite + fastapi + sqlalchemy + starlette + uvicorn + ] + ++ sqlalchemy.optional-dependencies.asyncio; + granian = [ granian ]; uvicorn = [ uvicorn ]; }; @@ -55,7 +63,6 @@ buildPythonPackage rec { psutil pytest-asyncio pytestCheckHook - requests tenacity testcontainers uvicorn @@ -66,9 +73,6 @@ buildPythonPackage rec { disabledTests = [ # AssertionError "test_stop_server_with_many_consumers" - "test_stop_server_conditional" - # require network access - "test_sse_multiple_consumers" # require docker "test_sse_server_termination" ]; From ea604bc0ef28c78c69fb2060d87f16ed18ecdc82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:57:00 +0000 Subject: [PATCH 1854/2279] lilex: 2.620 -> 2.621 --- pkgs/by-name/li/lilex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix index bbf5393d5908..49c031a22c0d 100644 --- a/pkgs/by-name/li/lilex/package.nix +++ b/pkgs/by-name/li/lilex/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "lilex"; - version = "2.620"; + version = "2.621"; src = fetchurl { url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip"; - hash = "sha256-h2Xt1HIOlh4wwHK3bg5hxyWxi/W8GWMiRkaWF7fhngU="; + hash = "sha256-TsLJ96SZpokW3354/yt0Re4ZtFXqYK/46iyZXdPKhoE="; }; nativeBuildInputs = [ unzip ]; From c55fb54628a8a300b99af2e6a7ba79aee3c89c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 19:58:55 -0800 Subject: [PATCH 1855/2279] python3Packages.httpx-sse: tests depend on starlette --- pkgs/development/python-modules/httpx-sse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/httpx-sse/default.nix b/pkgs/development/python-modules/httpx-sse/default.nix index af17e3a88124..1e12ec115c3e 100644 --- a/pkgs/development/python-modules/httpx-sse/default.nix +++ b/pkgs/development/python-modules/httpx-sse/default.nix @@ -9,6 +9,7 @@ setuptools-scm, setuptools, sse-starlette, + starlette, }: buildPythonPackage rec { @@ -37,6 +38,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook sse-starlette + starlette ]; meta = with lib; { From ff9b57943db332fd5fb85131b15e84b23fa25bb0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:35 +0000 Subject: [PATCH 1856/2279] =?UTF-8?q?epiphany:=2049.0=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/ep/epiphany/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix index 30eedb952f62..832e3fbbd13b 100644 --- a/pkgs/by-name/ep/epiphany/package.nix +++ b/pkgs/by-name/ep/epiphany/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; - hash = "sha256-Jx7HNbmDa5dEnjJ5PTVKivtrn40tPXWCGIXV4VVweSk="; + hash = "sha256-12fFy7niVmvJkD1BG2iWFh40P3EqozMFNlc52N7axSE="; }; nativeBuildInputs = [ From 5246109d9d89466401292264694c83971e9eb807 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:42 +0000 Subject: [PATCH 1857/2279] =?UTF-8?q?gnome-notes:=2040.1=20=E2=86=92=2040.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/bijiben/-/compare/40.1...40.2 Changelog-reviewed-by: Jan Tojnar gnome-notes: 40.1 → 40.2 https://gitlab.gnome.org/GNOME/bijiben/-/compare/BIJIBEN_40_1...BIJIBEN_40_2 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-notes/package.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 85a6238d34d1..2b9bb48cfce2 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -5,7 +5,6 @@ ninja, gettext, fetchurl, - fetchpatch, pkg-config, wrapGAppsHook3, itstool, @@ -29,29 +28,13 @@ stdenv.mkDerivation rec { pname = "gnome-notes"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; - hash = "sha256-BaBvsGbpgC9fJKtnsNL3FFGGY2O6Pjn593X9SadYe78="; + hash = "sha256-siERvAaVa+81mqzx1u3h5So1sADIgROTZjL4rGztzmc="; }; - patches = [ - # Fix build with meson 0.61 - # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch"; - hash = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; - }) - - # build: Depend on webkit2gtk-4.1 - # https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/200 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/0791507873c96d0463cd0c83108415541f854edd.patch"; - hash = "sha256-TwCi9sDudeiOjrH2VevAynxvy/WTmwB2HrWqhviPg8o="; - }) - ]; - doCheck = true; postPatch = '' From 71b3212b8c1f06ee3e743bc64448fc2093464919 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:34:51 +0000 Subject: [PATCH 1858/2279] =?UTF-8?q?loupe:=2049.0=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/loupe/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/lo/loupe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 852bef596c32..38a902de5a81 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-os5VTo5eHRa4NuRvFlJ2fbK7O9T33KqH8laa8QuGOTg="; + hash = "sha256-MAmLyXmhyHouyye0patyWr+QC9cQu5wrzAyULVFcUcU="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "loupe-deps-${finalAttrs.version}"; - hash = "sha256-56yU5h+ZMSX6PH2jkboBwV0IMlcJI9i1sJZx4nNYJe4="; + hash = "sha256-GqPHvUBA5aRUnRSP+PpdOCC9sL8axnEdfqtHFp2KYJc="; }; postPatch = '' From aef9f18282573046b0e76f1244ceddc199d6c6ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:02 +0000 Subject: [PATCH 1859/2279] =?UTF-8?q?gnome-music:=2049.0.2=20=E2=86=92=204?= =?UTF-8?q?9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/49.0.2...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-music/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 6ccdb0a3ebce..5869783e519c 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "49.0.2"; + version = "49.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; - hash = "sha256-m5dJQgC7qoew7YhJJVQw1WwVjVG03qe+aIn3dWGpVKc="; + hash = "sha256-uoga4LVeNOYmn9LT342L+jxex+N7rIlFrseLf/IHvGc="; }; nativeBuildInputs = [ From f3cf107adb0d1e814bfd0612e38ab71ea8c04ebf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:02 +0000 Subject: [PATCH 1860/2279] =?UTF-8?q?simple-scan:=2049.0.1=20=E2=86=92=204?= =?UTF-8?q?9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/simple-scan/-/compare/49.0.1...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/si/simple-scan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 9e54bf337c77..215b758c5119 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "49.0.1"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz"; - hash = "sha256-4ZdiQiZj70v1059udfTWGo3hgTcpqW5X4E6Bdk4B6uI="; + hash = "sha256-mujUFR7K+VhF65+ZtDbVecg48s8Cdj+6O8A3gCUb4zQ="; }; nativeBuildInputs = [ From ce0b8d308b0f8cd2d160ab5fddc6220e3b549e68 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:04 +0000 Subject: [PATCH 1861/2279] =?UTF-8?q?accerciser:=203.46.2=20=E2=86=92=203.?= =?UTF-8?q?48.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/accerciser/-/compare/3.46.2...3.48.0 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/ac/accerciser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ac/accerciser/package.nix b/pkgs/by-name/ac/accerciser/package.nix index d3c133575abb..bc41b5d9be94 100644 --- a/pkgs/by-name/ac/accerciser/package.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -19,13 +19,13 @@ python3.pkgs.buildPythonApplication rec { pname = "accerciser"; - version = "3.46.2"; + version = "3.48.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${lib.versions.majorMinor version}/accerciser-${version}.tar.xz"; - hash = "sha256-r/RpRR8k5YdpPE9/en+GpQU8ZrIDOndDrZ2DhHSWdw4="; + hash = "sha256-kCiOiQCidKOu4gUw6zkWRZlK6YZyIJFroPXEZ3v+n00="; }; nativeBuildInputs = [ From 2a9d77efa07a7ed2cf45208822b1630701521942 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:06 +0000 Subject: [PATCH 1862/2279] =?UTF-8?q?gnome-console:=2049.0=20=E2=86=92=204?= =?UTF-8?q?9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/console/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-console/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix index e6c37c1433de..dca8e48b97ec 100644 --- a/pkgs/by-name/gn/gnome-console/package.nix +++ b/pkgs/by-name/gn/gnome-console/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-no6WRvRz0B9LSnvOLEetImtK6D+r8ky7tKyU9qxdXMI="; + hash = "sha256-/KOf0EHgXufKbSpcggAZN9Aq4VE/PzZRvTeuDi72bj4="; }; nativeBuildInputs = [ From b9b05f7f6d4a45bab6cc73f7b7627c4419943ef3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:14 +0000 Subject: [PATCH 1863/2279] =?UTF-8?q?file-roller:=2044.5=20=E2=86=92=2044.?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/44.5...44.6 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/fi/file-roller/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix index 92fadc299300..d55680d17cf9 100644 --- a/pkgs/by-name/fi/file-roller/package.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "44.5"; + version = "44.6"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; - hash = "sha256-369LuYnAuJhr6L2un//quNDzBmmuOmJ+jD35TyOIgzk="; + hash = "sha256-noc7UAW8QleZqM1LI34f/0MOyNazSpksYDPx38bjdk4="; }; nativeBuildInputs = [ From 5944c5d5baa7f42cb6aca1f7e5a2b8f3bdd2144f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:19 +0000 Subject: [PATCH 1864/2279] =?UTF-8?q?gnome-software:=2049.0=20=E2=86=92=20?= =?UTF-8?q?49.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-software/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index 780f34638a5b..ac0b3685c4b4 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-NpzXVD8KS+mjNzPeCvFWNIJmw7XKyqTkc3lZ59FOBB8="; + hash = "sha256-Sd/sp3kogBdW0MU4bB0gRUygd2AKXR7WbsRu4zoyxm0="; }; patches = [ From 3cf743aa8475fee5dbe340f9aae624ce57701e9d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:39 +0000 Subject: [PATCH 1865/2279] =?UTF-8?q?gnome-calculator:=2049.0.1=20?= =?UTF-8?q?=E2=86=92=2049.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/49.0.1...49.1.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-calculator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index a46838c3c8f8..3f00285d5e00 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "49.0.1"; + version = "49.1.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; - hash = "sha256-7L4g5jBXX7i8I3kNNfOGrBd5ADxA3FyHfTzS2g/HRT8="; + hash = "sha256-hA00We1p8nh6lmn5b2s/nv8Wy0hpAMcZrCUsQkVjRj0="; }; nativeBuildInputs = [ From 62deb34be473fe793fa20714d280a014af52006a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:43 +0000 Subject: [PATCH 1866/2279] =?UTF-8?q?gnome-characters:=2049.0=20=E2=86=92?= =?UTF-8?q?=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-characters/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-characters/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix index a619b7aa49eb..a1145af29341 100644 --- a/pkgs/by-name/gn/gnome-characters/package.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; - hash = "sha256-G25UioLiaqTsmv5AnWmiVwk2LAN/pcUzGG1qHbKa9uM="; + hash = "sha256-eVwP5DTmAtx4M5H7WDDbx9jh6gXKdyEPsUDi9vQKFFw="; }; nativeBuildInputs = [ From aa8f8b02910720b111444342911cf85a90e51088 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:44 +0000 Subject: [PATCH 1867/2279] =?UTF-8?q?d-spy:=2049.1=20=E2=86=92=2049.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/d-spy/-/compare/49.1...49.2 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/d-/d-spy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix index 449742760ca2..705bf5078e5d 100644 --- a/pkgs/by-name/d-/d-spy/package.nix +++ b/pkgs/by-name/d-/d-spy/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "d-spy"; - version = "49.1"; + version = "49.2"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz"; - hash = "sha256-4m4YEg5k1FG2HyAs+qORNienAxwqlUrs85HIPYPQnYo="; + hash = "sha256-uBT/J9goqrzacvLGLxtB1iA190PQb9mn48XJhsSHmmk="; }; nativeBuildInputs = [ From d32f3d9035e0bb1102af70b0a83f3ec79a89bf18 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:49 +0000 Subject: [PATCH 1868/2279] =?UTF-8?q?gnome-nibbles:=204.4.1=20=E2=86=92=20?= =?UTF-8?q?4.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-nibbles/-/compare/4.4.1...4.4.2 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-nibbles/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index 63fa0ce5c04b..def763a92046 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-uIK4n2v9bRX96yr5edkYui8cHMjto5yviCe1Z9N/r5U="; + hash = "sha256-FuBgKHBkamZTh2y8Ye4j92NAwmsSyeicfDASCEUEQVU="; }; nativeBuildInputs = [ From 95916d50b65a305a46aae48278eaf0658bc3ee1a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:35:53 +0000 Subject: [PATCH 1869/2279] =?UTF-8?q?gnome-podcasts:=2025.2=20=E2=86=92=20?= =?UTF-8?q?25.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/podcasts/-/releases/25.3 https://gitlab.gnome.org/World/podcasts/-/compare/25.2...25.3 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-podcasts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix index 599e5401935c..8db622714de6 100644 --- a/pkgs/by-name/gn/gnome-podcasts/package.nix +++ b/pkgs/by-name/gn/gnome-podcasts/package.nix @@ -25,19 +25,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-podcasts"; - version = "25.2"; + version = "25.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "podcasts"; tag = finalAttrs.version; - hash = "sha256-pVGut7kmwybPrR7ZaXPoDx03FOYeZSvchXl++2cdPck="; + hash = "sha256-SblEHmKB/WZwT3T3vnlB4yJjY9JhftDkO21/yY//BRM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-HKU4rd5OzxhYcN6QKiTVj+NnkdyG8T+D6X1txznZ/xM="; + hash = "sha256-Ii5M6W5v5t+qppQNZI1ypHGMM5urUMv7e3Fef3FjfAA="; }; nativeBuildInputs = [ From ddb679abbbaacc594ec597337b24e93c5f8dd057 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:36:00 +0000 Subject: [PATCH 1870/2279] =?UTF-8?q?quadrapassel:=2049.0=20=E2=86=92=2049?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/quadrapassel/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/qu/quadrapassel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix index 87259d17b568..b88d2343b3b7 100644 --- a/pkgs/by-name/qu/quadrapassel/package.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quadrapassel"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz"; - hash = "sha256-VFMe3w+apmk2qjQHmvzCpcAAJfQBaMr7frsduPJC7uE="; + hash = "sha256-ttejtndabcTxmAvZN4MkZmF6iX7KoQmPOixZvhdhZQk="; }; nativeBuildInputs = [ From 3ae918c439d945a208f94fd38ab6f1d23ce5856a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:36:07 +0000 Subject: [PATCH 1871/2279] =?UTF-8?q?orca:=2049.1=20=E2=86=92=2049.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/49.1...49.4 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/or/orca/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 95c5142cb46b..a76c4f54d48b 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "49.1"; + version = "49.4"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-ZTKWhs0V9iq05MDQDOuYTUmbKOwsURdQjDuCiQ1i5+M="; + hash = "sha256-trpMxYeEEcNKfVt+6bLFybHQSt0Qv9IPbiMx1ZQWUgc="; }; patches = [ From a64cde4d709b8b65ddb4cb98156ac3e5815efaa8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:36:08 +0000 Subject: [PATCH 1872/2279] =?UTF-8?q?gnome-builder:=2049.0=20=E2=86=92=204?= =?UTF-8?q?9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-builder/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix index fa090a43883e..cba93a657428 100644 --- a/pkgs/by-name/gn/gnome-builder/package.nix +++ b/pkgs/by-name/gn/gnome-builder/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "49.0"; + version = "49.1"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-1FmQ22gfle4id75PqfKWSYJwfb3zATCgvecCNLN59WI="; + hash = "sha256-O55HmDiPlZ4QMsas5KX7e05Yi2M5/OTCLsJqvoafiis="; }; patches = [ From 4eee38cb143f905ecc263f02d6784a24d344484d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:36:23 +0000 Subject: [PATCH 1873/2279] =?UTF-8?q?gnome-user-docs:=2049.0=20=E2=86=92?= =?UTF-8?q?=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-user-docs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index bbaac9a44a11..1f37e38bdbc1 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-7BGNRNoYZuQXONoZz128PZpCklovO/SO5sN+bj5G3fM="; + hash = "sha256-DlC4u0/OqpEoNnzTRY5e24YclieMGqmnOm7AQCt7xhc="; }; nativeBuildInputs = [ From 15708618cf4b495895d73729d507383ba834ce52 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:36:30 +0000 Subject: [PATCH 1874/2279] =?UTF-8?q?gnome-remote-desktop:=2049.0=20?= =?UTF-8?q?=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-remote-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index c8d154bf25af..ba5b3f8d9703 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; - hash = "sha256-1HrdnZcPIkrMd+/lohZIbUBFHivCG4W/7FOX1CD9oYo="; + hash = "sha256-eADziDAe64FHsL5V6Pp8vXUhBmpIoGEVzA6tnwzqGIo="; }; nativeBuildInputs = [ From 7d5f01d8b13cad48e0564cac3cea7d687f6bddf4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:36:45 +0000 Subject: [PATCH 1875/2279] =?UTF-8?q?evolution:=203.58.0=20=E2=86=92=203.5?= =?UTF-8?q?8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.58.0...3.58.1 Changelog-reviewed-by: Jan Tojnar --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 98adbb9c6a3b..ad0b17c1d5df 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.58.0"; + version = "3.58.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Nz/hdFow9x8RN1XvKvwwp6F2imA2GVpk2wUplacaGr8="; + hash = "sha256-A9jQzM0QKqGnPDHZ4vN0yz24Os3fwRJskYavY9psvsw="; }; nativeBuildInputs = [ From 0be75b3b6b1a4cd595b2359457eff87d61fab543 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:37:04 +0000 Subject: [PATCH 1876/2279] =?UTF-8?q?nautilus:=2049.0=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/nautilus/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/na/nautilus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index e969fca3aaf2..8d3924e4ee8d 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "49.0"; + version = "49.1"; outputs = [ "out" @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-sxKScENPx8Uz+X7X+MRCcE8AoC0nopCALY0Wq0Kha/g="; + hash = "sha256-rdKg5BD9ItooUd3QxbPSLJ6djDMRFRHzNpYeO0YbU14="; }; patches = [ From 62dab70a8a60e0128c65bb6c30b895457bfe1a97 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:37:05 +0000 Subject: [PATCH 1877/2279] =?UTF-8?q?gnome-shell:=2049.0=20=E2=86=92=2049.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index bccf4720c97a..6be3cf5d3bc4 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "49.0"; + version = "49.1"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-/whrnDIYCZQw2RhSQ7Z3ajaiy3vLcFqYxhLyz0dCcIo="; + hash = "sha256-tC0HMYnkAK+U/Dna66vlo2e7D2z3hOxc6VFodZXvvOs="; }; patches = [ From 713e0df3779c072a5fffd9179816639a1223a67d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:37:14 +0000 Subject: [PATCH 1878/2279] =?UTF-8?q?libshumate:=201.5.0.1=20=E2=86=92=201?= =?UTF-8?q?.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.5.0.1...1.5.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/li/libshumate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index 995772bcd923..e65a9f14dc52 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.5.0.1"; + version = "1.5.1"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-qW/nqWN86BnaEh6D4m61M83HjBRvpRqWC73K1VdAnlg="; + hash = "sha256-2q34twATQ4jH6TPgtiNYaqp/L76LOmJZOHUTMDuYduY="; }; depsBuildBuild = [ From cfef993ec6088385850f97bbc02224bef794dab2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:38:18 +0000 Subject: [PATCH 1879/2279] =?UTF-8?q?gom:=200.5.4=20=E2=86=92=200.5.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gom/-/compare/0.5.4...0.5.5 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/go/gom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix index 68bd96cde8cf..d54564dcadc2 100644 --- a/pkgs/by-name/go/gom/package.nix +++ b/pkgs/by-name/go/gom/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gom"; - version = "0.5.4"; + version = "0.5.5"; outputs = [ "out" @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz"; - sha256 = "V7qAb+CAqTfVZkF40hutdlOyxWHqEoGHp7ELwXYrf2U="; + sha256 = "rWHwWvIxenqxdx/PqBaYn7ujsYlX0uC13t6e9F8JtTQ="; }; patches = [ From fb4672baa20082d7a72c5f168a105302007666f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:38:19 +0000 Subject: [PATCH 1880/2279] =?UTF-8?q?vte:=200.82.0=20=E2=86=92=200.82.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.82.0...0.82.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/vt/vte/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index 87e264851ba7..6dc2f3aaecba 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.82.0"; + version = "0.82.1"; outputs = [ "out" @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-sHGNsyVHMHAbQ79eETy/jNssFHFdMu4einB9xutwU18="; + hash = "sha256-eTdtcEAtJx4tOEJEGOGupyNXk00nLjIeOQa3Fwanjjo="; }; patches = [ From 1dd0abc625955fa945c013a98f8d0d7022a9db39 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:38:30 +0000 Subject: [PATCH 1881/2279] =?UTF-8?q?localsearch:=203.10.0=20=E2=86=92=203?= =?UTF-8?q?.10.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/localsearch/-/compare/3.10.0...3.10.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/lo/localsearch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index 4366c8073d33..a234bedc5f7f 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "localsearch"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz"; - hash = "sha256-WNZupEruFknI2YH5NDc7g+GrSkoahLoDBPWvOR5+AIA="; + hash = "sha256-XK7zgWDgSV2tj9FVWmmZ9NTVNtnX66GP1J7BdzOMXcI="; }; patches = [ From e3e23f101349bc2dda1ededf9fe9d3009f71dfa7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:38:39 +0000 Subject: [PATCH 1882/2279] =?UTF-8?q?mutter:=2049.0=20=E2=86=92=2049.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/49.0...49.1.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/mu/mutter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index af9e46e70de3..105fb476ba33 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "49.0"; + version = "49.1.1"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-8Q727SA2ZzcwRhQz4R4L46vHRg0yOz6HCTtsOXLBYzU="; + hash = "sha256-EykM/0l0EA4r/XsPrlwG+X+nXSH9xA8fXn5ILzPL0Cc="; }; mesonFlags = [ From 248141b507aac252dce2c5e5eb972625aa3c0e2e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:38:45 +0000 Subject: [PATCH 1883/2279] =?UTF-8?q?gdm:=2049.0.1=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/49.0.1...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gd/gdm/fix-paths.patch | 12 ++++-------- pkgs/by-name/gd/gdm/package.nix | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch index bd4e92e4aadb..2de3f651a327 100644 --- a/pkgs/by-name/gd/gdm/fix-paths.patch +++ b/pkgs/by-name/gd/gdm/fix-paths.patch @@ -1,13 +1,9 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 513b9733d..0c1c8007f 100644 +index ad2e65cf7..61fb78db8 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration { - const char *session_type; - } display_server_configuration[] = { - #ifdef ENABLE_WAYLAND_SUPPORT -- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, -+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" }, +@@ -272,7 +272,7 @@ struct GdmDisplayServerConfiguration { + { "wayland", GDM_KEY_WAYLAND_ENABLE, NULL, "wayland" }, #endif #ifdef ENABLE_X11_SUPPORT - { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, @@ -16,7 +12,7 @@ index 513b9733d..0c1c8007f 100644 { NULL, NULL, NULL }, }; diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index 9568e963f..b1bc8800a 100644 +index 457dcf88d..a71b89ba8 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -154,7 +154,7 @@ plymouth_is_running (void) diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 128d00c7bec8..b47e16314df3 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -27,7 +27,6 @@ plymouth, coreutils, xorgserver, - xwayland, dbus, nixos-icons, runCommand, @@ -44,7 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "49.0.1"; + version = "49.1"; outputs = [ "out" @@ -53,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-GbpC+GkqC/OlK9WX4amrKMnGpRiWpQgjBOX6GlGE2Bo="; + hash = "sha256-adpdExncLGit9c05StWb7Jm7LiTyhARaG7Ss13QAROU="; }; mesonFlags = [ @@ -112,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { coreutils plymouth xorgserver - xwayland dbus ; }) From 480fb5479f8a1898e878e4f5cc65295ce08ba3bb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:38:46 +0000 Subject: [PATCH 1884/2279] =?UTF-8?q?glycin-loaders:=202.0.2=20=E2=86=92?= =?UTF-8?q?=202.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.2...2.0.4 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gl/glycin-loaders/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 3c6ff4114f26..97a6e6374acd 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZYAOhWs37byNXDM1rVNBUFgc4/LwhFTdAwKiZHC9nRM="; + hash = "sha256-w4FHIA9YBKJXNBZ46LzjFLz/eadvmGqMMnnZ2Ej4v/c="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "glycin-loaders-deps-${finalAttrs.version}"; - hash = "sha256-9cpvRNqymxkOi6L5oZDGyvB68rzEt97qB8uqzhUYsao="; + hash = "sha256-r0TmBggpLG3wwZSWJr1bwyG5RHP/nvDGEJ/JFVAzEFA="; dontConfigure = true; }; From 7e1ef1c8938b8004c6c4bf6afc83cb6145060370 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:39:06 +0000 Subject: [PATCH 1885/2279] =?UTF-8?q?evolution-data-server:=203.58.0=20?= =?UTF-8?q?=E2=86=92=203.58.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.58.0...3.58.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index eed95cc14c07..42bd77f70832 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.58.0"; + version = "3.58.1"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-orWguNsRtyjtwdbxwincJxGWK3qHwDhCIdrI2WAAzvc="; + hash = "sha256-qRSSiBTviH8Jebp46o17zJj5bPB8u3CwBRmAvZDsNfA="; }; patches = [ From 63074f1ddb3498ba3e6c390fbc3bb07dd6216080 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:39:22 +0000 Subject: [PATCH 1886/2279] =?UTF-8?q?gnome-settings-daemon:=2049.0=20?= =?UTF-8?q?=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/49.0...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-settings-daemon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index 0a00160237ac..dc464bb6fb39 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-settings-daemon"; - version = "49.0"; + version = "49.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-IBvUrAxHFHkYLvN15ZneYApRo8CwSehXFaIkRx5bMiY="; + hash = "sha256-KplX/E+Rw7kSe0lIQXm+9IUSDZwcII5E1E5qdG5swcE="; }; patches = [ From 274c2018d9c4f78f2b20b751b976e10d1fd2e89a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:39:24 +0000 Subject: [PATCH 1887/2279] =?UTF-8?q?gnome-online-accounts:=203.56.0=20?= =?UTF-8?q?=E2=86=92=203.56.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/compare/3.56.0...3.56.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gn/gnome-online-accounts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index ced147c71e03..231cfb389e9a 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.56.0"; + version = "3.56.1"; outputs = [ "out" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-MdagF9Fxsn/5NkeP2weSogDIFC6vwYslUHPOnftBdXI="; + hash = "sha256-ZEWTYKNTHrft7i4DvVq3fslfEFG1aeEaR5tPlPQFxT8="; }; mesonFlags = [ From f2d8fa29653eb4cecf9c90c945d62c2c07dd88a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:39:36 +0000 Subject: [PATCH 1888/2279] =?UTF-8?q?libglycin:=202.0.2=20=E2=86=92=202.0.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.2...2.0.4 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/li/libglycin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 0d99435f4056..53ec905db98e 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -27,14 +27,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "2.0.2"; + version = "2.0.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "glycin"; tag = finalAttrs.version; - hash = "sha256-HLvdDQ1rXm2JTUwot07qOIzNaK/sK6zLswips8oIp9c="; + hash = "sha256-KPhyL7uP621pxxDGlzbF9WG7A0AcyaS95VstfN/FoQ8="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-IaiQ1OdmlBcIYyruG6p/rrOxq7x8csF/W3ONerh2lAA="; + hash = "sha256-bYUA8WrCWGTs5P1zT7zMSESkHhsyfBBRUvM2D63OBbA="; }; buildInputs = [ From 141dd8dcaeb6833deae29f8488c2ef0ebb8ad028 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 02:39:41 +0000 Subject: [PATCH 1889/2279] =?UTF-8?q?libpanel:=201.10.2=20=E2=86=92=201.10?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libpanel/-/compare/1.10.2...1.10.3 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/li/libpanel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix index 933bdd7a3a1f..9cf2460f3f25 100644 --- a/pkgs/by-name/li/libpanel/package.nix +++ b/pkgs/by-name/li/libpanel/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpanel"; - version = "1.10.2"; + version = "1.10.3"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz"; - hash = "sha256-zBLo4Q8eSXe9Eq0/+u3NUqwXY0i0r2/l2mhrljJb/gE="; + hash = "sha256-QqAbr4uURA8ZTqg0KyRL1pkt+wJMoxYMlHf/SY7DorY="; }; strictDeps = true; From 82aa30fde2fd5984a2e5b0a16413c46a71a91438 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 9 Nov 2025 04:44:52 +0000 Subject: [PATCH 1890/2279] linuxPackages.rtl8814au: mark broken on kernel versions < 5.2 and > 6.14 - On Hydra, builds for kernel version 5_10, 5_15, 6_1, 6_6 and 6_12 succeed, but the build for the latest latest kernel version 6_17 is failing. - The upstream provider of the driver only supports kernel versions between version 5.2 and 6.14, inclusive. This is partly because a driver has been up-streamed into the kernel, so the package is not needed for recent drivers. [Reference](https://github.com/morrownr/8814au.) - Because of this, mark the driver as broken on the relevant kernel versions. --- pkgs/os-specific/linux/rtl8814au/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index dd8968e0f541..cc1e5f91b398 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation { homepage = "https://github.com/morrownr/8814au"; license = licenses.gpl2Only; maintainers = [ maintainers.lassulus ]; + broken = kernel.kernelOlder "5.2" || kernel.kernelAtLeast "6.15"; }; } From b66c90b658ad6276bea3e5f54b65fa5e590d7c93 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 9 Nov 2025 12:38:50 +0900 Subject: [PATCH 1891/2279] plemoljp, plemoljp-{nf,hs}: refine updateScript * Share `version` and `meta` in font variants While fonts have fewer restrictions than executables, the motivation is essentially the same as 900ebdb9e482bdfc63f8231d93a058d4836e7ae9. There is no reason to update these packages individually. * Add `updateScript` Upstream used `-beta*` tags for the 2.0.0 release. The script now only targets tags for stable versions. * Prefer `finalAttrs` over `rec`' I included this modernization in the same commit because it relates to the version reference. --- pkgs/by-name/pl/plemoljp-hs/package.nix | 19 +++++++++---------- pkgs/by-name/pl/plemoljp-nf/package.nix | 19 +++++++++---------- pkgs/by-name/pl/plemoljp/package.nix | 13 ++++++++++--- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index edd261d80865..d7be0af69b5b 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -1,15 +1,18 @@ { - lib, stdenvNoCC, fetchzip, + plemoljp, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp-hs"; - version = "3.0.0"; + + # plemoljp's updateScript also updates this version. + # nixpkgs-update: no auto update + inherit (plemoljp) version; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_HS_v${finalAttrs.version}.zip"; hash = "sha256-V21T8ktNZE4nq3SH6aN9iIJHmGTkZuMsvT84yHbwSqI="; }; @@ -24,11 +27,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = { + meta = plemoljp.meta // { description = "Composite font of IBM Plex Mono, IBM Plex Sans JP and hidden full-width space"; - homepage = "https://github.com/yuru7/PlemolJP"; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index b54b18dada26..c37d584f9292 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -1,15 +1,18 @@ { - lib, stdenvNoCC, fetchzip, + plemoljp, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp-nf"; - version = "3.0.0"; + + # plemoljp's updateScript also updates this version. + # nixpkgs-update: no auto update + inherit (plemoljp) version; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_NF_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_NF_v${finalAttrs.version}.zip"; hash = "sha256-m8zR9ySl88DnVzG4fKJtc9WjSLDMLU4YDX+KXhcP2WU="; }; @@ -22,11 +25,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = { + meta = plemoljp.meta // { description = "Composite font of IBM Plex Mono, IBM Plex Sans JP and nerd-fonts"; - homepage = "https://github.com/yuru7/PlemolJP"; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ kachick ]; }; -} +}) diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 4aee3298f8b8..3899f7448193 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -2,14 +2,15 @@ lib, stdenvNoCC, fetchzip, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plemoljp"; version = "3.0.0"; src = fetchzip { - url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_v${version}.zip"; + url = "https://github.com/yuru7/PlemolJP/releases/download/v${finalAttrs.version}/PlemolJP_v${finalAttrs.version}.zip"; hash = "sha256-R4zC1pnM72FVqBQ5d03z8vyVccsM163BE15m2hdEnSA="; }; @@ -24,6 +25,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; + }; + meta = { description = "Composite font of IBM Plex Mono and IBM Plex Sans JP"; homepage = "https://github.com/yuru7/PlemolJP"; @@ -31,4 +38,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ kachick ]; }; -} +}) From 6ef8723d29ebd80d79477f619f164d2db6c651d0 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 9 Nov 2025 14:05:14 +0900 Subject: [PATCH 1892/2279] ox: remove kachick from maintainers --- pkgs/by-name/ox/ox/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index 25faedde1b69..d9252d2d35a0 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ moni - kachick ]; mainProgram = "ox"; }; From e2bef78bfecfd3bad84a93dab2ee6c1fbb507a10 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 9 Nov 2025 14:06:12 +0900 Subject: [PATCH 1893/2279] morewaita-icon-theme: remove kachick from maintainers The temporary workarounds were removed in 5e0368d0ce41a10c1f2ca7b4474745f6775c8835. --- pkgs/by-name/mo/morewaita-icon-theme/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 409e80bb3d52..b587cd65ee6f 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -45,7 +45,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pkosel - kachick ]; }; }) From 9047f20197ed658976dd46626dbe613a031f6d46 Mon Sep 17 00:00:00 2001 From: Tomas Leypold Date: Sat, 8 Nov 2025 17:21:18 +0100 Subject: [PATCH 1894/2279] mpv: backport fix high CPU usage with Wayland clipboard --- pkgs/applications/video/mpv/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0ea229fa5f45..8636de913fbf 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -121,6 +121,20 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9.patch"; hash = "sha256-ANNoTtIJBARHbm5IgrE0eEZyzmNhOnbVgve7iqCBzQg="; }) + # clipboard-wayland: prevent reading from hung up fd: + # https://github.com/mpv-player/mpv/pull/16140 + (fetchpatch { + name = "clipboard-wayland-prevent-hung-up-fd.patch"; + url = "https://github.com/mpv-player/mpv/commit/d20ded876d27497d3fe6a9494add8106b507a45c.patch"; + hash = "sha256-sll4BpeVW6OA+/vbH7ZfIh0/vePfPEX87vzUu/GCj44="; + }) + # clipboard-wayland: read already sent data when the fd is hung up: + # https://github.com/mpv-player/mpv/pull/16236 + (fetchpatch { + name = "clipboard-wayland-read-sent-data-on-hangup.patch"; + url = "https://github.com/mpv-player/mpv/commit/896b3400f3cad286533dbb9cc3658ce18ed9966c.patch"; + hash = "sha256-GU0VdYC/Q0RCS/I2h4gBVNhScDLSAB2KxN3Ca6CGBMM="; + }) ]; postPatch = lib.concatStringsSep "\n" [ From ff5c8584d0faedb0614451b553ab22ffe92d0c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sun, 9 Nov 2025 12:21:20 +0700 Subject: [PATCH 1895/2279] =?UTF-8?q?h2o:=202.3.0-rolling-2025-10-17=20?= =?UTF-8?q?=E2=86=92=202.3.0-rolling-2025-11-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/h2/h2o/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index a73f5a770eef..e168cd2e9e43 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2025-10-17"; + version = "2.3.0-rolling-2025-11-08"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "562d7bd089173da03e71bc4c0824468751c5b411"; - hash = "sha256-/P4S8ng1kQPPHNSNuqgLasu2c2Y9BD2Y9v0hlMiPCIM="; + rev = "607b732b668a06826709c0f72bd4fd680f2372bc"; + hash = "sha256-JdtBedmz84LnlePKif3vnq5YbTAIumvzPcjlJ/Br5hQ="; }; outputs = [ From 79fcd29323b1b01f78b5b3a70adcceec55797848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 Nov 2025 21:21:22 -0800 Subject: [PATCH 1896/2279] python3Packages.pysaml2: 7.5.2 -> 7.5.4 Diff: https://github.com/IdentityPython/pysaml2/compare/v7.5.2...v7.5.4 Changelog: https://github.com/IdentityPython/pysaml2/blob/v7.5.4/CHANGELOG.md --- .../python-modules/pysaml2/default.nix | 23 +- .../replace-pyopenssl-with-cryptography.patch | 334 ++++++++++++++++++ 2 files changed, 341 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 188bf2e3f80e..9d355760333c 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -4,16 +4,12 @@ cryptography, defusedxml, fetchFromGitHub, - fetchpatch, paste, poetry-core, pyasn1, pymongo, - pyopenssl, pytestCheckHook, python-dateutil, - pythonOlder, - pytz, repoze-who, requests, responses, @@ -26,14 +22,14 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "7.5.2"; + version = "7.5.4"; pyproject = true; src = fetchFromGitHub { owner = "IdentityPython"; repo = "pysaml2"; tag = "v${version}"; - hash = "sha256-2mvAXTruZqoSBUgfT2VEAnWQXVdviG0e49y7LPK5x00="; + hash = "sha256-DDs0jWONZ78995p7bbyIyZTWHnCI93SsbECqyeo0se8="; }; patches = [ @@ -41,10 +37,8 @@ buildPythonPackage rec { inherit xmlsec; }) # Replaces usages of deprecated/removed pyopenssl APIs - (fetchpatch { - url = "https://github.com/IdentityPython/pysaml2/pull/977/commits/930a652a240c8cd1489429a7d70cf5fa7ef1606a.patch"; - hash = "sha256-kBNvGk5pwVmpW1wsIWVH9wapu6kjFavaTt4e3Llaw2c="; - }) + # https://github.com/IdentityPython/pysaml2/pull/977 + ./replace-pyopenssl-with-cryptography.patch ]; postPatch = '' @@ -54,18 +48,14 @@ buildPythonPackage rec { pythonRelaxDeps = [ "xmlschema" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ cryptography defusedxml - pyopenssl - python-dateutil - pytz requests - setuptools xmlschema ]; @@ -81,6 +71,7 @@ buildPythonPackage rec { pyasn1 pymongo pytestCheckHook + python-dateutil responses ]; diff --git a/pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch b/pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch new file mode 100644 index 000000000000..3453f3a68164 --- /dev/null +++ b/pkgs/development/python-modules/pysaml2/replace-pyopenssl-with-cryptography.patch @@ -0,0 +1,334 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 87068b18..03f30491 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -22,8 +22,6 @@ requires-python = ">= 3.9" + dependencies = [ + "cryptography >=3.1", + "defusedxml", +- "pyopenssl <24.3.0", +- "python-dateutil", + "requests >=2.0.0,<3.0.0", # ^2 means compatible with 2.x + "xmlschema >=2.0.0,<3.0.0" + ] +diff --git a/src/saml2/cert.py b/src/saml2/cert.py +index e90651e4..926aec8a 100644 +--- a/src/saml2/cert.py ++++ b/src/saml2/cert.py +@@ -3,11 +3,13 @@ __author__ = "haho0032" + import base64 + from os import remove + from os.path import join +-from datetime import datetime +-from datetime import timezone ++from datetime import datetime, timedelta, timezone + +-from OpenSSL import crypto +-import dateutil.parser ++from cryptography import x509 ++from cryptography.exceptions import InvalidSignature ++from cryptography.hazmat.primitives import hashes, serialization ++from cryptography.hazmat.primitives.asymmetric import rsa ++from cryptography.x509.oid import NameOID + + import saml2.cryptography.pki + +@@ -36,7 +38,6 @@ class OpenSSLWrapper: + valid_to=315360000, + sn=1, + key_length=1024, +- hash_alg="sha256", + write_to_file=False, + cert_dir="", + cipher_passphrase=None, +@@ -87,8 +88,6 @@ class OpenSSLWrapper: + is 1. + :param key_length: Length of the key to be generated. Defaults + to 1024. +- :param hash_alg: Hash algorithm to use for the key. Default +- is sha256. + :param write_to_file: True if you want to write the certificate + to a file. The method will then return + a tuple with path to certificate file and +@@ -131,49 +130,68 @@ class OpenSSLWrapper: + k_f = join(cert_dir, key_file) + + # create a key pair +- k = crypto.PKey() +- k.generate_key(crypto.TYPE_RSA, key_length) ++ k = rsa.generate_private_key( ++ public_exponent=65537, ++ key_size=key_length, ++ ) + + # create a self-signed cert +- cert = crypto.X509() ++ builder = x509.CertificateBuilder() + + if request: +- cert = crypto.X509Req() ++ builder = x509.CertificateSigningRequestBuilder() + + if len(cert_info["country_code"]) != 2: + raise WrongInput("Country code must be two letters!") +- cert.get_subject().C = cert_info["country_code"] +- cert.get_subject().ST = cert_info["state"] +- cert.get_subject().L = cert_info["city"] +- cert.get_subject().O = cert_info["organization"] # noqa: E741 +- cert.get_subject().OU = cert_info["organization_unit"] +- cert.get_subject().CN = cn ++ subject_name = x509.Name([ ++ x509.NameAttribute(NameOID.COUNTRY_NAME, ++ cert_info["country_code"]), ++ x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, ++ cert_info["state"]), ++ x509.NameAttribute(NameOID.LOCALITY_NAME, ++ cert_info["city"]), ++ x509.NameAttribute(NameOID.ORGANIZATION_NAME, ++ cert_info["organization"]), ++ x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, ++ cert_info["organization_unit"]), ++ x509.NameAttribute(NameOID.COMMON_NAME, cn), ++ ]) ++ builder = builder.subject_name(subject_name) + if not request: +- cert.set_serial_number(sn) +- cert.gmtime_adj_notBefore(valid_from) # Valid before present time +- cert.gmtime_adj_notAfter(valid_to) # 3 650 days +- cert.set_issuer(cert.get_subject()) +- cert.set_pubkey(k) +- cert.sign(k, hash_alg) ++ now = datetime.now(timezone.utc) ++ builder = builder.serial_number( ++ sn, ++ ).not_valid_before( ++ now + timedelta(seconds=valid_from), ++ ).not_valid_after( ++ now + timedelta(seconds=valid_to), ++ ).issuer_name( ++ subject_name, ++ ).public_key( ++ k.public_key(), ++ ) ++ cert = builder.sign(k, hashes.SHA256()) + + try: +- if request: +- tmp_cert = crypto.dump_certificate_request(crypto.FILETYPE_PEM, cert) +- else: +- tmp_cert = crypto.dump_certificate(crypto.FILETYPE_PEM, cert) +- tmp_key = None ++ tmp_cert = cert.public_bytes(serialization.Encoding.PEM) ++ key_encryption = None + if cipher_passphrase is not None: + passphrase = cipher_passphrase["passphrase"] + if isinstance(cipher_passphrase["passphrase"], str): + passphrase = passphrase.encode("utf-8") +- tmp_key = crypto.dump_privatekey(crypto.FILETYPE_PEM, k, cipher_passphrase["cipher"], passphrase) ++ key_encryption = serialization.BestAvailableEncryption(passphrase) + else: +- tmp_key = crypto.dump_privatekey(crypto.FILETYPE_PEM, k) ++ key_encryption = serialization.NoEncryption() ++ tmp_key = k.private_bytes( ++ encoding=serialization.Encoding.PEM, ++ format=serialization.PrivateFormat.TraditionalOpenSSL, ++ encryption_algorithm=key_encryption, ++ ) + if write_to_file: +- with open(c_f, "w") as fc: +- fc.write(tmp_cert.decode("utf-8")) +- with open(k_f, "w") as fk: +- fk.write(tmp_key.decode("utf-8")) ++ with open(c_f, "wb") as fc: ++ fc.write(tmp_cert) ++ with open(k_f, "wb") as fk: ++ fk.write(tmp_key) + return c_f, k_f + return tmp_cert, tmp_key + except Exception as ex: +@@ -198,7 +216,6 @@ class OpenSSLWrapper: + sign_cert_str, + sign_key_str, + request_cert_str, +- hash_alg="sha256", + valid_from=0, + valid_to=315360000, + sn=1, +@@ -222,8 +239,6 @@ class OpenSSLWrapper: + the requested certificate. If you only have + a file use the method read_str_from_file + to get a string representation. +- :param hash_alg: Hash algorithm to use for the key. Default +- is sha256. + :param valid_from: When the certificate starts to be valid. + Amount of seconds from when the + certificate is generated. +@@ -237,27 +252,29 @@ class OpenSSLWrapper: + :return: String representation of the signed + certificate. + """ +- ca_cert = crypto.load_certificate(crypto.FILETYPE_PEM, sign_cert_str) +- ca_key = None +- if passphrase is not None: +- ca_key = crypto.load_privatekey(crypto.FILETYPE_PEM, sign_key_str, passphrase) +- else: +- ca_key = crypto.load_privatekey(crypto.FILETYPE_PEM, sign_key_str) +- req_cert = crypto.load_certificate_request(crypto.FILETYPE_PEM, request_cert_str) +- +- cert = crypto.X509() +- cert.set_subject(req_cert.get_subject()) +- cert.set_serial_number(sn) +- cert.gmtime_adj_notBefore(valid_from) +- cert.gmtime_adj_notAfter(valid_to) +- cert.set_issuer(ca_cert.get_subject()) +- cert.set_pubkey(req_cert.get_pubkey()) +- cert.sign(ca_key, hash_alg) +- +- cert_dump = crypto.dump_certificate(crypto.FILETYPE_PEM, cert) +- if isinstance(cert_dump, str): +- return cert_dump +- return cert_dump.decode("utf-8") ++ if isinstance(sign_cert_str, str): ++ sign_cert_str = sign_cert_str.encode("utf-8") ++ ca_cert = x509.load_pem_x509_certificate(sign_cert_str) ++ ca_key = serialization.load_pem_private_key( ++ sign_key_str, password=passphrase) ++ req_cert = x509.load_pem_x509_csr(request_cert_str) ++ ++ now = datetime.now(timezone.utc) ++ cert = x509.CertificateBuilder().subject_name( ++ req_cert.subject, ++ ).serial_number( ++ sn, ++ ).not_valid_before( ++ now + timedelta(seconds=valid_from), ++ ).not_valid_after( ++ now + timedelta(seconds=valid_to), ++ ).issuer_name( ++ ca_cert.subject, ++ ).public_key( ++ req_cert.public_key(), ++ ).sign(ca_key, hashes.SHA256()) ++ ++ return cert.public_bytes(serialization.Encoding.PEM).decode("utf-8") + + def verify_chain(self, cert_chain_str_list, cert_str): + """ +@@ -276,13 +293,6 @@ class OpenSSLWrapper: + cert_str = tmp_cert_str + return (True, "Signed certificate is valid and correctly signed by CA " "certificate.") + +- def certificate_not_valid_yet(self, cert): +- starts_to_be_valid = dateutil.parser.parse(cert.get_notBefore()) +- now = datetime.now(timezone.utc) +- if starts_to_be_valid < now: +- return False +- return True +- + def verify(self, signing_cert_str, cert_str): + """ + Verifies if a certificate is valid and signed by a given certificate. +@@ -303,34 +313,34 @@ class OpenSSLWrapper: + Message = Why the validation failed. + """ + try: +- ca_cert = crypto.load_certificate(crypto.FILETYPE_PEM, signing_cert_str) +- cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_str) +- +- if self.certificate_not_valid_yet(ca_cert): ++ if isinstance(signing_cert_str, str): ++ signing_cert_str = signing_cert_str.encode("utf-8") ++ if isinstance(cert_str, str): ++ cert_str = cert_str.encode("utf-8") ++ ca_cert = x509.load_pem_x509_certificate(signing_cert_str) ++ cert = x509.load_pem_x509_certificate(cert_str) ++ now = datetime.now(timezone.utc) ++ ++ if ca_cert.not_valid_before_utc >= now: + return False, "CA certificate is not valid yet." + +- if ca_cert.has_expired() == 1: ++ if ca_cert.not_valid_after_utc < now: + return False, "CA certificate is expired." + +- if cert.has_expired() == 1: ++ if cert.not_valid_after_utc < now: + return False, "The signed certificate is expired." + +- if self.certificate_not_valid_yet(cert): ++ if cert.not_valid_before_utc >= now: + return False, "The signed certificate is not valid yet." + +- if ca_cert.get_subject().CN == cert.get_subject().CN: ++ if ca_cert.subject.get_attributes_for_oid(NameOID.COMMON_NAME) == \ ++ cert.subject.get_attributes_for_oid(NameOID.COMMON_NAME): + return False, ("CN may not be equal for CA certificate and the " "signed certificate.") + +- cert_algorithm = cert.get_signature_algorithm() +- cert_algorithm = cert_algorithm.decode("ascii") +- cert_str = cert_str.encode("ascii") +- +- cert_crypto = saml2.cryptography.pki.load_pem_x509_certificate(cert_str) +- + try: +- crypto.verify(ca_cert, cert_crypto.signature, cert_crypto.tbs_certificate_bytes, cert_algorithm) ++ cert.verify_directly_issued_by(ca_cert) + return True, "Signed certificate is valid and correctly signed by CA certificate." +- except crypto.Error as e: ++ except (ValueError, TypeError, InvalidSignature) as e: + return False, f"Certificate is incorrectly signed: {str(e)}" + except Exception as e: + return False, f"Certificate is not valid for an unknown reason. {str(e)}" +@@ -352,8 +362,14 @@ def read_cert_from_file(cert_file, cert_type="pem"): + data = fp.read() + + try: +- cert = saml2.cryptography.pki.load_x509_certificate(data, cert_type) +- pem_data = saml2.cryptography.pki.get_public_bytes_from_cert(cert) ++ cert = None ++ if cert_type == "pem": ++ cert = x509.load_pem_x509_certificate(data) ++ elif cert_type == "der": ++ cert = x509.load_der_x509_certificate(data) ++ else: ++ raise ValueError(f"cert-type {cert_type} not supported") ++ pem_data = cert.public_bytes(serialization.Encoding.PEM).decode("utf-8") + except Exception as e: + raise CertificateError(e) + +diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py +index 738ac04b..60c83718 100644 +--- a/src/saml2/sigver.py ++++ b/src/saml2/sigver.py +@@ -18,8 +18,9 @@ from time import mktime + from urllib import parse + from uuid import uuid4 as gen_random_key + +-from OpenSSL import crypto +-import dateutil ++from urllib import parse ++ ++from cryptography import x509 + + from saml2 import ExtensionElement + from saml2 import SamlBase +@@ -373,14 +374,14 @@ def active_cert(key): + """ + try: + cert_str = pem_format(key) +- cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_str) ++ cert = x509.load_pem_x509_certificate(cert_str) + except AttributeError: + return False + +- now = datetime.now(timezone.utc) +- valid_from = dateutil.parser.parse(cert.get_notBefore()) +- valid_to = dateutil.parser.parse(cert.get_notAfter()) +- active = not cert.has_expired() and valid_from <= now < valid_to ++ now = datetime.datetime.now(datetime.timezone.utc) ++ valid_from = cert.not_valid_before_utc ++ valid_to = cert.not_valid_after_utc ++ active = valid_from <= now < valid_to + return active + + From 889e2ca41f944b4b7961ff6f057baa8d7061b09d Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Sun, 9 Nov 2025 00:31:02 -0500 Subject: [PATCH 1897/2279] orjail: remove Maintainer @onny gave the thumbs up to the suggestion of removing since the project seems unmaintained and the build is broken on the latest firejail release: https://github.com/NixOS/nixpkgs/pull/429616#issuecomment-3254177901 --- .../manual/release-notes/rl-2511.section.md | 2 + pkgs/by-name/or/orjail/package.nix | 57 ------------------- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 pkgs/by-name/or/orjail/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 65001eb9b172..96659c6cbdd0 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -281,6 +281,8 @@ - `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream. +- `orjail` package has been removed as it is broken by the latest firejail release and seems unmaintained. + - `teleport` has been upgraded from major version 17 to major version 18. Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/) and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325). diff --git a/pkgs/by-name/or/orjail/package.nix b/pkgs/by-name/or/orjail/package.nix deleted file mode 100644 index 52e189b131d4..000000000000 --- a/pkgs/by-name/or/orjail/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - tor, - firejail, - iptables, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "orjail"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "orjail"; - repo = "orjail"; - rev = "v${version}"; - sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - postPatch = '' - patchShebangs make-helper.bsh - mkdir bin - mv usr/sbin/orjail bin/orjail - rm -r usr - ''; - - makeFlags = [ - "DESTDIR=${placeholder "out"}" - ]; - - postInstall = '' - # Specify binary paths: tor, firejail, iptables - # mktemp fails with /tmp path prefix, will work without it anyway - # https://github.com/orjail/orjail/issues/78 - # firejail will fail reading /etc/hosts, therefore remove --hostname arg - # https://github.com/netblue30/firejail/issues/2758 - substituteInPlace $out/bin/orjail \ - --replace ''$'TORBIN=\n' ''$'TORBIN=${tor}/bin/tor\n' \ - --replace ''$'FIREJAILBIN=\n' ''$'FIREJAILBIN=${firejail}/bin/firejail\n' \ - --replace 'iptables -' '${iptables}/bin/iptables -' \ - --replace 'mktemp /tmp/' 'mktemp ' \ - --replace '--hostname=host ' "" - ''; - - meta = with lib; { - description = "Force programs to exclusively use tor network"; - mainProgram = "orjail"; - homepage = "https://github.com/orjail/orjail"; - license = licenses.wtfpl; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - }; -} From 1c8425f8fd7e5e773cf86b30d74db5f9efffa227 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 05:58:12 +0000 Subject: [PATCH 1898/2279] terraform-providers.opentelekomcloud_opentelekomcloud: 1.36.51 -> 1.36.52 --- .../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 306afcfc4a30..49b71983d706 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1030,13 +1030,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-VrhloC601pG6jcBbrKc/ldhtWwzJzhkLdHj1/UPOUqk=", + "hash": "sha256-gwHugaLKjLIp7LHHbo4F25P3ncgjGavKYcIfSjXs7KM=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.51", + "rev": "v1.36.52", "spdx": "MPL-2.0", - "vendorHash": "sha256-57F7YS7r+/O8qSWfNhrT/5XAaq7CfX7RchY/45WBauw=" + "vendorHash": "sha256-0RE5ZqB16JPoFPZYgwupNyYZiXQnC3Sq4f+CLNjD6BM=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", From 89f7581b9e4c739a3d4a95559981112cd469ac11 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Sat, 8 Nov 2025 20:16:29 -0700 Subject: [PATCH 1899/2279] swiftPackages.swift: ignore unguarded-availability error I couldn't figure out how to get CMake to set the correct target, as it insisted on using OS X 10.9 no matter what I set. --- pkgs/development/compilers/swift/compiler/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index c71a22589d9f..5bb32d8496cd 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -523,8 +523,10 @@ stdenv.mkDerivation { # Add appleSwiftCore to the search paths. Adding the whole SDK results in build failures. OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE" OLD_NIX_LDFLAGS="$NIX_LDFLAGS" + OLD_NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE" export NIX_SWIFTFLAGS_COMPILE=" -I ${appleSwiftCore}/lib/swift" export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift" + export NIX_CFLAGS_COMPILE+=" -Wno-error=unguarded-availability" '' + '' @@ -568,6 +570,7 @@ stdenv.mkDerivation { # Restore search paths to remove appleSwiftCore. export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" + export NIX_CFLAGS_COMPILE="$OLD_NIX_CFLAGS_COMPILE" '' + '' From e21fb87fdfebbba8571d570f85d5ef42aab1657c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 06:45:01 +0000 Subject: [PATCH 1900/2279] cloud-hypervisor: 48.0 -> 49.0 --- pkgs/by-name/cl/cloud-hypervisor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index 8557b1659f40..61934b2a2bb4 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "48.0"; + version = "49.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = "cloud-hypervisor"; rev = "v${version}"; - hash = "sha256-cfS3sO1GQIxF9UlzKP9iE/UuJwGVIkNBN7GDF/ltn4Q="; + hash = "sha256-bPPs/4XMcvOH4BGfQrjQdvgjGWae4UEZjzPKjalDN3w="; }; - cargoHash = "sha256-QvW1loljt9KzY0h2pG7n9NCkJJOYr/VxftsyqATm9DA="; + cargoHash = "sha256-5EK9V9yiF/UjmlYSKBIJgQOA1YU33ezicLikWYnKFAo="; separateDebugInfo = true; From b33b32ebe90428a6ccd730825d7a0a45225c1f25 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 9 Nov 2025 14:59:03 +0800 Subject: [PATCH 1901/2279] anvil-editor: 0.6 -> 0.6.3 --- pkgs/by-name/an/anvil-editor/package.nix | 35 ++++++++++-------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index a348bbce9c95..ed1a9e3d91ee 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -12,29 +12,36 @@ vulkan-headers, libGL, xorg, - buildPackages, }: buildGoModule (finalAttrs: { pname = "anvil-editor"; - version = "0.6"; + version = "0.6.3"; # has to update vendorHash of extra package manually # nixpkgs-update: no auto update src = fetchzip { url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz"; - hash = "sha256-i0S5V3j6OPpu4z1ljDKP3WYa9L+EKwo/MBNgW2ENYk8="; + hash = "sha256-GPzd1oKkf160ya0sxUd72wego0BvwCerZ5SiY2q0EDE="; }; - modRoot = "anvil/src/anvil"; + modRoot = "anvil/editor"; - vendorHash = "sha256-1oFBV7D7JgOt5yYAxVvC4vL4ccFv3JrNngZbo+5pzrk="; + vendorHash = "sha256-Q2iVB5pvP2/VXjdSwWVkdqrVUj/nIiC/VHyD5nP9ilE="; anvilExtras = buildGoModule { pname = "anvil-editor-extras"; inherit (finalAttrs) version src meta; - vendorHash = "sha256-4pfk5XuwDbCWFZIF+1l+dy8NfnGNjgHmSg9y6/RnTSo="; - modRoot = "anvil-extras"; + vendorHash = "sha256-q/PunSBe+gWTWyf8rjfikK56rP2PeZqpuiFG9HIVMTk="; + modRoot = "anvil/extras"; + # Include dependency on anvil api + postPatch = '' + pushd anvil/extras + cp -r ${finalAttrs.src}/anvil/api/go/anvil ./_anvil_api + echo "replace github.com/jeffwilliams/anvil/api/go/anvil => ./_anvil_api" >> go.mod + go mod edit -require=github.com/jeffwilliams/anvil/api/go/anvil@v0.0.0 + popd + ''; }; nativeBuildInputs = [ @@ -75,15 +82,7 @@ buildGoModule (finalAttrs: { ]; postInstall = '' - pushd ../../img - # cannot add to nativeBuildInputs - # will be conflict with icnsutils in desktopToDarwinBundle - ${lib.getExe' buildPackages.libicns "icns2png"} -x anvil.icns - for width in 32 48 128 256; do - square=''${width}x''${width} - install -Dm644 anvil_''${square}x32.png $out/share/icons/hicolor/''${square}/apps/anvil.png - done - popd + install -Dm644 misc/icon/anvil-icon.svg $out/share/icons/hicolor/scalable/apps/anvil.svg cp ${finalAttrs.anvilExtras}/bin/* $out/bin ''; @@ -94,9 +93,5 @@ buildGoModule (finalAttrs: { mainProgram = "anvil"; maintainers = with lib.maintainers; [ aleksana ]; platforms = with lib.platforms; unix ++ windows; - # Doesn't build with >buildGo123Module. - # Multiple errors like the following: - # '> vendor/gioui.org/internal/vk/vulkan.go:1916:9: cannot define new methods on non-local type SurfaceCapabilities' - broken = true; }; }) From 5b123afb9a54ab3514c113d2a8164a0f9fb245e2 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Sat, 8 Nov 2025 20:16:29 -0700 Subject: [PATCH 1902/2279] swiftPackages.swift: prefix unguarded-availability flag with -Xcc The Swift wrapper uses a hook directly from cc-wrapper to set the `-target` flag appropriately. This works because Clang and Swift use the same syntax for `-target`, but there was never a guarantee that this compatibility would be true for every option set in the hook. Indeed, commit 369cc5c66b1efdbca2f136aa0055fedca1117304 (PR #445119) made availability warnings into errors by setting the `-Werror=unguarded-availability` flag in this hook, which Swift doesn't accept at the top level. This caused all invocations of Swift to fail with the error `unknown argument: '-Werror=unguarded-availability'` - including the bootstrap Swift, which meant that `swiftPackages.swift` would fail. This commit adds all `-Werror` flags to the list of flags that need to be prefixed with `-Xcc`. I could have just dropped the flag, since Swift already makes this an error, but you can have C/C++ targets in Swift packages and we'd want to pass this flag on to them. (I'm not sure whether the clang used for those targets is already wrapped, but if it is there is no harm done.) --- pkgs/development/compilers/swift/wrapper/wrapper.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh index 21fba5395123..2017f580cef2 100644 --- a/pkgs/development/compilers/swift/wrapper/wrapper.sh +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -248,6 +248,9 @@ fi # TODO: If we ever need to expand functionality of this hook, it may no longer # be compatible with Swift. Right now, it is only used on Darwin to force # -target, which also happens to work with Swift. +# As of 369cc5c66b1efdbca2f136aa0055fedca1117304 (#445119), this hook also sets +# the -Werror=unguarded-availability flag, which Swift can't accept. We prefix +# that flag with -Xcc in the for loop below if [[ -e $cc_wrapper/nix-support/add-local-cc-cflags-before.sh ]]; then source $cc_wrapper/nix-support/add-local-cc-cflags-before.sh fi @@ -262,7 +265,7 @@ for ((i=0; i < ${#extraBefore[@]}; i++));do # TODO: Assumes macOS. extraBefore[i]="${extraBefore[i]/-apple-darwin/-apple-macosx${MACOSX_DEPLOYMENT_TARGET:-11.0}}" ;; - -march=*|-mcpu=*|-mfloat-abi=*|-mfpu=*|-mmode=*|-mthumb|-marm|-mtune=*) + -march=*|-mcpu=*|-mfloat-abi=*|-mfpu=*|-mmode=*|-mthumb|-marm|-mtune=*|-Werror=*) [[ i -gt 0 && ${extraBefore[i-1]} == -Xcc ]] && continue extraBefore=( "${extraBefore[@]:0:i}" From cca4364ef00bb71a954a2050063cb4869d0eef79 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Sun, 9 Nov 2025 08:09:33 +0100 Subject: [PATCH 1903/2279] modules/image/repart: fix typo in renamed option warning --- nixos/modules/image/repart.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index 8f892b96438b..bc1e0eb2f41d 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -384,8 +384,8 @@ in you're at version 9, you cannot increment this to 10. '' ++ lib.optional (partitionConfig.stripNixStorePrefix != "_mkMergedOptionModule") '' - The option definition `image.repart.paritions.${fileName}.stripNixStorePrefix` - has changed to `image.repart.paritions.${fileName}.nixStorePrefix` and now + The option definition `image.repart.partitions.${fileName}.stripNixStorePrefix` + has changed to `image.repart.partitions.${fileName}.nixStorePrefix` and now accepts the path to use as prefix directly. Use `nixStorePrefix = "/"` to achieve the same effect as setting `stripNixStorePrefix = true`. '' From aab9d753894933c292188ee5cbf583a1c9a9f8d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 07:10:37 +0000 Subject: [PATCH 1904/2279] terraform-providers.newrelic_newrelic: 3.74.0 -> 3.75.2 --- .../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 306afcfc4a30..63bbde99dad4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -949,13 +949,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-1OpvSayWq194591u/z9oHz80ZmPA9fSZpKSBwDHL/tk=", + "hash": "sha256-OdvDvo40fjuKoRjI1r1re/h2i5JopssRF5dQye4AsSM=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.74.0", + "rev": "v3.75.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-7zUUV3cqVesItNnE/EcO5/l+nafV04JdoNkmTxnulio=" + "vendorHash": "sha256-LBOxoSGvJ5AWS71UINBbVgDxLZqDpNgq7lY8LaPZsvs=" }, "ns1-terraform_ns1": { "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=", From 7fa73c524b6ed52df0d3cf8aa8dd86f5996e49d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 07:14:55 +0000 Subject: [PATCH 1905/2279] dprint-plugins.dprint-plugin-biome: 0.11.1 -> 0.11.3 --- pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index f7d97d9acbfa..4688cbc353ea 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS) wrapper plugin"; - hash = "sha256-kelyuSZpbah1l+qVZMIK9VhWLr7DWjZIm9HwD64bCTw="; + hash = "sha256-WEabcffl/sARrVc00Qr6QdEjFG4BZgHRrk3eeEfFV4g="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -16,6 +16,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.11.1.wasm"; - version = "0.11.1"; + url = "https://plugins.dprint.dev/biome-0.11.3.wasm"; + version = "0.11.3"; } From fca1a39d24c5ce505cee33e7e98d44e45d9284f1 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 8 Nov 2025 22:25:01 +0100 Subject: [PATCH 1906/2279] yaziPlugins.compress: init at 0.5.0-unstable-2025-08-15 --- .../ya/yazi/plugins/compress/default.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/compress/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/compress/default.nix b/pkgs/by-name/ya/yazi/plugins/compress/default.nix new file mode 100644 index 000000000000..137c33a13201 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/compress/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "compress.yazi"; + version = "0.5.0-unstable-2025-08-15"; + + src = fetchFromGitHub { + owner = "KKV9"; + repo = "compress.yazi"; + rev = "c2646395394f22b6c40bff64dc4c8c922d210570"; + hash = "sha256-qAuMD4YojLfVaywurk5uHLywRRF77U2F7ql+gR8B/lo="; + }; + + meta = { + description = "Yazi plugin that compresses selected files to an archive"; + homepage = "https://github.com/KKV9/compress.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eljamm ]; + }; +} From 08a540984c7a1def6bfeb4c1c7f0526edfa2b1d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 07:40:33 +0000 Subject: [PATCH 1907/2279] mailpit: 1.27.10 -> 1.27.11 --- pkgs/by-name/ma/mailpit/source.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix index b144b483e571..9de7cff7fa03 100644 --- a/pkgs/by-name/ma/mailpit/source.nix +++ b/pkgs/by-name/ma/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.27.10"; - hash = "sha256-O/gU5EKeEoyQDsO1aJh3twbZzSnKb1pLt9t4GfYlHEE="; - npmDepsHash = "sha256-r4hategU6aE05fvpXkgMNtFyWTv6eumLzlevjOT0/dM="; - vendorHash = "sha256-TM8b16Y+629gBz5XlXXimDWBAfOq9w8es4v984zVUbk="; + version = "1.27.11"; + hash = "sha256-0moTf5DEI+tw6Kx6/6cWzGdgem7rAfsj4iJg9I7Pjbk="; + npmDepsHash = "sha256-P9uTFeJ8ikK3Hp9bFt33mIzqp9duvMs1fYw1ErwXg1A="; + vendorHash = "sha256-MgxpoNj8Rv98AnqvWWewoFgvHWSD16MXLlkkVoQRGTE="; } From 6b659f0f352341e327089437bb1a0cf4a9815ffe Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 9 Nov 2025 01:46:22 -0600 Subject: [PATCH 1908/2279] lmstudio: 0.3.30.2 -> 0.3.31.7 --- pkgs/by-name/lm/lmstudio/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 3b5bd0383065..e47f63cb38b1 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.30-2"; - hash_aarch64-darwin = "sha256-49wubBIteg+gs9RQEozRiiFgWnVlHm1aOf7EqK1uvt4="; - version_x86_64-linux = "0.3.30-2"; - hash_x86_64-linux = "sha256-v2m5/BoyGXRi09To9rHp79+t2QnT5U0XuL5WNpfWWRU="; + version_aarch64-darwin = "0.3.31-7"; + hash_aarch64-darwin = "sha256-OyPHKUmZsIU0kc3JxwxdxACSN7hR6gFWjMnGp1x5diQ="; + version_x86_64-linux = "0.3.31-7"; + hash_x86_64-linux = "sha256-NeVteQlzygHkwwgLkB5n7meH02WhFE68KkbGRulDiC0="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; From 1210b27400856be55401e737837a0eeb1785c08d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 08:14:30 +0000 Subject: [PATCH 1909/2279] windsurf: 1.12.27 -> 1.12.28 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index c5b1d6180859..d3286d55a630 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.12.27", + "version": "1.12.28", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-arm64-1.12.27.zip", - "sha256": "294f3a3aab7665caf936ef43b384540695849928c956c28b4b783bb3b34913a2" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c855b1fa42fce019aedb4b06e6faa69d65ac7fd3/Windsurf-darwin-arm64-1.12.28.zip", + "sha256": "da2f5ad240ba49627c9d5bcdff8aec679c5a691f3195dc4bfb9bccf33a88e309" }, "x86_64-darwin": { - "version": "1.12.27", + "version": "1.12.28", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-x64-1.12.27.zip", - "sha256": "61e0dac30fa014f42f99138434f289504d4d2a79aaa9f4cc61c30c663c6ab979" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c855b1fa42fce019aedb4b06e6faa69d65ac7fd3/Windsurf-darwin-x64-1.12.28.zip", + "sha256": "925733e51b22d36fd0ddbadf1e6dc12e47fbcbdc34de4aea325fc3c8c0862292" }, "x86_64-linux": { - "version": "1.12.27", + "version": "1.12.28", "vscodeVersion": "1.105.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-linux-x64-1.12.27.tar.gz", - "sha256": "8f380755df34a1b466c28448f22fc92d3cfb13da55e9d8f2c9db5a4db83f6cac" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c855b1fa42fce019aedb4b06e6faa69d65ac7fd3/Windsurf-linux-x64-1.12.28.tar.gz", + "sha256": "cc781ce37d096843a16cefd5c692270c84b7b339d09b93ee515d630a1f6ace11" } } From d4554ab8d0106825e373d36c5431e0e5f7cf85b1 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sun, 9 Nov 2025 03:23:23 -0500 Subject: [PATCH 1910/2279] nixosTests.redlib: mock OAuth endpoint --- .../common/acme/server/generate-certs.nix | 5 +---- nixos/tests/redlib.nix | 22 +++++++++++++++++++ nixos/tests/redlib/ca.cert.pem | 13 +++++++++++ nixos/tests/redlib/ca.key.pem | 6 +++++ nixos/tests/redlib/snakeoil-certs.nix | 17 ++++++++++++++ nixos/tests/redlib/www.reddit.com.cert.pem | 13 +++++++++++ nixos/tests/redlib/www.reddit.com.key.pem | 6 +++++ 7 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 nixos/tests/redlib/ca.cert.pem create mode 100644 nixos/tests/redlib/ca.key.pem create mode 100644 nixos/tests/redlib/snakeoil-certs.nix create mode 100644 nixos/tests/redlib/www.reddit.com.cert.pem create mode 100644 nixos/tests/redlib/www.reddit.com.key.pem diff --git a/nixos/tests/common/acme/server/generate-certs.nix b/nixos/tests/common/acme/server/generate-certs.nix index 0cec83282707..a95c58a45964 100644 --- a/nixos/tests/common/acme/server/generate-certs.nix +++ b/nixos/tests/common/acme/server/generate-certs.nix @@ -4,11 +4,8 @@ pkgs ? import { }, minica ? pkgs.minica, mkDerivation ? pkgs.stdenv.mkDerivation, + domain ? (import ./snakeoil-certs.nix).domain, }: -let - conf = import ./snakeoil-certs.nix; - domain = conf.domain; -in mkDerivation { name = "test-certs"; buildInputs = [ diff --git a/nixos/tests/redlib.nix b/nixos/tests/redlib.nix index e03df475fe3d..9d7e7ec1632a 100644 --- a/nixos/tests/redlib.nix +++ b/nixos/tests/redlib.nix @@ -1,4 +1,8 @@ { lib, pkgs, ... }: +let + certs = import redlib/snakeoil-certs.nix; + redditDomain = certs.domain; +in { name = "redlib"; meta.maintainers = with lib.maintainers; [ @@ -7,6 +11,24 @@ ]; nodes.machine = { + # The test will hang if Redlib can't initialize its OAuth client, so we + # provide it with a mock endpoint. + networking.hosts."127.0.0.1" = [ redditDomain ]; + security.pki.certificates = [ + (builtins.readFile certs.ca.cert) + ]; + services.nginx = { + enable = true; + virtualHosts.${redditDomain} = { + onlySSL = true; + sslCertificate = certs.${redditDomain}.cert; + sslCertificateKey = certs.${redditDomain}.key; + locations."/auth/v2/oauth/access-token/loid".extraConfig = '' + return 200 "{\"access_token\":\"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\",\"expires_in\":0}"; + ''; + }; + }; + services.redlib = { package = pkgs.redlib; enable = true; diff --git a/nixos/tests/redlib/ca.cert.pem b/nixos/tests/redlib/ca.cert.pem new file mode 100644 index 000000000000..0e0496e1ac37 --- /dev/null +++ b/nixos/tests/redlib/ca.cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIIB/TCCAYKgAwIBAgIIR+NCHSDJCIAwCgYIKoZIzj0EAwMwIDEeMBwGA1UEAxMV +bWluaWNhIHJvb3QgY2EgNDdlMzQyMCAXDTI1MTEwOTA2MjMwNFoYDzIxMjUxMTA5 +MDYyMzA0WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA0N2UzNDIwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAASo81ED5tomfR47qFXpan+0cBKP7eoAhAAkJeT9w/h2 +axpVVQ/X+rDFu1QbKDqE7lJ2j3Ue7eb/6Q5Zrt9MSFPDcQz7eFr6kX0S2u5AHO9z +6E60gUNUwZBDBenr0P/uTQ6jgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1Ud +DgQWBBQuPLVPdRiEUCga2W3RKwL4diQVMDAfBgNVHSMEGDAWgBQuPLVPdRiEUCga +2W3RKwL4diQVMDAKBggqhkjOPQQDAwNpADBmAjEAqG8PIYJ0CQG3CfLsQFpwDLmj +DoEFgcRMkRQz4vtAQMpLhoo8VAPo7Vl+AAaZgRVPAjEA6XDte56Oou5qMj4Zkzi8 +EYIucHtYrfTNJOarDSYYvTlNrmuQ73KTP4Hxfd26TA2q +-----END CERTIFICATE----- diff --git a/nixos/tests/redlib/ca.key.pem b/nixos/tests/redlib/ca.key.pem new file mode 100644 index 000000000000..d085e8ba3f85 --- /dev/null +++ b/nixos/tests/redlib/ca.key.pem @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBuuWbxl4uwwcIT0SvT +jcQHDekytbQrLw4imrpfrAJmTdvyHcfEGiWuwscs36mq50WhZANiAASo81ED5tom +fR47qFXpan+0cBKP7eoAhAAkJeT9w/h2axpVVQ/X+rDFu1QbKDqE7lJ2j3Ue7eb/ +6Q5Zrt9MSFPDcQz7eFr6kX0S2u5AHO9z6E60gUNUwZBDBenr0P/uTQ4= +-----END PRIVATE KEY----- diff --git a/nixos/tests/redlib/snakeoil-certs.nix b/nixos/tests/redlib/snakeoil-certs.nix new file mode 100644 index 000000000000..6fd0badcca7d --- /dev/null +++ b/nixos/tests/redlib/snakeoil-certs.nix @@ -0,0 +1,17 @@ +# To generate cert files: +# cp $(nix-build ../common/acme/server/generate-certs.nix --arg domain '(import ./snakeoil-certs.nix).domain' --no-out-link)/* . + +let + domain = "www.reddit.com"; +in +{ + inherit domain; + ca = { + cert = ./ca.cert.pem; + key = ./ca.key.pem; + }; + ${domain} = { + cert = ./${domain}.cert.pem; + key = ./${domain}.key.pem; + }; +} diff --git a/nixos/tests/redlib/www.reddit.com.cert.pem b/nixos/tests/redlib/www.reddit.com.cert.pem new file mode 100644 index 000000000000..fbd8636683f4 --- /dev/null +++ b/nixos/tests/redlib/www.reddit.com.cert.pem @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIIB5jCCAW2gAwIBAgIIFaN6FT3RbaswCgYIKoZIzj0EAwMwIDEeMBwGA1UEAxMV +bWluaWNhIHJvb3QgY2EgNDdlMzQyMB4XDTI1MTEwOTA2MjMwNFoXDTQ1MTEwOTA2 +MjMwNFowGTEXMBUGA1UEAxMOd3d3LnJlZGRpdC5jb20wdjAQBgcqhkjOPQIBBgUr +gQQAIgNiAAQpU1quYyW3g2ZjtwSFLNOhucqkjFhCN5rcSZOLpbnieelZ6axvoH6x +2Znfcu4YqYtK8G/zHDv2o9gQQpDBcWp7dobpUVbfrSRxsr5LEYlEXPUslbFkFWau +HzKTx5QTyu2jezB5MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD +AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBQuPLVPdRiEUCga +2W3RKwL4diQVMDAZBgNVHREEEjAQgg53d3cucmVkZGl0LmNvbTAKBggqhkjOPQQD +AwNnADBkAjAqU0nW3KRXEZMTP9qjnNqherjVYa8WPWMCtwYqiFDOWilByZFjEZUs +8it+unxaNe4CMA12fOFHgsM1tKRiSslIHXSx5V71RkXGrQxxqfRlD0w7LjsJWXRv +Z6DKyxfF6MJPEA== +-----END CERTIFICATE----- diff --git a/nixos/tests/redlib/www.reddit.com.key.pem b/nixos/tests/redlib/www.reddit.com.key.pem new file mode 100644 index 000000000000..d9f7056e6d68 --- /dev/null +++ b/nixos/tests/redlib/www.reddit.com.key.pem @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDB1r7aQH0yOtCYquZXn +1jVqo9gD7kIZRa4TaeHNRRKcv9w9WswTfSJ/0QILIFP0K7WhZANiAAQpU1quYyW3 +g2ZjtwSFLNOhucqkjFhCN5rcSZOLpbnieelZ6axvoH6x2Znfcu4YqYtK8G/zHDv2 +o9gQQpDBcWp7dobpUVbfrSRxsr5LEYlEXPUslbFkFWauHzKTx5QTyu0= +-----END PRIVATE KEY----- From f55186d344da3ef66c57601acffd9e38cc571ff8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 08:42:46 +0000 Subject: [PATCH 1911/2279] python3Packages.types-regex: 2025.10.23.20251023 -> 2025.11.3.20251106 --- pkgs/development/python-modules/types-regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix index 13c18db616f3..fd6ddb3c846f 100644 --- a/pkgs/development/python-modules/types-regex/default.nix +++ b/pkgs/development/python-modules/types-regex/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-regex"; - version = "2025.10.23.20251023"; + version = "2025.11.3.20251106"; pyproject = true; src = fetchPypi { pname = "types_regex"; inherit version; - hash = "sha256-dfAjvwrwV+AVennpnmZpBTe+uzXZA9uPKbTlwtO+54I="; + hash = "sha256-X5go7TmlpScntjf5P38PkJ1W+iIRYE7MIT/Ou1CbnVA="; }; build-system = [ From 861b5def77e4f0d081af7e133f39d04331e8a6f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 08:44:07 +0000 Subject: [PATCH 1912/2279] signal-desktop: 7.77.1 -> 7.78.0 --- pkgs/by-name/si/signal-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 2220f87cbd7f..693cef03a7f6 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.77.1"; + version = "7.78.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-IFMNUuGL3sQVlEJI4N2rXrYStcDEZW/YxmZyPM0hhVU="; + hash = "sha256-pQk1k3ARBMk3YDTPeLNCWG7dCl1TWBn/evgKIEny3k0="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: { fetcherVersion = 1; hash = if withAppleEmojis then - "sha256-RquJqKUDdz8QRJXz7eWiAcdUF+WhYEqnyOkhrIw7tgQ=" + "sha256-qOVwVQRGtxjpfVF+zBqeotYD0JE1n3az9yFclzXrHgs=" else - "sha256-v1KbjFLo5pD1uoNtDrX2kUbhCgGeEqbuHLZRIJqshHw="; + "sha256-Pby9shhDbvXGMY7K1Z+BZXwxY8QVwTYViaEMwZiDggI="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1761859038; + SOURCE_DATE_EPOCH = 1762378649; }; preBuild = '' From 19d01345848650537fed8397dc124fc5c4523ea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 09:00:44 +0000 Subject: [PATCH 1913/2279] emmylua-ls: 0.16.0 -> 0.17.0 --- pkgs/by-name/em/emmylua-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 71fe171f0465..3fbeb620266c 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -7,18 +7,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_ls"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4="; + hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg="; }; buildAndTestSubdir = "crates/emmylua_ls"; - cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI="; + cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8="; nativeInstallCheckInputs = [ versionCheckHook From 9a17278a5cebec1d39d68055fbca320ac805a498 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 9 Nov 2025 10:27:10 +0100 Subject: [PATCH 1914/2279] zoom-us: simplify updater script This uses pkgsCross to help the general update script find and update the various zoom versions for the various architectures. That way, we no longer need to calculate the source hashes in the update script. Credits: The commit at hand is inspired by https://github.com/NixOS/nixpkgs/blob/c656e00a21df6c42d6b57e9f8abf6cdf20e7b1ce/pkgs/by-name/ch/chataigne/update.sh#L24 (note: not merged into nixpkgs yet, so that link might disappear), after a friendly note by axelkar https://github.com/NixOS/nixpkgs/pull/429215#discussion_r2255114820 and a helpful hint by magistau https://github.com/NixOS/nixpkgs/pull/429215#discussion_r2506957507 Thanks to both of you! --- pkgs/by-name/zo/zoom-us/update.sh | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh index d307058ceb5d..25e8d58eb9a2 100755 --- a/pkgs/by-name/zo/zoom-us/update.sh +++ b/pkgs/by-name/zo/zoom-us/update.sh @@ -14,21 +14,10 @@ version_aarch64_darwin=$(jq -r .zoomArm64.version <<<"$mac_data") version_x86_64_darwin=$(jq -r .zoom.version <<<"$mac_data") version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data") -echo >&2 "=== Downloading packages and computing hashes..." -# We precalculate the hashes before calling update-source-version -# because it attempts to calculate each architecture's package's hash -# by running `nix-build --system -A zoom-us.src` which -# causes cross compiling headaches; using nix-prefetch-url with -# hard-coded URLs is simpler. Keep these URLs in sync with the ones -# in package.nix where `srcs` is defined. -hash_aarch64_darwin=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) -hash_x86_64_darwin=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) -hash_x86_64_linux=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) - echo >&2 "=== Updating package.nix ..." # update-source-version expects to be at the root of nixpkgs -(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin) -(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin) -(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_linux" $hash_x86_64_linux --system=x86_64-linux --version-key=versions.x86_64-linux --source-key=unpacked.src) +(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.aarch64-darwin pkgsCross.aarch64-darwin.zoom-us "$version_aarch64_darwin") +(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-darwin pkgsCross.x86_64-darwin.zoom-us "$version_x86_64_darwin") +(cd "$nixpkgs" && update-source-version --ignore-same-version --print-changes --version-key=versions.x86_64-linux pkgsCross.gnu64.zoom-us "$version_x86_64_linux" --source-key=unpacked.src) echo >&2 "=== Done!" From 57e2a9410bcc6aa38bf4997bd78d4ab6934467f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 10:22:16 +0000 Subject: [PATCH 1915/2279] super-productivity: 16.2.1 -> 16.3.0 --- pkgs/by-name/su/super-productivity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 0c9a7cf2a8c1..3bd462d69b7b 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -14,13 +14,13 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "16.2.1"; + version = "16.3.0"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-R+GZE7hxPUOF5eny0vxH7H1Ja82AbXx4xcL4tszaDQc="; + hash = "sha256-Im5f3FjXa8i9nbWrhbYXGNAflitjfRGs8lGEQi42+CU="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -63,7 +63,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-MPTLx/5+0qP7PcxcsIyJEZVUPsoA5J+NG+g92n6vNEk="; + hash = "sha256-uaJ/k4xdxDdakfRfAdM//sFaGYZx4pWiMwZGmrw7X3Y="; } ); From 32d5a620f0aa55cbcc9a6d613cf8d83e9f2593ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 10:26:06 +0000 Subject: [PATCH 1916/2279] python3Packages.cerberus: 1.3.7 -> 1.3.8 --- pkgs/development/python-modules/cerberus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 159bfc1662aa..eaf0c4e08a64 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cerberus"; - version = "1.3.7"; + version = "1.3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pyeve"; repo = "cerberus"; tag = version; - hash = "sha256-KYZpd8adKXahSc/amQHZMFdJtEtZLklZZgwfkYu8/qY="; + hash = "sha256-C7YZjqQtdkakqHXBU3cFUl/gCFvCl3saP14eqt2fdAM="; }; build-system = [ From 516f7574934c7afb2f552482ce45644068d0fdaa Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 9 Nov 2025 10:33:43 +0000 Subject: [PATCH 1917/2279] haskell.packages.ghc912.extensions: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change `haskell.packages.ghc912.extensions` eval fails as: $ nix build --no-link -f. haskell.packages.ghc912.extensions error: … in the left operand of the update (//) operator at pkgs/development/haskell-modules/lib/compose.nix:41:6: 40| f: drv: 41| (drv.override ( | ^ 42| args: error: attribute 'extensions_0_1_0_3' missing at pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix:75:29: 74| 75| extensions = doDistribute self.extensions_0_1_0_3; | ^ 76| ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0; Did you mean one of extensions_0_1_0_1 or extensions_0_1_1_0? --- pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 82630d5da2c8..9b6a04bd8b82 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -72,7 +72,7 @@ with haskellLib; # Hand pick versions that are compatible with ghc 9.12 and base 4.21 # - extensions = doDistribute self.extensions_0_1_0_3; + extensions = doDistribute self.extensions_0_1_1_0; ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0; # From ce5cc48a42f6e9f0aa5ad947756ed22de78bb471 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sun, 9 Nov 2025 11:43:28 +0100 Subject: [PATCH 1918/2279] scion: update meta.homepage Previous homepage shows a message that it has moved --- pkgs/by-name/sc/scion/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index cad28b77aa4f..4b0fd2a7eabb 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { meta = { description = "Future Internet architecture utilizing path-aware networking"; - homepage = "https://scion-architecture.net/"; + homepage = "https://www.scion.org/"; platforms = lib.platforms.unix; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ From 4d2a9d6cf686cb91c8e45ebd03ed6ea26d27ca65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 10:46:52 +0000 Subject: [PATCH 1919/2279] python3Packages.hier-config: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/hier-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hier-config/default.nix b/pkgs/development/python-modules/hier-config/default.nix index 15f980e1a36e..196dbda6b7e2 100644 --- a/pkgs/development/python-modules/hier-config/default.nix +++ b/pkgs/development/python-modules/hier-config/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hier-config"; - version = "3.2.2"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "netdevops"; repo = "hier_config"; tag = "v${version}"; - hash = "sha256-3xSxzdIxoQgJtA3CX141jP2Zl2j8Dwfplv4JYpHpCdQ="; + hash = "sha256-rIZ87jzpvSluDo+g3a2aHSmD7JXbZFHa7tvHePUwboI="; }; build-system = [ poetry-core ]; From b0f28e554b61dd724841181aa6713d6269ff98d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 10:50:10 +0000 Subject: [PATCH 1920/2279] syft: 1.36.0 -> 1.37.0 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index f06260678818..fe68c41f0b89 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "syft"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-JSoKidueNwCI4Fbqs5K4RxfObJlet5FV6JgEWuLqd08="; + hash = "sha256-PWwbYInv/b/wkUrugtxB67uBmXtzPaVmdE7ppV+8Htk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-dKT2bEeIG3tndj5UuJO2g8gnVGM9AfB5ebu3CfWDhRg="; + vendorHash = "sha256-v4tRezweLJDPetG97VpJcloCNSqbc1EHpMJbKFh4Kio="; nativeBuildInputs = [ installShellFiles ]; From f8d2a9c626593476d2abd51d68e84ebc56cb6de1 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 8 Nov 2025 14:49:41 +0100 Subject: [PATCH 1921/2279] python3Packages.pygame-ce: fix tests with new sdl2-compat Signed-off-by: Marcin Serwin --- ...rmat-instead-of-creating-it-manually.patch | 151 ++++++++++++++++++ .../python-modules/pygame-ce/default.nix | 6 +- .../pygame-ce/skip-rle-tests.patch | 22 +-- 3 files changed, 167 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch diff --git a/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch b/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch new file mode 100644 index 000000000000..1e1f407dbc19 --- /dev/null +++ b/pkgs/development/python-modules/pygame-ce/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch @@ -0,0 +1,151 @@ +From 3e3fbdc11ab00c4c04eb68c40b23979245c987fa Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 8 Nov 2025 19:47:41 +0100 +Subject: [PATCH] Use SDL_AllocFormat instead of creating it manually + +According to the docs, `SDL_PixelFormat` is a read-only structure. +Creating it manually leaves out some important fields like `format` and +`next` pointer to be undefined. + +Signed-off-by: Marcin Serwin +--- + src_c/surface.c | 80 ++++++++++++++----------------------------------- + 1 file changed, 23 insertions(+), 57 deletions(-) + +diff --git a/src_c/surface.c b/src_c/surface.c +index f118a4db4..e51e80554 100644 +--- a/src_c/surface.c ++++ b/src_c/surface.c +@@ -1844,9 +1844,8 @@ surf_convert(pgSurfaceObject *self, PyObject *args) + */ + int bpp = 0; + SDL_Palette *palette = SDL_AllocPalette(default_palette_size); +- SDL_PixelFormat format; ++ Uint32 format_enum = 0; + +- memcpy(&format, surf->format, sizeof(format)); + if (pg_IntFromObj(argobject, &bpp)) { + Uint32 Rmask, Gmask, Bmask, Amask; + +@@ -1904,30 +1903,23 @@ surf_convert(pgSurfaceObject *self, PyObject *args) + "nonstandard bit depth given"); + } + } +- format.Rmask = Rmask; +- format.Gmask = Gmask; +- format.Bmask = Bmask; +- format.Amask = Amask; ++ format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, ++ Bmask, Amask); + } + else if (PySequence_Check(argobject) && + PySequence_Size(argobject) == 4) { +- Uint32 mask; ++ Uint32 Rmask, Gmask, Bmask, Amask; + +- if (!pg_UintFromObjIndex(argobject, 0, &format.Rmask) || +- !pg_UintFromObjIndex(argobject, 1, &format.Gmask) || +- !pg_UintFromObjIndex(argobject, 2, &format.Bmask) || +- !pg_UintFromObjIndex(argobject, 3, &format.Amask)) { ++ if (!pg_UintFromObjIndex(argobject, 0, &Rmask) || ++ !pg_UintFromObjIndex(argobject, 1, &Gmask) || ++ !pg_UintFromObjIndex(argobject, 2, &Bmask) || ++ !pg_UintFromObjIndex(argobject, 3, &Amask)) { + pgSurface_Unprep(self); + return RAISE(PyExc_ValueError, + "invalid color masks given"); + } +- mask = +- format.Rmask | format.Gmask | format.Bmask | format.Amask; +- for (bpp = 0; bpp < 32; ++bpp) { +- if (!(mask >> bpp)) { +- break; +- } +- } ++ format_enum = SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, ++ Bmask, Amask); + } + else { + pgSurface_Unprep(self); +@@ -1935,22 +1927,11 @@ surf_convert(pgSurfaceObject *self, PyObject *args) + PyExc_ValueError, + "invalid argument specifying new format to convert to"); + } +- format.BitsPerPixel = (Uint8)bpp; +- format.BytesPerPixel = (bpp + 7) / 8; +- if (PG_FORMAT_BitsPerPixel((&format)) > 8) { +- /* Allow a 8 bit source surface with an empty palette to be +- * converted to a format without a palette (pygame-ce issue +- * #146). If the target format has a non-NULL palette pointer +- * then SDL_ConvertSurface checks that the palette is not +- * empty-- that at least one entry is not black. +- */ +- format.palette = NULL; +- } +- if (SDL_ISPIXELFORMAT_INDEXED(SDL_MasksToPixelFormatEnum( +- PG_FORMAT_BitsPerPixel((&format)), format.Rmask, +- format.Gmask, format.Bmask, format.Amask))) { ++ SDL_PixelFormat *format = SDL_AllocFormat(format_enum); ++ ++ if (SDL_ISPIXELFORMAT_INDEXED(format_enum)) { + if (SDL_ISPIXELFORMAT_INDEXED(PG_SURF_FORMATENUM(surf))) { +- SDL_SetPixelFormatPalette(&format, surf->format->palette); ++ SDL_SetPixelFormatPalette(format, surf->format->palette); + } + else { + /* Give the surface something other than an all white +@@ -1958,12 +1939,13 @@ surf_convert(pgSurfaceObject *self, PyObject *args) + */ + SDL_SetPaletteColors(palette, default_palette_colors, 0, + default_palette_size); +- SDL_SetPixelFormatPalette(&format, palette); ++ SDL_SetPixelFormatPalette(format, palette); + } + } +- newsurf = PG_ConvertSurface(surf, &format); ++ newsurf = PG_ConvertSurface(surf, format); + SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_NONE); + SDL_FreePalette(palette); ++ SDL_FreeFormat(format); + } + } + else { +@@ -4540,29 +4522,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj, + } + else { + SDL_PixelFormat *fmt = src->format; +- SDL_PixelFormat newfmt; ++ SDL_PixelFormat *newfmt = ++ SDL_AllocFormat(SDL_MasksToPixelFormatEnum( ++ fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, 0)); + +- newfmt.palette = 0; /* Set NULL (or SDL gets confused) */ +-#if SDL_VERSION_ATLEAST(3, 0, 0) +- newfmt.bits_per_pixel = fmt->bits_per_pixel; +- newfmt.bytes_per_pixel = fmt->bytes_per_pixel; +-#else +- newfmt.BitsPerPixel = fmt->BitsPerPixel; +- newfmt.BytesPerPixel = fmt->BytesPerPixel; +-#endif +- newfmt.Amask = 0; +- newfmt.Rmask = fmt->Rmask; +- newfmt.Gmask = fmt->Gmask; +- newfmt.Bmask = fmt->Bmask; +- newfmt.Ashift = 0; +- newfmt.Rshift = fmt->Rshift; +- newfmt.Gshift = fmt->Gshift; +- newfmt.Bshift = fmt->Bshift; +- newfmt.Aloss = 0; +- newfmt.Rloss = fmt->Rloss; +- newfmt.Gloss = fmt->Gloss; +- newfmt.Bloss = fmt->Bloss; +- src = PG_ConvertSurface(src, &newfmt); ++ src = PG_ConvertSurface(src, newfmt); ++ ++ SDL_FreeFormat(newfmt); + if (src) { + #if SDL_VERSION_ATLEAST(3, 0, 0) + result = SDL_BlitSurface(src, srcrect, dst, dstrect) ? 0 : -1; +-- +2.51.0 + diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index edef7857b042..1f132ab7fab0 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -61,8 +61,12 @@ buildPythonPackage rec { ]) buildInputs ); }) - # https://github.com/libsdl-org/sdl2-compat/issues/476 + + # Can be removed with the next SDL3 bump. ./skip-rle-tests.patch + + # https://github.com/pygame-community/pygame-ce/pull/3639 + ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch ]; postPatch = '' diff --git a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch index d0792e0e0e92..f7ecc1ccb330 100644 --- a/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch +++ b/pkgs/development/python-modules/pygame-ce/skip-rle-tests.patch @@ -1,20 +1,20 @@ diff --git a/test/surface_test.py b/test/surface_test.py -index 4e4b5d4..ffc7ffb 100644 +index c2c91f4f5..58d916de8 100644 --- a/test/surface_test.py +++ b/test/surface_test.py -@@ -375,6 +375,7 @@ class SurfaceTypeTest(unittest.TestCase): - self.assertTrue(s1.get_flags() & pygame.RLEACCELOK) - self.assertTrue(not s2.get_flags() & pygame.RLEACCELOK) - -+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") - def test_solarwolf_rle_usage(self): - """Test for error/crash when calling set_colorkey() followed - by convert twice in succession. Code originally taken -@@ -403,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): +@@ -404,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): finally: pygame.display.quit() -+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") ++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429") def test_solarwolf_rle_usage_2(self): """Test for RLE status after setting alpha""" +@@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424") + def test_set_alpha__set_colorkey_rle(self): + pygame.display.init() + try: From ff10f40d935fa8ec610f955ad912608bf477f4aa Mon Sep 17 00:00:00 2001 From: Alexandre Ros Date: Sun, 9 Nov 2025 08:32:27 +0100 Subject: [PATCH 1922/2279] maintainers: add alexland7219 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 535ef1d43934..b4ede998f9bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1191,6 +1191,12 @@ githubId = 2335822; name = "Alexandre Esteves"; }; + alexland7219 = { + email = "alexland7219@gmail.com"; + github = "alexland7219"; + githubId = 58669111; + name = "Alexandre Ros"; + }; alexnabokikh = { email = "nabokikh@duck.com"; github = "alexnabokikh"; From 6824e92aa65795d3ee33c69fb8b33322e3d7c12f Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Sun, 9 Nov 2025 19:01:53 +0800 Subject: [PATCH 1923/2279] open-webui: 0.6.34 -> 0.6.36 Diff: https://github.com/open-webui/open-webui/compare/v0.6.34...v0.6.36 Changelog: https://github.com/open-webui/open-webui/blob/v0.6.36/CHANGELOG.md --- pkgs/by-name/op/open-webui/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 488a99f7d171..1fe667061bb5 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.34"; + version = "0.6.36"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-crjBVR0ZXUYck4pyLNb1IO9IoQ6MFBnCKEBsi0/JXCI="; + hash = "sha256-7+KFMmiJZB14kUtkKxTLZrZ2bA2MR1qA/cx7GX+FnUw="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-ofw/leDcfrc+Bp93s9BkB3WFs8qQgiWUag7gvdPJdlo="; + npmDepsHash = "sha256-CEjWmDcHHr0PeltETi5uIdoQ2C2Twmg+gDBZT5myo/E="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ @@ -212,7 +212,6 @@ python3Packages.buildPythonApplication rec { pymilvus pymongo qdrant-client - tencentcloud-sdk-python ] ++ moto.optional-dependencies.s3 ++ postgres; From c435c50a512d91cbbdb25b0f9bbf8da88c85aa97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:07:08 +0000 Subject: [PATCH 1924/2279] re-isearch: 2.20220925.4.0a-unstable-2025-11-02 -> 2.20220925.4.0a-unstable-2025-11-05 --- pkgs/by-name/re/re-isearch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index f6332b86eeeb..d3d95dee078c 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "re-Isearch"; - version = "2.20220925.4.0a-unstable-2025-11-02"; + version = "2.20220925.4.0a-unstable-2025-11-05"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "47e9a874d1343f68b67be16e8dd15661171c9270"; - hash = "sha256-cwH4W6+7JwohP2sx5PjvZtu63GDTfmt6nWd7cSqZkBQ="; + rev = "4c1afb365ded2fc181d11f67a9aa4a6984990afd"; + hash = "sha256-4sL5+V37MHnxNivl6sJBvp4NjtqOHmiftIsBCsz4tv8="; }; patches = [ From 0fa3aaa7c9193a6c8a3c275a3876dfb6dcac0121 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 8 Nov 2025 14:49:41 +0100 Subject: [PATCH 1925/2279] python3Packages.pygame: fix tests with new sdl2-compat Signed-off-by: Marcin Serwin --- ...rmat-instead-of-creating-it-manually.patch | 53 +++++++++++++++++++ .../pygame/adapt-to-sdl3-format-message.patch | 14 ----- .../python-modules/pygame/default.nix | 8 +-- .../pygame/skip-rle-tests.patch | 22 ++++---- 4 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch delete mode 100644 pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch diff --git a/pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch b/pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch new file mode 100644 index 000000000000..d786e1f248a5 --- /dev/null +++ b/pkgs/development/python-modules/pygame/0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch @@ -0,0 +1,53 @@ +From bc1a52062adfacc94661883157dd4ef58e00e031 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 8 Nov 2025 14:48:04 +0100 +Subject: [PATCH] Use SDL_AllocFormat instead of creating it manually + +According to the docs, `SDL_PixelFormat` is a read-only structure. +Creating it manually leaves out some important fields like `format` and +`next` pointer to be undefined. + +Signed-off-by: Marcin Serwin +--- + src_c/surface.c | 25 +++++++------------------ + 1 file changed, 7 insertions(+), 18 deletions(-) + +diff --git a/src_c/surface.c b/src_c/surface.c +index 958ce43f..9be3d8fb 100644 +--- a/src_c/surface.c ++++ b/src_c/surface.c +@@ -3730,24 +3730,13 @@ pgSurface_Blit(pgSurfaceObject *dstobj, pgSurfaceObject *srcobj, + } + else { + SDL_PixelFormat *fmt = src->format; +- SDL_PixelFormat newfmt; +- +- newfmt.palette = 0; /* Set NULL (or SDL gets confused) */ +- newfmt.BitsPerPixel = fmt->BitsPerPixel; +- newfmt.BytesPerPixel = fmt->BytesPerPixel; +- newfmt.Amask = 0; +- newfmt.Rmask = fmt->Rmask; +- newfmt.Gmask = fmt->Gmask; +- newfmt.Bmask = fmt->Bmask; +- newfmt.Ashift = 0; +- newfmt.Rshift = fmt->Rshift; +- newfmt.Gshift = fmt->Gshift; +- newfmt.Bshift = fmt->Bshift; +- newfmt.Aloss = 0; +- newfmt.Rloss = fmt->Rloss; +- newfmt.Gloss = fmt->Gloss; +- newfmt.Bloss = fmt->Bloss; +- src = SDL_ConvertSurface(src, &newfmt, 0); ++ SDL_PixelFormat *newfmt = ++ SDL_AllocFormat(SDL_MasksToPixelFormatEnum( ++ fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, 0)); ++ ++ src = SDL_ConvertSurface(src, newfmt, 0); ++ ++ SDL_FreeFormat(newfmt); + if (src) { + result = SDL_BlitSurface(src, srcrect, dst, dstrect); + SDL_FreeSurface(src); +-- +2.51.0 + diff --git a/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch b/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch deleted file mode 100644 index f8c0a98402b7..000000000000 --- a/pkgs/development/python-modules/pygame/adapt-to-sdl3-format-message.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src_c/surface.c b/src_c/surface.c -index ee9991fb..32c007bd 100644 ---- a/src_c/surface.c -+++ b/src_c/surface.c -@@ -733,7 +733,8 @@ _raise_create_surface_error(void) - { - const char *msg = SDL_GetError(); - -- if (strcmp(msg, "Unknown pixel format") == 0) -+ if (strcmp(msg, "Unknown pixel format") == 0 || -+ strcmp(msg, "Parameter 'format' is invalid") == 0) - return RAISE(PyExc_ValueError, "Invalid mask values"); - return RAISE(pgExc_SDLError, msg); - } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 62e4bcba5dd0..d4a4c92f89c8 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -62,14 +62,16 @@ buildPythonPackage rec { # mixer queue test returns busy queue when it shouldn't ./skip-mixer-test.patch - # https://github.com/libsdl-org/sdl2-compat/issues/476 + + # Can be removed with the next SDL3 bump. ./skip-rle-tests.patch - # https://github.com/libsdl-org/sdl2-compat/issues/489 - ./adapt-to-sdl3-format-message.patch # https://github.com/pygame/pygame/pull/4497 ./0001-Use-SDL_HasSurfaceRLE-when-available.patch ./0002-Don-t-assume-that-touch-devices-support-get_num_fing.patch + + # https://github.com/pygame/pygame/pull/4651 + ./0001-Use-SDL_AllocFormat-instead-of-creating-it-manually.patch ]; postPatch = '' diff --git a/pkgs/development/python-modules/pygame/skip-rle-tests.patch b/pkgs/development/python-modules/pygame/skip-rle-tests.patch index d0792e0e0e92..5f9c6be928d4 100644 --- a/pkgs/development/python-modules/pygame/skip-rle-tests.patch +++ b/pkgs/development/python-modules/pygame/skip-rle-tests.patch @@ -1,20 +1,20 @@ diff --git a/test/surface_test.py b/test/surface_test.py -index 4e4b5d4..ffc7ffb 100644 +index b1147d27..c7ba2928 100644 --- a/test/surface_test.py +++ b/test/surface_test.py -@@ -375,6 +375,7 @@ class SurfaceTypeTest(unittest.TestCase): - self.assertTrue(s1.get_flags() & pygame.RLEACCELOK) - self.assertTrue(not s2.get_flags() & pygame.RLEACCELOK) - -+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") - def test_solarwolf_rle_usage(self): - """Test for error/crash when calling set_colorkey() followed - by convert twice in succession. Code originally taken -@@ -403,6 +404,7 @@ class SurfaceTypeTest(unittest.TestCase): +@@ -346,6 +346,7 @@ class SurfaceTypeTest(unittest.TestCase): finally: pygame.display.quit() -+ @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/476") ++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429") def test_solarwolf_rle_usage_2(self): """Test for RLE status after setting alpha""" +@@ -377,6 +378,7 @@ class SurfaceTypeTest(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424") + def test_set_alpha__set_colorkey_rle(self): + pygame.display.init() + try: From 1e532f3dcf17b110687e52eeef1959548ba3afc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:11:11 +0000 Subject: [PATCH 1926/2279] ghostfolio: 2.214.0 -> 2.215.0 --- pkgs/by-name/gh/ghostfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 29918109ef51..617b155a0f38 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.214.0"; + version = "2.215.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-x8GUlC1/TxA40rDQu3Ae2P5v5LFtberOQWtx5GJ7rMw="; + hash = "sha256-j7UmjyayVbun4PrNSPwOi2+EGUhyTFuLQLSIZp8l95g="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-hHfT4gsf0D5XPY4RuQCKWNWp+iav9B75YMs70xayqtc="; + npmDepsHash = "sha256-58e/LBgB4MQIp3xUdQXVvmq7krQ8+i0ku9xineC1HRU="; nativeBuildInputs = [ prisma From 96acd099e1645908c2dded2a4adc14e065553387 Mon Sep 17 00:00:00 2001 From: Ben Edwards Date: Thu, 11 Sep 2025 20:16:54 +0100 Subject: [PATCH 1927/2279] nixos/default.nix: Allow specialArgs to be passed To allow plain nixos configrations the same power as flakes, we must expose specialArgs, otherwise a classic pattern importing all of ones "inputs" (i.e. npins sources), and then exposing them to the module system becomes impossible due to the fact that imports must be statically resolvable so these sources cannot be passed in the existing entry point using _module.args if the sources themselves have modules to be imported. --- nixos/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/default.nix b/nixos/default.nix index f338e13fadb0..f87dd9a93365 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,12 +1,15 @@ { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" , system ? builtins.currentSystem, + # This should only be used for special arguments that need to be evaluated when resolving module structure (like in imports). + # For everything else, there's _module.args. + specialArgs ? { }, }: let eval = import ./lib/eval-config.nix { - inherit system; + inherit system specialArgs; modules = [ configuration ]; }; From 81f8abd620e938e1548144db728d44a39edbff8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:19:55 +0000 Subject: [PATCH 1928/2279] simdjson: 4.1.0 -> 4.2.1 --- pkgs/by-name/si/simdjson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix index de01315c7b0b..f8f355c7ecce 100644 --- a/pkgs/by-name/si/simdjson/package.nix +++ b/pkgs/by-name/si/simdjson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdjson"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; tag = "v${finalAttrs.version}"; - hash = "sha256-N3NPE9R8VipspCwH2dY339WUGt51aqkYpLTr/PPVRQ4="; + hash = "sha256-EuineRyNSwWoMRuev6ZFQNeFgSHjuoHhoGhYD0ls6GQ="; }; nativeBuildInputs = [ cmake ]; From 928c0e4dc76dadc9320d09bfb995678c8b15a99e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:20:01 +0000 Subject: [PATCH 1929/2279] python3Packages.unstructured-inference: 1.0.5 -> 1.1.1 --- .../python-modules/unstructured-inference/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index ecd16432d9cb..68a38bc70197 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "1.0.5"; + version = "1.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; tag = version; - hash = "sha256-3eyavjGUc3qbKuTorAiefisz4TjiG5v/88lsXYmcFmo="; + hash = "sha256-yCLiZe7oSs63dSgN8tijpL2MOygyTmK+6TsC87sHAUQ="; }; propagatedBuildInputs = [ From f251c167806936b8f97613d0af29fcc241aad668 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:39:06 +0000 Subject: [PATCH 1930/2279] libretro.puae: 0-unstable-2025-08-19 -> 0-unstable-2025-11-02 --- pkgs/applications/emulators/libretro/cores/puae.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index 505289eec8a1..62c9a4f8b0d7 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-08-19"; + version = "0-unstable-2025-11-02"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "9e2aa770a9b6b0a4e1f4fc05eb0db6c8e7aba8ee"; - hash = "sha256-YTS0OgYJCGawpsDHvU79dDA+iePna5Fcab2Le3vdVSk="; + rev = "0043cf9c061bd9b81dbc1869c2761017139cfc63"; + hash = "sha256-xi/7zT+4LNfSMwfA+rvxdvsgpQRHceK6Heqrcy84RVk="; }; makefile = "Makefile"; From fa819afd505d9d7dbadf79d62ac7ab9d751896ce Mon Sep 17 00:00:00 2001 From: Letgamer Date: Sat, 8 Nov 2025 22:01:54 +0100 Subject: [PATCH 1931/2279] evil-winrm-py: init at 1.5.0 --- pkgs/by-name/ev/evil-winrm-py/package.nix | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/ev/evil-winrm-py/package.nix diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix new file mode 100644 index 000000000000..8b54b252b938 --- /dev/null +++ b/pkgs/by-name/ev/evil-winrm-py/package.nix @@ -0,0 +1,57 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + libkrb5, + versionCheckHook, + nix-update-script, + enableKerberos ? true, +}: + +python3Packages.buildPythonApplication rec { + pname = "evil-winrm-py"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adityatelange"; + repo = "evil-winrm-py"; + tag = "v${version}"; + hash = "sha256-IACFPPlkgyJh78p6Jy740CQqcySkMTV/8VVPSRJKTPI="; + }; + + # Removes the additional binary ewp + postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"ewp = evil_winrm_py.evil_winrm_py:main",' "" + ''; + + build-system = [ python3Packages.setuptools ]; + + dependencies = + with python3Packages; + [ + pypsrp + prompt-toolkit + tqdm + ] + ++ lib.optionals enableKerberos pypsrp.optional-dependencies.kerberos; + + # Add the C library if Kerberos is enabled + buildInputs = lib.optionals enableKerberos [ libkrb5 ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Execute commands interactively on remote Windows machines using the WinRM protocol"; + homepage = "https://github.com/adityatelange/evil-winrm-py"; + changelog = "https://github.com/adityatelange/evil-winrm-py/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ letgamer ]; + mainProgram = "evil-winrm-py"; + }; +} From c704d00d2a09a8ed661b14af4c4968de67449d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:45:13 +0000 Subject: [PATCH 1932/2279] sftool: 0.1.14 -> 0.1.15 --- pkgs/by-name/sf/sftool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sf/sftool/package.nix b/pkgs/by-name/sf/sftool/package.nix index a67399ac43c4..7a4b0dbe4997 100644 --- a/pkgs/by-name/sf/sftool/package.nix +++ b/pkgs/by-name/sf/sftool/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool"; - version = "0.1.14"; + version = "0.1.15"; src = fetchFromGitHub { owner = "OpenSiFli"; repo = "sftool"; tag = finalAttrs.version; - hash = "sha256-xheGgtE9hZVNa4ceqQCrfiYJwlIuXm00J//0VeZ/afE="; + hash = "sha256-1MNX90qxHyJ5YS6CyIA5TL7JqDyDtgLATJA7qCEJrvI="; }; - cargoHash = "sha256-pimr4OL709EWIoLk/Wq+QAiveLyR/V70nPuzYfZSH/o="; + cargoHash = "sha256-5M44L2EMQ/SIgLbNSGftVsECNSQg2lV6UJmiHROMv7o="; nativeBuildInputs = [ pkg-config From 84a0335b61942a293ffeb5d8770a969a69b7013d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:46:49 +0000 Subject: [PATCH 1933/2279] mtail: 3.2.23 -> 3.2.24 --- 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 478271d5be33..be3e04a604ce 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.2.23"; + version = "3.2.24"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-UxEqPCQDtdVQXPgAOhzUMwXC8NWTSsHDrVLIUzfz5OA="; + hash = "sha256-eRcVpnXc0H/yt5yD693rsT14xzAw0T3QqvhpxqHzn1E="; }; - vendorHash = "sha256-uT0waytDtFavvf6v4lmMAjiX8Dd7GRx54k8L/pOjWNc="; + vendorHash = "sha256-fbsITz+Xn0xxol9ismRDl16BW8trwdSGrehX5sClhdw="; nativeBuildInputs = [ gotools # goyacc From 049ae4afc3046dfdd8408515c986762c8fc2e92e Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 12:53:23 +0100 Subject: [PATCH 1934/2279] wf-config: 0.9.0 -> 0.10.0 --- pkgs/applications/window-managers/wayfire/wf-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 995a71c6a3f5..fe53ca3065d9 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-config"; rev = "v${finalAttrs.version}"; - hash = "sha256-5HejuluCTsRsnHuaMCTnCPkbFvT/IcLkfNGjnXnZjJ0="; + hash = "sha256-WcGt6yl2LpLnAOVtiCyMyWsoMAUMG1MYhvW/m2DDMX4="; }; nativeBuildInputs = [ From 47691257b504378e628fb28692c7f50aec0806c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:55:02 +0000 Subject: [PATCH 1935/2279] python3Packages.model-checker: 1.2.11 -> 1.2.12 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 422a5513b0e4..d5b978ee95eb 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "1.2.11"; + version = "1.2.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-OcF1aJgQFB+YTC6Ksx/WImKciOjodY0wq/KRUAxiqqU="; + hash = "sha256-vIH3CFgFEO+UlmpS7FhBsQtZv5Yep4OQ6koMGzyJGa4="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 3c1c5dbd251594188a12fdf0d07ebf099bacb745 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 11:56:06 +0000 Subject: [PATCH 1936/2279] equicord: 2025-11-02 -> 2025-11-09 --- pkgs/by-name/eq/equicord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index fae5e5d0a724..e70c6365bc34 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { # the Equicord repository. Dates as tags (and automatic releases) were the compromise # we came to with upstream. Please do not change the version schema (e.g., to semver) # unless upstream changes the tag schema from dates. - version = "2025-11-02"; + version = "2025-11-09"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; tag = "${finalAttrs.version}"; - hash = "sha256-SThWYUi4h3OpsP28ouHW1f8+m1dr+wMAYhA/90LBYPg="; + hash = "sha256-tddAMGNcaFj1hygrkQZfutWtgI+JHdYN5BHeW37562w="; }; pnpmDeps = pnpm_10.fetchDeps { From d6647404290a89fca07a601642288fcc283a1620 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:01:38 +0100 Subject: [PATCH 1937/2279] wayfire: 0.9.0 -> 0.10.0 --- .../window-managers/wayfire/default.nix | 22 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index d03bed7e7a49..a62e955e0575 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -17,27 +17,37 @@ libinput, libjpeg, libxkbcommon, + libxml2, + vulkan-headers, wayland, wayland-protocols, wayland-scanner, - wlroots, + wlroots_0_19, pango, - nlohmann_json, xorg, + yyjson, }: +let + wlroots = wlroots_0_19; +in stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xQZ4/UE66IISZQLl702OQXAAr8XmEsA4hJwB7aXua+E="; + hash = "sha256-rnrcuikfRPnIfIkmKUIRh8Sm+POwFLzaZZMAlmeBdjY="; }; + postPatch = '' + substituteInPlace plugins/common/wayfire/plugins/common/cairo-util.hpp \ + --replace "" "" + ''; + nativeBuildInputs = [ meson ninja @@ -53,9 +63,11 @@ stdenv.mkDerivation (finalAttrs: { libinput libjpeg libxkbcommon + libxml2 + vulkan-headers wayland-protocols xorg.xcbutilwm - nlohmann_json + yyjson ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 486b519307ce..9c9d64299417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12924,9 +12924,7 @@ with pkgs; imlib2 = imlib2-nox; }; - wayfire = callPackage ../applications/window-managers/wayfire/default.nix { - wlroots = wlroots_0_17; - }; + wayfire = callPackage ../applications/window-managers/wayfire/default.nix { }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; wayfirePlugins = recurseIntoAttrs ( From 3af6539795d2130ae003f359f8e65bd127741ffa Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 7 Nov 2025 02:01:16 +0100 Subject: [PATCH 1938/2279] python3Packages.pyhanko-certvalidator: 0.26.8 -> 0.29.0 pyhanko-certvalidator was moved into the pyhanko repository, see https://docs.pyhanko.eu/en/latest/changelog.html#certvalidator-release-0-27-0. --- .../pyhanko-certvalidator/default.nix | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index d2663cb70d56..0a7d6dcbd759 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -1,34 +1,43 @@ { lib, - aiohttp, - asn1crypto, buildPythonPackage, - cryptography, fetchFromGitHub, - freezegun, + nix-update-script, + + asn1crypto, + cryptography, oscrypto, + requests, + uritools, + + aiohttp, + freezegun, pytest-asyncio, pytestCheckHook, - pythonOlder, - requests, setuptools, - uritools, }: buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.26.8"; + version = "0.29.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "MatthiasValvekens"; - repo = "certvalidator"; - tag = "v${version}"; - hash = "sha256-Gvahyuz3n/CNAEzMXS5Z0Z85yDqLUQu8Yis5oJ2jaKc="; + repo = "pyhanko"; + tag = "pyhanko-certvalidator/v${version}"; + hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE="; }; + sourceRoot = "${src.name}/pkgs/pyhanko-certvalidator"; + + postPatch = '' + substituteInPlace src/pyhanko_certvalidator/version.py \ + --replace-fail "0.0.0.dev1" "${version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" + substituteInPlace pyproject.toml --replace-fail "0.0.0.dev1" "${version}" + ''; + build-system = [ setuptools ]; dependencies = [ @@ -48,11 +57,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhanko_certvalidator" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex=pyhanko-certvalidator/v(.*)" + ]; + }; + meta = with lib; { description = "Python library for validating X.509 certificates and paths"; - homepage = "https://github.com/MatthiasValvekens/certvalidator"; - changelog = "https://github.com/MatthiasValvekens/certvalidator/blob/v${version}/changelog.md"; + homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-certvalidator"; + changelog = "https://github.com/MatthiasValvekens/pyhanko/blob/pyhanko-certvalidator/${src.tag}/docs/changelog.rst#pyhanko-certvalidator"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.antonmosich ]; }; } From a3d34437576818c60c885af1a6c263d48a9d6b4f Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:06:41 +0100 Subject: [PATCH 1939/2279] wayfirePlugins.wcm: 0.9.0 -> 0.10.0 --- pkgs/applications/window-managers/wayfire/wcm.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index bd23d4faea00..9b633d3b6cbc 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wcm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-oaaEtyu/9XVhFTkmD7WjScMycpKf+M7oPyQatbY23Vo="; + hash = "sha256-O4BYwb+GOMZIn3I2B/WMJ5tUZlaegvwBuyNK9l/gxvQ="; }; nativeBuildInputs = [ @@ -48,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon ]; - mesonFlags = [ - "-Denable_wdisplays=false" - ]; - meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; From 175492b610151d1a2341bfec913b19cacf4c33dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:10:30 +0000 Subject: [PATCH 1940/2279] vscode-extensions.wgsl-analyzer.wgsl-analyzer: 0.11.94 -> 0.11.130 --- .../vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix index 85aa7eb9f808..9114b98200b0 100644 --- a/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/wgsl-analyzer.wgsl-analyzer/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "wgsl-analyzer"; publisher = "wgsl-analyzer"; - version = "0.11.94"; - hash = "sha256-FfQnNFAEh1PwT2M25km+7nEO70mDDQ75p0KHjBlAcLE="; + version = "0.11.130"; + hash = "sha256-bwtyLkMo9+3XQwUzKqSHOlCrSPqJMqKAPF17aeyr4QI="; }; nativeBuildInputs = [ From b20ac845474316dbc657ba9c700dea860d971589 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:22:54 +0000 Subject: [PATCH 1941/2279] wxsqlite3: 4.10.12 -> 4.11.0 --- pkgs/by-name/wx/wxsqlite3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix index 9199d8e7ef29..eb68e3fadbbd 100644 --- a/pkgs/by-name/wx/wxsqlite3/package.nix +++ b/pkgs/by-name/wx/wxsqlite3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.10.12"; + version = "4.11.0"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-3t8SQJdB7ivuCnsr5TxmgslQNkvz+O/mE3NB+R/kXHM="; + hash = "sha256-cTErixQhAruU/mpxnG4Nio4PPtxSeGeNZNHTjZlyn+M="; }; enableParallelBuilding = true; From 03467d17e5fc6836748b5e86eadcb0d3716cab87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:28:55 +0000 Subject: [PATCH 1942/2279] yoshimi: 2.3.5.1 -> 2.3.5.2 --- pkgs/by-name/yo/yoshimi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix index f27f33c179a6..4f2d0a4c264c 100644 --- a/pkgs/by-name/yo/yoshimi/package.nix +++ b/pkgs/by-name/yo/yoshimi/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.5.1"; + version = "2.3.5.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = "yoshimi"; rev = version; - hash = "sha256-A6laO4JhYFjuqBYmaQzZduHbDwdC+8zAVPqifbpJ8JQ="; + hash = "sha256-X4g4AhPHg2ezHnAm8fWunatZgr3/PZxibzACplWogo8="; }; sourceRoot = "${src.name}/src"; From 6a739432b49c1eb3978dd18fad228bf03ae35ea6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:29:24 +0000 Subject: [PATCH 1943/2279] vscode-extensions.vscodevim.vim: 1.31.0 -> 1.32.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 d18f1fc16498..f27663e5cbdb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5116,8 +5116,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.31.0"; - hash = "sha256-97dQeCFm2i5uRF45k1tVMWiXNh5xBw3MVYM8MSIeDFE="; + version = "1.32.0"; + hash = "sha256-qZYtCjqWoqE2qjrJN70ws9/w0FncLCWqTeVX/B66CmQ="; }; meta = { license = lib.licenses.mit; From 6a3505d256aab5be0ff2c604c2a3447d3d0cfaf0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Nov 2025 12:45:40 +0000 Subject: [PATCH 1944/2279] python3Packages.pygerber: skip failing test on darwin --- pkgs/development/python-modules/pygerber/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygerber/default.nix b/pkgs/development/python-modules/pygerber/default.nix index 41484bbede36..fa4a9331517e 100644 --- a/pkgs/development/python-modules/pygerber/default.nix +++ b/pkgs/development/python-modules/pygerber/default.nix @@ -1,8 +1,9 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, + # build-system poetry-core, @@ -38,8 +39,6 @@ buildPythonPackage rec { version = "2.4.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Argmaster"; repo = "pygerber"; @@ -92,6 +91,11 @@ buildPythonPackage rec { "test/gerberx3/test_language_server/tests.py" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # FileNotFoundError: [Errno 2] No such file or directory: 'open' + "test_project_render_with_file_type_tags" + ]; + pytestFlags = [ "--override-ini=required_plugins=" ]; pythonImportsCheck = [ "pygerber" ]; From dc7758c892698470dbf8f4d8753245a8faa2b794 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:53:39 +0000 Subject: [PATCH 1945/2279] ansel: 0-unstable-2025-10-25 -> 0-unstable-2025-11-02 --- pkgs/by-name/an/ansel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index ebd133b45456..3de8a11b806e 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -82,13 +82,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2025-10-25"; + version = "0-unstable-2025-11-02"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "0b268719d9a83c2296b5ce9fcc02bec9ad0f83f9"; - hash = "sha256-LEVXZ9VUMAqDG39Kaew+JYedEqdlfxb5RdyG1X8PVpI="; + rev = "3b86745c11db83d58b949e7ae4b899826631ee1a"; + hash = "sha256-aSQE9vT4ZN0VCEbwXK0/W8xwXpIgbiA5dU4FG5eajv8="; fetchSubmodules = true; }; From 91230d710b076b8eab31df1d367e45a208add280 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 12:55:00 +0000 Subject: [PATCH 1946/2279] python3Packages.zha: 0.0.77 -> 0.0.78 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 23a02f7dab2c..4d4e4fcfceae 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.77"; + version = "0.0.78"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-OtwfSt9KUs4oOCwnKygq/hDOXOhzhT3+KxxY/M9KAdU="; + hash = "sha256-io97gvYtI6wsynWPGm2CAAYyDkMRTUSJwL4N56+sNhw="; }; postPatch = '' From f94eec282edd8c88665781ab6b758dc66de3390c Mon Sep 17 00:00:00 2001 From: Gregor Kleen <20089782+gkleen@users.noreply.github.com> Date: Sun, 9 Nov 2025 13:00:07 +0100 Subject: [PATCH 1947/2279] nixos/pam: fix infinite recursion --- nixos/modules/security/pam.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index c10449454c50..d313187d9fe9 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -2312,8 +2312,7 @@ in environment.etc = lib.mapAttrs' makePAMService enabledServices; systemd = - lib.optionalAttrs - (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services)) + lib.mkIf (lib.any (service: service.updateWtmp) (lib.attrValues config.security.pam.services)) { tmpfiles.packages = [ pkgs.util-linux.lastlog ]; # /lib/tmpfiles.d/lastlog2-tmpfiles.conf services.lastlog2-import = { From a6318ced8e859f814cfe67c0bbe3fc57fb358364 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:15:57 +0100 Subject: [PATCH 1948/2279] wayfirePlugins.wayfire-plugins-extra: 0.9.0 -> 0.10.0 Build all plugins in the subprojects by default. These can be excluded by passing the respective `with*Plugin` attribute. Remove `wayfirePlugins.focus-request` and `wayfirePlugins.wayfire-shadows` as they are now included with `wayfirePlugins.wayfire-plugins-extra`. --- .../window-managers/wayfire/focus-request.nix | 59 ------------------- .../window-managers/wayfire/plugins.nix | 4 +- .../wayfire/wayfire-plugins-extra.nix | 25 +++++--- .../wayfire/wayfire-shadows.nix | 54 ----------------- 4 files changed, 19 insertions(+), 123 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/focus-request.nix delete mode 100644 pkgs/applications/window-managers/wayfire/wayfire-shadows.nix diff --git a/pkgs/applications/window-managers/wayfire/focus-request.nix b/pkgs/applications/window-managers/wayfire/focus-request.nix deleted file mode 100644 index 2b7bd6fad686..000000000000 --- a/pkgs/applications/window-managers/wayfire/focus-request.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - wayfire, - wf-config, - wayland, - pango, - libinput, - libxkbcommon, - librsvg, - libGL, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "focus-request"; - version = "0.8.0.2"; - - src = fetchFromGitLab { - owner = "wayfireplugins"; - repo = "focus-request"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kUYvLC28IPrvnMT/wKFRlOVkc2ohF3k0T/Qrm/zVkpE="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - wf-config - wayland - pango - libinput - libxkbcommon - librsvg - libGL - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - meta = { - homepage = "https://gitlab.com/wayfireplugins/focus-request"; - description = "Wayfire plugin provides a mechanism to grant focus to views that make a focus self-request"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index d456058c245c..e2c81e41505d 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -10,9 +10,7 @@ lib.makeScope pkgs.newScope ( inherit (self) callPackage; in { - focus-request = callPackage ./focus-request.nix { }; wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; - wayfire-shadows = callPackage ./wayfire-shadows.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; windecor = callPackage ./windecor.nix { }; @@ -21,4 +19,6 @@ lib.makeScope pkgs.newScope ( ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 + focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; + wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; } diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 8a5801ec2237..2a96830ffef7 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -8,23 +8,30 @@ wayfire, wayland-scanner, wf-config, + boost, + libdrm, libevdev, libinput, libxkbcommon, - nlohmann_json, + vulkan-headers, xcbutilwm, gtkmm3, + withFiltersPlugin ? true, + withFocusRequestPlugin ? true, + withPixdecorPlugin ? true, + withWayfireShadowsPlugin ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; - hash = "sha256-TukDomxqfrM45+C7azfO8jVaqk3E5irdphH8U5IYItg="; + hash = "sha256-C5dgs81R4XuPjIm7sj1Mtu4IMIRBEYU6izg2olymeVI="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -37,19 +44,21 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire wf-config + boost + libdrm libevdev libinput libxkbcommon - nlohmann_json + vulkan-headers xcbutilwm gtkmm3 ]; mesonFlags = [ - # plugins in submodule, packaged individually - (lib.mesonBool "enable_windecor" false) - (lib.mesonBool "enable_wayfire_shadows" false) - (lib.mesonBool "enable_focus_request" false) + (lib.mesonBool "enable_filters" withFiltersPlugin) + (lib.mesonBool "enable_focus_request" withFocusRequestPlugin) + (lib.mesonBool "enable_pixdecor" withPixdecorPlugin) + (lib.mesonBool "enable_wayfire_shadows" withWayfireShadowsPlugin) ]; env = { diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix deleted file mode 100644 index 9aef4a60e18f..000000000000 --- a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unstableGitUpdater, - meson, - ninja, - pkg-config, - wayfire, - libxkbcommon, - libGL, - libinput, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wayfire-shadows"; - version = "0-unstable-2025-03-04"; - - src = fetchFromGitHub { - owner = "timgott"; - repo = "wayfire-shadows"; - rev = "8257a4f04670d8baf29e2d9cee0d78f978f0233f"; - hash = "sha256-cRayvjbolVxWtr1PbLSjxtIpZogTJaoAMxPOcZ+zBT8="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - libxkbcommon - libGL - libinput - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/timgott/wayfire-shadows"; - description = "Wayfire plugin that adds window shadows"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) From bfa23cd37ec0541e238a3916ccbd7ed3c2cad418 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:36:31 +0100 Subject: [PATCH 1949/2279] wayfirePlugins.wwp-switcher: remove It will also FTBFS with Wayfire 0.10. --- .../window-managers/wayfire/plugins.nix | 2 +- .../window-managers/wayfire/wwp-switcher.nix | 58 ------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/wwp-switcher.nix diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index e2c81e41505d..6e353026e1c1 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -14,11 +14,11 @@ lib.makeScope pkgs.newScope ( wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; windecor = callPackage ./windecor.nix { }; - wwp-switcher = callPackage ./wwp-switcher.nix { }; } ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; + wwp-switcher = throw "wayfirePlugins.wwp-switcher has been removed as it is unmaintained"; } diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix deleted file mode 100644 index afe50faba5b5..000000000000 --- a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unstableGitUpdater, - meson, - ninja, - pkg-config, - wayfire, - libxkbcommon, - libGL, - libinput, - gtk3, - glibmm, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "wwp-switcher"; - version = "0-unstable-2024-07-23"; - - src = fetchFromGitHub { - owner = "wb9688"; - repo = "wwp-switcher"; - rev = "d0cd97534a2a6355697efecb7bcf8f85f5dc4b5b"; - hash = "sha256-cU8INUb+JXlSCM7cAOUBU7z7W0IM6pAGN0izGdFYntc="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - libxkbcommon - libGL - libinput - gtk3 - glibmm - xcbutilwm - ]; - - env = { - PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; - }; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/wb9688/wwp-switcher"; - description = "Plugin to switch active window"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) From 64bfbd50173f6e8e0c5912c4c4b3f35bd96dc9d3 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 13:39:21 +0100 Subject: [PATCH 1950/2279] wayfirePlugins.windecor: remove It will also FTBFS with Wayfire 0.10. --- .../window-managers/wayfire/plugins.nix | 2 +- .../window-managers/wayfire/windecor.nix | 58 ------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/applications/window-managers/wayfire/windecor.nix diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index 6e353026e1c1..4835e498c388 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -13,12 +13,12 @@ lib.makeScope pkgs.newScope ( wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; - windecor = callPackage ./windecor.nix { }; } ) // lib.optionalAttrs config.allowAliases { firedecor = throw "wayfirePlugins.firedecor has been removed as it is unmaintained and no longer used by mate-wayland-session."; # Added 2025-09-03 focus-request = throw "wayfirePlugins.focus-request is now included with wayfirePlugins.wayfire-plugins-extra"; wayfire-shadows = throw "wayfirePlugins.wayfire-shadows is now included with wayfirePlugins.wayfire-plugins-extra"; + windecor = throw "wayfirePlugins.windecor has been removed as it is unmaintained"; wwp-switcher = throw "wayfirePlugins.wwp-switcher has been removed as it is unmaintained"; } diff --git a/pkgs/applications/window-managers/wayfire/windecor.nix b/pkgs/applications/window-managers/wayfire/windecor.nix deleted file mode 100644 index efe72b855df0..000000000000 --- a/pkgs/applications/window-managers/wayfire/windecor.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitLab, - meson, - ninja, - pkg-config, - wayfire, - eudev, - libinput, - libxkbcommon, - librsvg, - libGL, - xcbutilwm, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "windecor"; - version = "0.8.0"; - - src = fetchFromGitLab { - owner = "wayfireplugins"; - repo = "windecor"; - rev = "v${finalAttrs.version}"; - hash = "sha256-v0kGT+KrtfFJ/hp1Dr8izKVj6UHhuW6udHFjWt1y9TY="; - }; - - postPatch = '' - substituteInPlace meson.build \ - --replace "wayfire.get_variable( pkgconfig: 'metadatadir' )" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" - ''; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - wayfire - eudev - libinput - libxkbcommon - librsvg - libGL - xcbutilwm - ]; - - mesonFlags = [ "--sysconfdir=/etc" ]; - - meta = { - homepage = "https://gitlab.com/wayfireplugins/windecor"; - description = "Window decoration plugin for wayfire"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ wineee ]; - inherit (wayfire.meta) platforms; - }; -}) From 5bac3ea83e45cc71a1db9c3fac3450e5780acad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 13:15:15 +0000 Subject: [PATCH 1951/2279] python3Packages.asgineer: 0.9.3 -> 0.9.5 --- pkgs/development/python-modules/asgineer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix index b824c24f3287..6d95f8d71a54 100644 --- a/pkgs/development/python-modules/asgineer/default.nix +++ b/pkgs/development/python-modules/asgineer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "asgineer"; - version = "0.9.3"; + version = "0.9.5"; pyproject = true; src = fetchFromGitHub { owner = "almarklein"; repo = "asgineer"; tag = "v${version}"; - hash = "sha256-Uk1kstEBt321BVeNcfdhZuonmm1i9IXSBnZLa4eDS2E="; + hash = "sha256-8qI5eHt+UmQGZNCn12Iup9dIVd+aI6r3Z1R+u+SziMc="; }; build-system = [ flit-core ]; From 9c8f04498d91e86e5eea20efb081a5c2f1dce27e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 13:15:55 +0000 Subject: [PATCH 1952/2279] python3Packages.pueblo: 0.0.11 -> 0.0.12 --- pkgs/development/python-modules/pueblo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix index 926b16e96e26..6a38aa69eec2 100644 --- a/pkgs/development/python-modules/pueblo/default.nix +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pueblo"; - version = "0.0.11"; + version = "0.0.12"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # should work for us as well. src = fetchPypi { inherit pname version; - hash = "sha256-IQ5NFn1EMh5oLgRlth7VWQmSyMx2/7cmC/U1VW1B4OE="; + hash = "sha256-oo2RNJQUVDqxhfBI6h1KCAgsMjDe7ns3F9qD4eKLVic="; }; build-system = [ From d595d3b51ee33531514af8a3598980c1a1ede9d4 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 9 Nov 2025 14:20:11 +0100 Subject: [PATCH 1953/2279] wayfire: add maintainer teatwig --- pkgs/applications/window-managers/wayfire/default.nix | 1 + pkgs/applications/window-managers/wayfire/wcm.nix | 1 + pkgs/applications/window-managers/wayfire/wf-config.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index a62e955e0575..49acba82cc61 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { description = "3D Wayland compositor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 9b633d3b6cbc..cc9902acc0dc 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wayfire Config Manager"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index fe53ca3065d9..544f577714c7 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for managing configuration files, written for Wayfire"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + teatwig wucke13 wineee ]; From eb8cfea79d7cee6287e4752452824c00963a5f87 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sun, 9 Nov 2025 13:11:14 +0000 Subject: [PATCH 1954/2279] ci: fix "needs: reviewer" label being removed after self review --- ci/github-script/bot.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index 2b52955307ae..65db03ffaee5 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -210,7 +210,7 @@ module.exports = async ({ github, context, core, dry }) => { } } - // Check for any human reviews other than GitHub actions and other GitHub apps. + // Check for any human reviews other than the PR author, GitHub actions and other GitHub apps. // Accounts could be deleted as well, so don't count them. const reviews = ( await github.paginate(github.rest.pulls.listReviews, { @@ -218,7 +218,11 @@ module.exports = async ({ github, context, core, dry }) => { pull_number, }) ).filter( - (r) => r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot', + (r) => + r.user && + !r.user.login.endsWith('[bot]') && + r.user.type !== 'Bot' && + r.user.id !== pull_request.user?.id, ) const approvals = new Set( From 8e9939c0c779d1900153761bddbc7945392fddce Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Tue, 14 Oct 2025 17:53:50 -0400 Subject: [PATCH 1955/2279] svg-term: init at 2.1.1 --- pkgs/by-name/sv/svg-term/package.nix | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/sv/svg-term/package.nix diff --git a/pkgs/by-name/sv/svg-term/package.nix b/pkgs/by-name/sv/svg-term/package.nix new file mode 100644 index 000000000000..403880384937 --- /dev/null +++ b/pkgs/by-name/sv/svg-term/package.nix @@ -0,0 +1,54 @@ +{ + asciinema, + fetchFromGitHub, + fetchYarnDeps, + lib, + makeWrapper, + nodejs, + stdenv, + versionCheckHook, + yarnBuildHook, + yarnConfigHook, + yarnInstallHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "svg-term"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "marionebl"; + repo = "svg-term-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sB4/SM48UmqaYKj6kzfjzITroL0l/QL4Gg5GSrQ+pdk="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-4Q1NP3VhnACcrZ1XUFPtgSlk1Eh8Kp02rOgijoRJFcI="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + yarnBuildHook + yarnConfigHook + yarnInstallHook + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + # Some things work without asciinema on the PATH, but --command does not. + postInstall = '' + wrapProgram $out/bin/svg-term --prefix PATH : ${lib.makeBinPath [ asciinema ]} + ''; + + meta = { + description = "Share terminal sessions as razor-sharp animated SVG everywhere"; + homepage = "https://github.com/marionebl/svg-term-cli"; + license = lib.licenses.mit; + mainProgram = "svg-term"; + maintainers = with lib.maintainers; [ samestep ]; + }; +}) From 5d858facb2af0b04c90ab65cd1c72bb553bdcd45 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 14:42:09 +0100 Subject: [PATCH 1956/2279] nixos/nix-channel: default to channels.nixos.org Infra is interested in deprecating the redirect over the domain apex eventually, since it is just a redirect to channels.nixos.org, which we can more reliably redistribute with a CDN. The nixos.org domain currently offers no IPv6 due to issues we've had with our DNS hoster. (cf. nixos/infra#873) --- nixos/modules/config/nix-channel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 23b414f8194b..b05505687193 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -71,7 +71,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = "https://nixos.org/channels/nixos-unstable"; + default = "https://channels.nixos.org/nixos-unstable"; description = "Default NixOS channel to which the root user is subscribed."; }; }; From c0886dcd92cf588822859d60dce39ee29c710fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 9 Nov 2025 14:46:54 +0100 Subject: [PATCH 1957/2279] joplin-desktop: update electron 36 -> 37 Fixes the build, as electron_36 is EOL and use of it results in eval error. --- pkgs/by-name/jo/joplin-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index ec93ead2a33d..683875115f42 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -13,7 +13,7 @@ cairo, pixman, libsecret, - electron_36, + electron_37, xcbuild, buildPackages, callPackage, @@ -23,7 +23,7 @@ }: let - electron = electron_36; + electron = electron_37; yarn-berry = yarn-berry_4; releaseData = lib.importJSON ./release-data.json; From 47519458d3452e22987a4637be4a7e9d9d44dd7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 13:54:44 +0000 Subject: [PATCH 1958/2279] python3Packages.garminconnect: 0.2.31 -> 0.2.33 --- pkgs/development/python-modules/garminconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 95a97adbf317..c8e895092974 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.31"; + version = "0.2.33"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-yK4p1zb3OLTpDrtVz0bA/jlhDV3AFpltN3CTDBcSTPU="; + hash = "sha256-tQXrJsvdH2YfIpW8iKMBwHZPj2etQDpRaSGojMQ88J0="; }; pythonRelaxDeps = [ From 29cc731fac78f8de726f9bba867f6f96f8274a74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 15:01:11 +0100 Subject: [PATCH 1959/2279] frigate: use python 3.13 --- pkgs/by-name/fr/frigate/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 0d6bfc29aa1d..56dc274ae585 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -2,7 +2,7 @@ lib, stdenv, callPackage, - python312Packages, + python313Packages, fetchFromGitHub, fetchurl, ffmpeg-headless, @@ -27,7 +27,7 @@ let inherit version src; }; - python = python312Packages.python.override { + python = python313Packages.python.override { packageOverrides = self: super: { joserfc = super.joserfc.overridePythonAttrs (oldAttrs: { version = "1.1.0"; @@ -141,7 +141,6 @@ python3Packages.buildPythonApplication rec { distlib fastapi filelock - future importlib-metadata importlib-resources google-generativeai From cd0212752249bd1721061f27104de9d7340107c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 14:02:47 +0000 Subject: [PATCH 1960/2279] fanbox-dl: 0.28.0 -> 0.28.1 --- pkgs/by-name/fa/fanbox-dl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index 47276257c1fd..7b2c20df9a15 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-yrSA9CavQgu89hl+x578geC35KvamfAPOSg33woVI8w="; + hash = "sha256-vXKiShP8RdIT8pRhDkO5K3fBVHQZ9nXv5GAhZaEXj8E="; }; vendorHash = "sha256-uhNitrJeFuFG2XyQrc1JBbExoU6Ln6AFRO2Bgb1+N5M="; From 0596d39e1ce24f9589bb11199b3f3eaae1947acd Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 21 Mar 2025 12:39:43 +0100 Subject: [PATCH 1961/2279] vcv-rack: add support for darwin platform and modernize --- pkgs/by-name/vc/vcv-rack/package.nix | 295 +++++++++++------- .../vc/vcv-rack/rack-minimize-vendoring.patch | 19 +- 2 files changed, 190 insertions(+), 124 deletions(-) diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index da20022db086..efba2d35750c 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -1,5 +1,6 @@ { alsa-lib, + apple-sdk_13, cmake, copyDesktopItems, curl, @@ -21,8 +22,10 @@ libsamplerate, makeDesktopItem, makeWrapper, + openssl, pkg-config, rtmidi, + rsync, speexdsp, stdenv, wrapGAppsHook3, @@ -38,65 +41,65 @@ let owner = "jpommier"; repo = "pffft"; rev = "fbc4058602803f40dc554b8a5d2bcc694c005f2f"; - sha256 = "16biji3115232cr1j975hpxw68lfybajlspnhfjcwg8jz2d8ybrf"; + hash = "sha256-Li+PmvgSPc6kg/ZqKtXyjiLD+4XlJBkyE0OUEEaUcZk="; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; repo = "fuzzysearchdatabase"; rev = "23122d1ff60d936fd766361a30210c954e0c5449"; - sha256 = "1s88blx1rn2racmb8n5g0kh1ym7v21573l5m42c4nz266vmrvrvz"; + hash = "sha256-f+ed6zZGfEuYILXQcUoQ+1Qf4ASvWLQqU1nYHDpdCOk="; }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; repo = "nanovg"; rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756"; - sha256 = "HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; + hash = "sha256-HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; }; nanosvg-source = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; - sha256 = "1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l"; + hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; }; osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; rev = "d0f64f0798c2e47f61d90a5505910ff2d63ca049"; - sha256 = "1d3058x6wgzw7b0wai792flk7s6ffw0z4n9sl016v91yjwv7ds3a"; + hash = "sha256-auh2Npc+pG0CoDpZ8gF3zugzqRPpRMXBOvw/bjoqYLQ="; }; oui-blendish-source = fetchFromGitHub { owner = "VCVRack"; repo = "oui-blendish"; rev = "2fc6405883f8451944ed080547d073c8f9f31898"; - sha256 = "1bs0654312555vm7nzswsmky4l8759bjdk17pl22p49rw9k4a1px"; + hash = "sha256-/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; }; simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; rev = "416091ebdb9e901b29d026633e73167d6353a0b0"; - sha256 = "064ygc6c737yjx04rydwwhkr4n4s4rbvj27swxwyzvp1h8nka6xf"; + hash = "sha256-rhs1LYLh7u955/oIuVcmmliSJ+S8+UxAl/6Mwwx7nhg="; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; rev = "9907207e5def0fabdb60c443517b0d9e9d521393"; - sha256 = "0xbpd09zvrk2ppm1qm1skk6p50mqr9mzjixv3s0biqq6jpabs88l"; + hash = "sha256-FCG91JUG47iAHrtH+WvKuIJyzZw6VBzqvWLm/RNod3U="; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "5ed79544161e0fa9a55faa7c0a5f299e828e12ab"; # tip of branch v2 - sha256 = "0c6qpigyr0ppvra20hcy1fdcmqa212jckb9wkx4f6fgdby7565wv"; + rev = "b453f192d22b1c951d71e8a73f28a37cd96a7b6c"; # tip of branch v2 + hash = "sha256-Wr5G2wgCMIduMqFdIJUtkWQEbvihte/WZb/qUWXGE04="; }; vcv-rtaudio = stdenv.mkDerivation { pname = "vcv-rtaudio"; - version = "unstable-2020-01-30"; + version = "5.1.0-unstable-2020-01-30"; src = fetchFromGitHub { owner = "VCVRack"; repo = "rtaudio"; rev = "ece277bd839603648c80c8a5f145678e13bc23f3"; # tip of master branch - sha256 = "11gpl0ak757ilrq4fi0brj0chmlcr1hihc32yd7qza4fxjw2yx2v"; + hash = "sha256-W3QvuOyOqI9P82IwGGHIjFbIgMwLREdwpvGUMxWg94U="; }; nativeBuildInputs = [ @@ -104,28 +107,33 @@ let pkg-config ]; - buildInputs = [ - alsa-lib - libjack2 - libpulseaudio - ]; + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libjack2 + libpulseaudio + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; cmakeFlags = [ - "-DRTAUDIO_API_ALSA=ON" - "-DRTAUDIO_API_PULSE=ON" - "-DRTAUDIO_API_JACK=ON" - "-DRTAUDIO_API_CORE=OFF" + (lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "RTAUDIO_API_PULSE" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "RTAUDIO_API_JACK" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "RTAUDIO_API_CORE" stdenv.hostPlatform.isDarwin) ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vcv-rack"; version = "2.6.0"; desktopItems = [ (makeDesktopItem { type = "Application"; - name = pname; + name = "vcv-rack"; desktopName = "VCV Rack"; genericName = "Eurorack simulator"; comment = "Create music by patching together virtual synthesizer modules"; @@ -143,7 +151,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-leI0wwhYiA8qktJFe6DuZjs6q5tMFQ4WFLD4Ivom5+E="; }; @@ -151,70 +159,104 @@ stdenv.mkDerivation rec { ./rack-minimize-vendoring.patch ]; - prePatch = '' - # As we can't use `make dep` to set up the dependencies (as explained - # above), we do it here manually - mkdir -p dep/include + prePatch = + '' + # As we can't use `make dep` to set up the dependencies (as explained + # above), we do it here manually + mkdir -p dep/include - cp -r ${pffft-source}/* dep/pffft - cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase - cp -r ${nanovg-source}/* dep/nanovg - cp -r ${nanosvg-source}/* dep/nanosvg - cp -r ${osdialog-source}/* dep/osdialog - cp -r ${oui-blendish-source}/* dep/oui-blendish - cp -r ${simde-source}/* dep/simde - cp -r ${tinyexpr-source}/* dep/tinyexpr + cp -r ${pffft-source}/* dep/pffft + cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase + cp -r ${nanovg-source}/* dep/nanovg + cp -r ${nanosvg-source}/* dep/nanosvg + cp -r ${osdialog-source}/* dep/osdialog + cp -r ${oui-blendish-source}/* dep/oui-blendish + cp -r ${simde-source}/* dep/simde + cp -r ${tinyexpr-source}/* dep/tinyexpr - cp dep/pffft/*.h dep/include - cp dep/fuzzysearchdatabase/src/*.hpp dep/include - cp dep/nanosvg/**/*.h dep/include - cp dep/nanovg/src/*.h dep/include - cp dep/osdialog/*.h dep/include - cp dep/oui-blendish/*.h dep/include - cp -r dep/simde/simde dep/include - cp dep/tinyexpr/tinyexpr.h dep/include + cp dep/pffft/*.h dep/include + cp dep/fuzzysearchdatabase/src/*.hpp dep/include + cp dep/nanosvg/**/*.h dep/include + cp dep/nanovg/src/*.h dep/include + cp dep/osdialog/*.h dep/include + cp dep/oui-blendish/*.h dep/include + cp -r dep/simde/simde dep/include + cp dep/tinyexpr/tinyexpr.h dep/include - # Build and dist the Fundamental plugins - cp -r ${fundamental-source} plugins/Fundamental/ - chmod -R +rw plugins/Fundamental # will be used as build dir - substituteInPlace plugin.mk --replace ":= all" ":= dist" - substituteInPlace plugins/Fundamental/src/Logic.cpp \ - --replace \ - "LightButton>" \ - "struct rack::componentlibrary::LightButton>" + # Build and dist the Fundamental plugins + cp -r ${fundamental-source} plugins/Fundamental/ + chmod -R +rw plugins/Fundamental # will be used as build dir + substituteInPlace plugin.mk --replace-fail ":= all" ":= dist" + substituteInPlace plugins/Fundamental/src/Logic.cpp \ + --replace-fail \ + "LightButton>" \ + "struct rack::componentlibrary::LightButton>" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # Fix reference to zenity + substituteInPlace dep/osdialog/osdialog_zenity.c \ + --replace-fail 'zenityBin[] = "zenity"' 'zenityBin[] = "${lib.getExe zenity}"' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # * Set VERSION from finalAttrs to avoid build using git to determine version + # * Darwin needs to build the dist target, which builds the .app container, + # yet we want to exclude the documentation from dist target. + # * Replace path to Fundamental module with path to produced build artifact + # to avoid downloading a pre-compiled version + substituteInPlace Makefile \ + --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ + --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ + --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' + # Skip codesigning + substituteInPlace plugin.mk \ + --replace-fail '$(CODESIGN)' '#$(CODESIGN)' - # Fix reference to zenity - substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${zenity}/bin/zenity"' - ''; + # To support macOS drag & drop a custom glfw patch is needed + # (see https://github.com/glfw/glfw/pull/1579 for details). + # Since the patch does not apply cleanly on the current glfw contained in nixpkgs + # disable drag & drop functionality for the time being. + substituteInPlace adapters/standalone.cpp \ + --replace-fail 'glfwGetOpenedFilenames()' 'NULL' + ''; - nativeBuildInputs = [ - copyDesktopItems - imagemagick - jq - libicns - makeWrapper - pkg-config - wrapGAppsHook3 - ]; - buildInputs = [ - alsa-lib - curl - ghc_filesystem - glew - glfw - zenity - gtk3-x11 - jansson - libarchive - libjack2 - libpulseaudio - libsamplerate - rtmidi - speexdsp - vcv-rtaudio - zstd - ]; + nativeBuildInputs = + [ + jq + makeWrapper + pkg-config + ] + ++ lib.optionals stdenv.isLinux [ + copyDesktopItems + libicns + imagemagick + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.isDarwin [ rsync ]; + + buildInputs = + [ + curl + ghc_filesystem + glew + glfw + jansson + libarchive + libsamplerate + rtmidi + speexdsp + vcv-rtaudio + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + gtk3-x11 + libjack2 + libpulseaudio + zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + + enableParallelBuilding = true; makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -225,37 +267,64 @@ stdenv.mkDerivation rec { "plugins" ]; - installPhase = '' - runHook preInstall - - install -D -m755 -t $out/bin Rack - install -D -m755 -t $out/lib libRack.so - - mkdir -p $out/share/vcv-rack - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack - cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin - - # Extract pngs from the Apple icon image and create - # the missing ones from the 1024x1024 image. - icns2png --extract icon.icns - for size in 16 24 32 48 64 128 256 512 1024; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ ! -e icon_"$size"x"$size"x32.png ] ; then - convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png - fi - install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png - done; - - runHook postInstall + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + # To be able to use enableParallelBuilding = true + # the dist target needs run after the buildPhase as + # it depends on the all and plugin targets. + make "SED=sed -i" dist ''; + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + + install -D -m755 -t $out/bin Rack + install -D -m755 -t $out/lib libRack.so + + mkdir -p $out/share/vcv-rack + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack + cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin + + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract icon.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ ! -e icon_"$size"x"$size"x32.png ] ; then + convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png + fi + install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png + done; + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{bin,Applications} + mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ + $out/Applications + + # plugins/Fundamental/dist/Fundamental-*.vcvplugin + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt \ + $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources + '' + + '' + runHook postInstall + ''; + dontWrapGApps = true; - postFixup = '' - # Wrap gApp and override the default global resource file directory - wrapProgram $out/bin/Rack \ - "''${gappsWrapperArgs[@]}" \ - --add-flags "-s $out/share/vcv-rack" - ''; + postFixup = + lib.optionalString stdenv.hostPlatform.isLinux '' + # Wrap gApp and override the default global resource file directory + wrapProgram $out/bin/Rack \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "-s $out/share/vcv-rack" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper \ + $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/MacOS/Rack \ + $out/bin/${finalAttrs.meta.mainProgram} \ + --add-flags "-s $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources" + ''; meta = with lib; { description = "Open-source virtual modular synthesizer"; @@ -273,6 +342,6 @@ stdenv.mkDerivation rec { ddelabru ]; mainProgram = "Rack"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch index 58f1b1f16f07..90bb80221288 100644 --- a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch @@ -1,13 +1,10 @@ -diff --git a/Makefile b/Makefile -index fc7c3af1..c3672c6a 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,7 @@ ifdef ARCH_LIN - - LDFLAGS += -Wl,--whole-archive - LDFLAGS += -static-libstdc++ -static-libgcc +diff --git i/Makefile w/Makefile +index 1d6accc6..f772883c 100644 +--- i/Makefile ++++ w/Makefile +@@ -38 +38 @@ ifdef ARCH_LIN - LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a + LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio - LDFLAGS += -Wl,--no-whole-archive - LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple - endif +@@ -53 +53 @@ ifdef ARCH_MAC +- LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a -Wl,-load_hidden,dep/lib/libarchive.a -Wl,-load_hidden,dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a -Wl,-load_hidden,dep/lib/librtmidi.a -Wl,-load_hidden,dep/lib/librtaudio.a ++ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio From 526f5a1c0c9a8c71be3924bbec2dd7aced355f63 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 21 Mar 2025 14:40:07 +0100 Subject: [PATCH 1962/2279] vcv-rack: 2.6.0 -> 2.6.6 --- pkgs/by-name/vc/vcv-rack/package.nix | 340 ++++++++++-------- .../vc/vcv-rack/rack-minimize-vendoring.patch | 7 +- 2 files changed, 185 insertions(+), 162 deletions(-) diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index efba2d35750c..337995abe01e 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -6,6 +6,7 @@ curl, fetchFromBitbucket, fetchFromGitHub, + fetchpatch, ghc_filesystem, glew, glfw, @@ -37,11 +38,12 @@ let # Unfortunately, they are not pinned, so we have no guarantee that they # will be stable, and therefore, we can't use them directly. Instead # we'll have to fetch them separately ourselves. - pffft-source = fetchFromBitbucket { - owner = "jpommier"; - repo = "pffft"; - rev = "fbc4058602803f40dc554b8a5d2bcc694c005f2f"; - hash = "sha256-Li+PmvgSPc6kg/ZqKtXyjiLD+4XlJBkyE0OUEEaUcZk="; + # The revs used here have been determined using git submodule status. + filesystem-source = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "7e37433f318488ae4bc80f80e12df12a01579874"; + hash = "sha256-dHwNsuuFkhd9Y24KRzGV9Z9UZolNtOtxyA1AEVG7uMU="; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; @@ -49,23 +51,23 @@ let rev = "23122d1ff60d936fd766361a30210c954e0c5449"; hash = "sha256-f+ed6zZGfEuYILXQcUoQ+1Qf4ASvWLQqU1nYHDpdCOk="; }; + nanosvg-source = fetchFromGitHub { + owner = "memononen"; + repo = "nanosvg"; + rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949"; + hash = "sha256-b/aBmvuvKScF8zSkyF1tuqL9hov4XVLzKLTpr6p7mIQ="; + }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; repo = "nanovg"; rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756"; hash = "sha256-HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg="; }; - nanosvg-source = fetchFromGitHub { - owner = "memononen"; - repo = "nanosvg"; - rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; - hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; - }; osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; - rev = "d0f64f0798c2e47f61d90a5505910ff2d63ca049"; - hash = "sha256-auh2Npc+pG0CoDpZ8gF3zugzqRPpRMXBOvw/bjoqYLQ="; + rev = "64482bde25a8e19cc38342ed21aa0e38c2751f6c"; + hash = "sha256-FiejDeZkLoyS7BBwPYBfdOCLxBV8hAFzJAFeTz80tH0="; }; oui-blendish-source = fetchFromGitHub { owner = "VCVRack"; @@ -73,33 +75,39 @@ let rev = "2fc6405883f8451944ed080547d073c8f9f31898"; hash = "sha256-/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; }; + pffft-source = fetchFromBitbucket { + owner = "jpommier"; + repo = "pffft"; + rev = "74d7261be17cf659d5930d4830609406bd7553e3"; + hash = "sha256-gYaumUeXYf3axAexGqWI/tYBs1dyebjAESo4o/DTjCA="; + }; simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; - rev = "416091ebdb9e901b29d026633e73167d6353a0b0"; - hash = "sha256-rhs1LYLh7u955/oIuVcmmliSJ+S8+UxAl/6Mwwx7nhg="; + rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4"; + hash = "sha256-21YBpP7jwFqNiOu5Ilu8t9nt+AZmLc3PVEwHAWn7vM8="; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; - rev = "9907207e5def0fabdb60c443517b0d9e9d521393"; - hash = "sha256-FCG91JUG47iAHrtH+WvKuIJyzZw6VBzqvWLm/RNod3U="; + rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2"; + hash = "sha256-jYC0kSmYdzJsEaH9gres/NOcfsh+2ymqZAGxNbjus/s="; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "b453f192d22b1c951d71e8a73f28a37cd96a7b6c"; # tip of branch v2 - hash = "sha256-Wr5G2wgCMIduMqFdIJUtkWQEbvihte/WZb/qUWXGE04="; + rev = "v2.6.4"; + hash = "sha256-rpOIMFO17ixgJZDRRg6RdLKorN/XKCUXkapsxN1pmQ4="; }; vcv-rtaudio = stdenv.mkDerivation { pname = "vcv-rtaudio"; - version = "5.1.0-unstable-2020-01-30"; + version = "5.1.0-unstable-2022-11-22"; src = fetchFromGitHub { owner = "VCVRack"; repo = "rtaudio"; - rev = "ece277bd839603648c80c8a5f145678e13bc23f3"; # tip of master branch - hash = "sha256-W3QvuOyOqI9P82IwGGHIjFbIgMwLREdwpvGUMxWg94U="; + rev = "22d64cdcb151e388791caceee8aa0011a6aa46e0"; # tip of master branch + hash = "sha256-BW5XwbsuwbbFDHXnQrUMM+1p7Zy7zjwdHHQFGo2XMv0="; }; nativeBuildInputs = [ @@ -107,16 +115,15 @@ let pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libjack2 - libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libjack2 + libpulseaudio + ] + ++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; cmakeFlags = [ (lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux) @@ -128,7 +135,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vcv-rack"; - version = "2.6.0"; + version = "2.6.6"; desktopItems = [ (makeDesktopItem { @@ -152,109 +159,125 @@ stdenv.mkDerivation (finalAttrs: { owner = "VCVRack"; repo = "Rack"; tag = "v${finalAttrs.version}"; - hash = "sha256-leI0wwhYiA8qktJFe6DuZjs6q5tMFQ4WFLD4Ivom5+E="; + hash = "sha256-v5/zk1eT5PRB4bwpCdlKb0nr7qERDM9jP5Q78F30O78="; }; patches = [ + # N.B.: Loading modules may fail due to symbols used by the moodules + # not being found, to address this issue the libraries providing the + # symbols are re-exported when building on Darwin using -Wl,-reexport-l. ./rack-minimize-vendoring.patch + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (fetchpatch { + name = "fix-segfault-on-linux.patch"; + url = "https://github.com/VCVRack/Rack/pull/1944.patch"; + hash = "sha256-dlndyCfCznGDzlWNWrQTgh+FtmsrrL2DVuRE0xCxUck="; + }) ]; - prePatch = - '' - # As we can't use `make dep` to set up the dependencies (as explained - # above), we do it here manually - mkdir -p dep/include + prePatch = '' + # As we can't use `make dep` to set up the dependencies (as explained + # above), we do it here manually + mkdir -p dep/include - cp -r ${pffft-source}/* dep/pffft - cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase - cp -r ${nanovg-source}/* dep/nanovg - cp -r ${nanosvg-source}/* dep/nanosvg - cp -r ${osdialog-source}/* dep/osdialog - cp -r ${oui-blendish-source}/* dep/oui-blendish - cp -r ${simde-source}/* dep/simde - cp -r ${tinyexpr-source}/* dep/tinyexpr + cp -r ${filesystem-source}/* dep/filesystem + cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase + cp -r ${nanosvg-source}/* dep/nanosvg + cp -r ${nanovg-source}/* dep/nanovg + cp -r ${osdialog-source}/* dep/osdialog + cp -r ${oui-blendish-source}/* dep/oui-blendish + cp -r ${pffft-source}/* dep/pffft + cp -r ${simde-source}/* dep/simde + cp -r ${tinyexpr-source}/* dep/tinyexpr - cp dep/pffft/*.h dep/include - cp dep/fuzzysearchdatabase/src/*.hpp dep/include - cp dep/nanosvg/**/*.h dep/include - cp dep/nanovg/src/*.h dep/include - cp dep/osdialog/*.h dep/include - cp dep/oui-blendish/*.h dep/include - cp -r dep/simde/simde dep/include - cp dep/tinyexpr/tinyexpr.h dep/include + cp dep/pffft/*.h dep/include + cp dep/fuzzysearchdatabase/src/*.hpp dep/include + cp dep/nanosvg/**/*.h dep/include + cp dep/nanovg/src/*.h dep/include + cp dep/osdialog/*.h dep/include + cp dep/oui-blendish/*.h dep/include + cp -r dep/simde/simde dep/include + cp dep/tinyexpr/tinyexpr.h dep/include - # Build and dist the Fundamental plugins - cp -r ${fundamental-source} plugins/Fundamental/ - chmod -R +rw plugins/Fundamental # will be used as build dir - substituteInPlace plugin.mk --replace-fail ":= all" ":= dist" - substituteInPlace plugins/Fundamental/src/Logic.cpp \ - --replace-fail \ - "LightButton>" \ - "struct rack::componentlibrary::LightButton>" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - # Fix reference to zenity - substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace-fail 'zenityBin[] = "zenity"' 'zenityBin[] = "${lib.getExe zenity}"' - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # * Set VERSION from finalAttrs to avoid build using git to determine version - # * Darwin needs to build the dist target, which builds the .app container, - # yet we want to exclude the documentation from dist target. - # * Replace path to Fundamental module with path to produced build artifact - # to avoid downloading a pre-compiled version - substituteInPlace Makefile \ - --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ - --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ - --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' - # Skip codesigning - substituteInPlace plugin.mk \ - --replace-fail '$(CODESIGN)' '#$(CODESIGN)' + # Build and dist the Fundamental plugins + cp -r ${fundamental-source} plugins/Fundamental/ + chmod -R +rw plugins/Fundamental # will be used as build dir + substituteInPlace plugin.mk --replace-fail ":= all" ":= dist" + substituteInPlace plugins/Fundamental/src/Logic.cpp \ + --replace-fail \ + "LightButton>" \ + "struct rack::componentlibrary::LightButton>" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + # Fix reference to zenity + substituteInPlace dep/osdialog/osdialog_zenity.c \ + --replace-fail 'zenityBin[] = "zenity"' 'zenityBin[] = "${lib.getExe zenity}"' + # For some unknown reason __yield isn't available on aarch64-linux + substituteInPlace src/engine/Engine.cpp \ + --replace-fail '__yield();' 'asm volatile("yield");' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # * Set VERSION from finalAttrs to avoid build using git to determine version + # * Darwin needs to build the dist target, which builds the .app container, + # yet we want to exclude the documentation from dist target. + # * Skip stripping the binary to avoid "unsupported load command" error, which + # appears since several libraries are re-exported (see rack-minimize-vendoring.patch) + # * Replace path to Fundamental module with path to produced build artifact + # to avoid downloading a pre-compiled version + substituteInPlace Makefile \ + --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ + --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ + --replace-fail '$(STRIP)' '#$(STRIP)' \ + --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' - # To support macOS drag & drop a custom glfw patch is needed - # (see https://github.com/glfw/glfw/pull/1579 for details). - # Since the patch does not apply cleanly on the current glfw contained in nixpkgs - # disable drag & drop functionality for the time being. - substituteInPlace adapters/standalone.cpp \ - --replace-fail 'glfwGetOpenedFilenames()' 'NULL' - ''; + # Skip codesigning + substituteInPlace plugin.mk \ + --replace-fail '$(CODESIGN)' '#$(CODESIGN)' - nativeBuildInputs = - [ - jq - makeWrapper - pkg-config - ] - ++ lib.optionals stdenv.isLinux [ - copyDesktopItems - libicns - imagemagick - wrapGAppsHook3 - ] - ++ lib.optionals stdenv.isDarwin [ rsync ]; + # To support macOS drag & drop a custom glfw patch is needed + # (see https://github.com/glfw/glfw/pull/1579 for details). + # Since the patch does not apply cleanly on the current glfw contained in nixpkgs + # disable drag & drop functionality for the time being. + substituteInPlace adapters/standalone.cpp \ + --replace-fail 'glfwGetOpenedFilenames()' 'NULL' + ''; - buildInputs = - [ - curl - ghc_filesystem - glew - glfw - jansson - libarchive - libsamplerate - rtmidi - speexdsp - vcv-rtaudio - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - gtk3-x11 - libjack2 - libpulseaudio - zenity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + nativeBuildInputs = [ + jq + makeWrapper + pkg-config + zstd + ] + ++ lib.optionals stdenv.isLinux [ + copyDesktopItems + imagemagick + libicns + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.isDarwin [ rsync ]; + + buildInputs = [ + curl + ghc_filesystem + glew + glfw + jansson + libarchive + libsamplerate + rtmidi + speexdsp + vcv-rtaudio + zstd + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + gtk3-x11 + libjack2 + libpulseaudio + zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; enableParallelBuilding = true; @@ -267,49 +290,48 @@ stdenv.mkDerivation (finalAttrs: { "plugins" ]; + # To be able to use enableParallelBuilding = true + # the dist target needs run after the buildPhase as + # it depends on the all and plugin targets. postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - # To be able to use enableParallelBuilding = true - # the dist target needs run after the buildPhase as - # it depends on the all and plugin targets. make "SED=sed -i" dist ''; - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + installPhase = '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' - install -D -m755 -t $out/bin Rack - install -D -m755 -t $out/lib libRack.so + install -D -m755 -t $out/bin Rack + install -D -m755 -t $out/lib libRack.so - mkdir -p $out/share/vcv-rack - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack - cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin + mkdir -p $out/share/vcv-rack + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack + cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin - # Extract pngs from the Apple icon image and create - # the missing ones from the 1024x1024 image. - icns2png --extract icon.icns - for size in 16 24 32 48 64 128 256 512 1024; do - mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps - if [ ! -e icon_"$size"x"$size"x32.png ] ; then - convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png - fi - install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png - done; - '' - + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{bin,Applications} - mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ - $out/Applications + # Extract pngs from the Apple icon image and create + # the missing ones from the 1024x1024 image. + icns2png --extract icon.icns + for size in 16 24 32 48 64 128 256 512 1024; do + mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps + if [ ! -e icon_"$size"x"$size"x32.png ] ; then + convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png + fi + install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png + done; + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{bin,Applications} + mv dist/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app' \ + $out/Applications - # plugins/Fundamental/dist/Fundamental-*.vcvplugin - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt \ - $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources - '' - + '' - runHook postInstall - ''; + # plugins/Fundamental/dist/Fundamental-*.vcvplugin + cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt \ + $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources + '' + + '' + runHook postInstall + ''; dontWrapGApps = true; postFixup = diff --git a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch index 90bb80221288..5e97b862ab83 100644 --- a/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch @@ -1,10 +1,11 @@ diff --git i/Makefile w/Makefile -index 1d6accc6..f772883c 100644 +index 1d6accc6..fc09198e 100644 --- i/Makefile +++ w/Makefile @@ -38 +38 @@ ifdef ARCH_LIN - LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a + LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio -@@ -53 +53 @@ ifdef ARCH_MAC +@@ -52,2 +52 @@ ifdef ARCH_MAC +- LDFLAGS += -Wl,-all_load - LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a -Wl,-load_hidden,dep/lib/libarchive.a -Wl,-load_hidden,dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a -Wl,-load_hidden,dep/lib/librtmidi.a -Wl,-load_hidden,dep/lib/librtaudio.a -+ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio ++ LDFLAGS += -Wl,-reexport-lGLEW -Wl,-reexport-lglfw -Wl,-reexport-ljansson -lcurl -lssl -lcrypto -larchive -lz -Wl,-reexport-lspeexdsp -lsamplerate -lrtmidi -lrtaudio From 028597e20d19f8ab80a1a288c5ce8c25535559cf Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 9 Nov 2025 15:15:27 +0100 Subject: [PATCH 1963/2279] cryptomator: switch from openjdk to zulu The javafx build of openjdk25 is broken. Zulu also provides pre built javafx binaries. --- pkgs/by-name/cr/cryptomator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index 616ed7a5208a..f89a4ec587b6 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fuse3, glib, - jdk25, + zulu25, lib, libayatana-appindicator, makeShellWrapper, @@ -13,7 +13,7 @@ }: let - jdk = jdk25.override { enableJavaFX = true; }; + jdk = zulu25.override { enableJavaFX = true; }; in maven.buildMavenPackage rec { pname = "cryptomator"; From 51300f95c16930ae708bf9064856872b0cced877 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 9 Nov 2025 15:18:18 +0100 Subject: [PATCH 1964/2279] cryptomator: 1.16.2 -> 1.17.1 --- pkgs/by-name/cr/cryptomator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index f89a4ec587b6..e0547ce0220f 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,18 +17,18 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.16.2"; + version = "1.17.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-U/I18OtinWlk8d9OLLAzZHoN5d8KHx9CUoZsv2mrQtw="; + hash = "sha256-2iWeF2su55yQjiFe8nyqTgqNDZuj2+JpzAx5tQJE1Z0="; }; mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-uQz70epBFKTyX/PpOyWBtxHOiX0OQT3aTX6KWKwLc1I="; + mvnHash = "sha256-lbyNCuZOYIoznOV+DHuhNFk9ALNQbMMXBrF7y246ktE="; preBuild = '' VERSION=${version} From 832e9bbe03212ceac88d03e0c447c839369992cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 14:23:16 +0000 Subject: [PATCH 1965/2279] libretro.fbneo: 0-unstable-2025-11-02 -> 0-unstable-2025-11-06 --- pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 0fa8f419c63b..f60fe55951f4 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-11-02"; + version = "0-unstable-2025-11-06"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "442a0e901c3d7d60c94f21caf46c0535233086f6"; - hash = "sha256-ewwF7btf5EEBmGzAVuH4LavrDpmVzEBD/BE1/T/p6bM="; + rev = "7759881be43b5f1711c95a2a80aa8987a98fbb99"; + hash = "sha256-vYHWJV5xRACjdllmeg/3tr2WgI4QcWtuhKJhEwGIGD0="; }; makefile = "Makefile"; From 20501b5a276492cc71a3952bb0a1ee0e852b3c46 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Nov 2025 15:22:41 +0100 Subject: [PATCH 1966/2279] nixos/lib/make-{single,multi}-disk-zfs-image: fix references to kernel modules Closes #455144 Previously, image builds with ZFS would fail with kernel-modules-shrunk> root module: 9p kernel-modules-shrunk> modprobe: FATAL: Module 9p not found in directory /nix/store/r4m7bmihmr40377yh33pn76wp9w33da2-kernel-modules/lib/modules/6.12.53 with said store-path only containing out-of-tree modules. I'm pretty sure this was just missed to update in f71277d66db862f2cef133e9d63cb858f38d0a0c. --- nixos/lib/make-multi-disk-zfs-image.nix | 1 + nixos/lib/make-single-disk-zfs-image.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index cbb2fdf7b6c5..55e54b3b2f0d 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -126,6 +126,7 @@ let with config.boot; [ kernelPackages.kernel + (lib.getOutput "modules" kernelPackages.kernel) kernelPackages.${pkgs.zfs.kernelModuleAttribute} ] ); diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index 74cbaaa7edfe..dbd68a768847 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -114,6 +114,7 @@ let with config.boot; [ kernelPackages.kernel + (lib.getOutput "modules" kernelPackages.kernel) kernelPackages.${pkgs.zfs.kernelModuleAttribute} ] ); From 47b8be7fe54379048eb856a07fae0172e3fb24b0 Mon Sep 17 00:00:00 2001 From: "Katja Ramona Sophie Kwast (zaphyra)" Date: Sat, 8 Nov 2025 23:54:55 +0100 Subject: [PATCH 1967/2279] gomuks-web: 0.4.0-unstable-2025-04-22 -> 0.2025.11-unstable-2025-11-01 --- maintainers/maintainer-list.nix | 12 +- pkgs/by-name/go/gomuks-web/package.nix | 145 ++++++++++++++----------- 2 files changed, 89 insertions(+), 68 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 535ef1d43934..1213e167aa29 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5417,12 +5417,6 @@ githubId = 202474; name = "Jens Reimann"; }; - ctucx = { - email = "katja@ctu.cx"; - github = "katjakwast"; - githubId = 176372446; - name = "Katja Kwast"; - }; cupcakearmy = { name = "Niccolo Borgioli"; email = "nix@nicco.io"; @@ -29002,6 +28996,12 @@ githubId = 450885; name = "Francesco Zanini"; }; + zaphyra = { + email = "katja@zaphyra.eu"; + github = "katjakwast"; + githubId = 176372446; + name = "Katja Kwast"; + }; zareix = { email = "contact@raphael-catarino.fr"; github = "zareix"; diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix index 487b90b5d8e4..f1fa466e1325 100644 --- a/pkgs/by-name/go/gomuks-web/package.nix +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -1,74 +1,95 @@ { lib, fetchFromGitHub, + fetchNpmDeps, buildGoModule, - buildNpmPackage, - stdenv, - olm, + nodejs, + npmHooks, unstableGitUpdater, - withGoolm ? false, }: -let - cppStdLib = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; +buildGoModule ( + finalAttrs: + let + ver = "0.2025.11"; + revDate = "2025-11-01"; + rev = "be0d4487871c196d0c47bb1b6ac7ce9252d424de"; + srcHash = "sha256-x7M7d8obnt8mpH1ZRev8c39PE5ZlgssgusGvrLaF/vg="; + vendorHash = "sha256-TDvTZ0n324pNPAPMZMhWq0LdDUqFrzBXNVNdfMlxqeQ="; + npmDepsHash = "sha256-4Ir4uq9Hg6Hwj21P/H7xWdVPzYrDrXiouEtjnLJj4Ko="; -in -buildGoModule (finalAttrs: { - pname = "gomuks-web"; - version = "0.4.0-unstable-2025-04-22"; + in + { + pname = "gomuks-web"; + version = "${ver}-unstable-${revDate}"; - src = fetchFromGitHub { - owner = "tulir"; - repo = "gomuks"; - rev = "fd257ed74c9df42e5b6d14d3c6a283f557f61666"; - hash = "sha256-jMDLfiwkUme2bxE+ZEtUoNMwZ7GuGGzCV2dH1V87YtQ="; - }; + inherit vendorHash; - frontend = buildNpmPackage { - name = "${finalAttrs.pname}_${finalAttrs.version}-frontend"; - src = "${finalAttrs.src}/web"; - inherit (finalAttrs) version; - - npmDepsHash = "sha256-Mt2gJ1lLT3oQ3RKr3XTVFXkS/Xmjy0gahbdaxxrO+6g="; - - installPhase = '' - cp -r dist $out - ''; - }; - - vendorHash = "sha256-qeSxxd9ml2ENAYSPkdd1OWqy2DULnwLUVkKje47uT/I="; - - buildInputs = [ - (if withGoolm then stdenv.cc.cc.lib else olm) - ]; - - CGO_LDFLAGS = lib.optional withGoolm cppStdLib; - - tags = lib.optional withGoolm "goolm"; - - subPackages = [ "cmd/gomuks" ]; - - preBuild = '' - cp -r ${finalAttrs.frontend} ./web/dist - ''; - - postInstall = '' - mv $out/bin/gomuks $out/bin/gomuks-web - ''; - - passthru.updateScript = { - inherit (finalAttrs) frontend; - updateScript = unstableGitUpdater { - branch = "main"; + src = fetchFromGitHub { + owner = "gomuks"; + repo = "gomuks"; + hash = srcHash; + inherit rev; }; - }; - meta = { - mainProgram = "gomuks-web"; - description = "Matrix client written in Go"; - homepage = "https://github.com/tulir/gomuks"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ctucx ]; - platforms = lib.platforms.unix; - }; -}) + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + env = { + npmRoot = "web"; + npmDeps = fetchNpmDeps { + src = "${finalAttrs.src}/web"; + hash = npmDepsHash; + }; + }; + + postPatch = '' + substituteInPlace ./web/build-wasm.sh \ + --replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=v${ver}" \ + --replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=${rev}" + ''; + + doCheck = false; + + tags = [ "goolm" ]; + + ldflags = [ + "-X 'go.mau.fi/gomuks/version.Tag=v${ver}'" + "-X 'go.mau.fi/gomuks/version.Commit=${rev}'" + "-X \"go.mau.fi/gomuks/version.BuildTime=$(date -Iseconds)\"" + "-X \"maunium.net/go/mautrix.GoModVersion=$(cat go.mod | grep 'maunium.net/go/mautrix ' | head -n1 | awk '{ print $2 })\"" + ]; + + subPackages = [ + "cmd/gomuks" + "cmd/gomuks-terminal" + "cmd/archivemuks" + ]; + + preBuild = '' + CGO_ENABLED=0 go generate ./web + ''; + + postInstall = '' + mv $out/bin/gomuks $out/bin/gomuks-web + ''; + + passthru.updateScript = { + inherit (finalAttrs) frontend; + updateScript = unstableGitUpdater { + branch = "main"; + }; + }; + + meta = { + mainProgram = "gomuks-web"; + description = "Matrix client written in Go"; + homepage = "https://github.com/tulir/gomuks"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.zaphyra ]; + platforms = lib.platforms.unix; + }; + } +) From f6b2eed42b7166096073cca9a848e4c20e464a95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 14:48:48 +0000 Subject: [PATCH 1968/2279] carapace: 1.5.3 -> 1.5.4 --- pkgs/by-name/ca/carapace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/carapace/package.nix b/pkgs/by-name/ca/carapace/package.nix index bb5c46c581e7..3b1d1dafc558 100644 --- a/pkgs/by-name/ca/carapace/package.nix +++ b/pkgs/by-name/ca/carapace/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-KeIaA+v0jJzyEo6ZE+mwzMM8wjsbtdYipAhzkotRR+o="; + hash = "sha256-QTY2GH2aKTMowNXVVNUDJdHAFVhCPFBh2p+Mgon88EI="; }; - vendorHash = "sha256-bDPCLAkX9AofyzZMz8rV9RgbFlF0GwzVlal2N7you08="; + vendorHash = "sha256-Lswmq4j4nz7k+CRpyZhAubEZD59lNKpT/w3mQ4JlMys="; ldflags = [ "-s" From db0450c0097dcf573cebf143cf01faae74a3eeed Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 9 Nov 2025 16:03:34 +0100 Subject: [PATCH 1969/2279] clickhouse: reduce src tarball size --- pkgs/by-name/cl/clickhouse/generic.nix | 37 +++++++++++++++++++++----- pkgs/by-name/cl/clickhouse/lts.nix | 2 +- pkgs/by-name/cl/clickhouse/package.nix | 2 +- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index 6399e1fecb17..72129d8a2b9b 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -45,17 +45,39 @@ llvmStdenv.mkDerivation (finalAttrs: { name = "clickhouse-${tag}.tar.gz"; inherit hash; postFetch = '' - # delete files that make the source too big - rm -rf $out/contrib/llvm-project/llvm/test - rm -rf $out/contrib/llvm-project/clang/test - rm -rf $out/contrib/croaring/benchmarks + # Delete files that make the source too big + rm -rf $out/contrib/arrow/docs/ + rm -rf $out/contrib/arrow/testing/ + rm -rf $out/contrib/aws/generated/protocol-tests/ + rm -rf $out/contrib/aws/generated/smoke-tests/ + rm -rf $out/contrib/aws/generated/tests/ + rm -rf $out/contrib/aws/tools/ + rm -rf $out/contrib/cld2/internal/test_shuffle_1000_48_666.utf8.gz + rm -rf $out/contrib/croaring/benchmarks/ + rm -rf $out/contrib/boost/doc/ + rm -rf $out/contrib/boost/libs/*/bench/ + rm -rf $out/contrib/boost/libs/*/example/ + rm -rf $out/contrib/boost/libs/*/doc/ + rm -rf $out/contrib/boost/libs/*/test/ + rm -rf $out/contrib/google-cloud-cpp/ci/abi-dumps/ + rm -rf $out/contrib/icu/icu4c/source/test/ + rm -rf $out/contrib/icu/icu4j/main/core/src/test/ + rm -rf $out/contrib/icu/icu4j/perf-tests/ + rm -rf $out/contrib/llvm-project/*/docs/ + rm -rf $out/contrib/llvm-project/*/test/ + rm -rf $out/contrib/llvm-project/*/unittests/ + rm -rf $out/contrib/postgres/doc/ + + # As long as we're not running tests, remove test files + rm -rf $out/tests/ # fix case insensitivity on macos https://github.com/NixOS/nixpkgs/issues/39308 rm -rf $out/contrib/sysroot/linux-* rm -rf $out/contrib/liburing/man - # compress to not exceed the 2GB output limit - # try to make a deterministic tarball + # Compress to not exceed the 2GB output limit + echo "Creating deterministic source tarball..." + tar -I 'gzip -n' \ --sort=name \ --mtime=1970-01-01 \ @@ -63,6 +85,9 @@ llvmStdenv.mkDerivation (finalAttrs: { --numeric-owner --mode=go=rX,u+rw,a-s \ --transform='s@^@source/@S' \ -cf temp -C "$out" . + + echo "Finished creating deterministic source tarball!" + rm -r "$out" mv temp "$out" ''; diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index e7818bfc885d..10e9f2370019 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "25.8.11.66-lts"; rev = "fa393206741c830da77b8f1bcf18c753161932c8"; - hash = "sha256-VUdT5STQqcWevYJjtuLdTeDGZHNl3JkkDSgcckjSZbw="; + hash = "sha256-LBAGiYLyo535j2FYTVbcfq20d9VisGXZMPbTpONBpQU="; lts = true; } diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index c787f82df7aa..f05430a6ee4b 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "25.10.1.3832-stable"; rev = "f95c1af632a1c4fb9c69a501d05ae04a393b8f81"; - hash = "sha256-UqdwZRJWMo2KTlZ1W3MnbXg1EhK/ifjQRciPcWiFYTk="; + hash = "sha256-00QqO7fVEg7vGtM/+69CEPfNKTm+P2uteoHKKVYwpoY="; lts = false; } From 1261711c3fd4b25d2a95e564502c88eeb770e862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 15:07:44 +0000 Subject: [PATCH 1970/2279] deck: 1.52.1 -> 1.53.1 --- pkgs/by-name/de/deck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 86b41e94836c..09f7a7062d44 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "deck"; - version = "1.52.1"; + version = "1.53.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${version}"; - hash = "sha256-nxb7iuAf1hGHdjomgxFZuYwZSUuRrd5J3iVtFgEINY4="; + hash = "sha256-uLT/VTO3+KVfAvnFnsyFo9oRwkxA0wgUDmRgQwhXLfY="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-K6BOZ0LAy107UMQ0ZjkSnI4Q0lSqfHqvIG+EhCaal9A="; + vendorHash = "sha256-EygCZy0IXvqr2874nKFQTi+Pm56J75cpQUrPo7JGUNc="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ From e2e25df1ca5b15ddef03e1196eea3fb1548615cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 15:25:10 +0000 Subject: [PATCH 1971/2279] rusty-path-of-building: 0.2.7 -> 0.2.8 --- pkgs/by-name/ru/rusty-path-of-building/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix index 10b0184b3670..997b766734e0 100644 --- a/pkgs/by-name/ru/rusty-path-of-building/package.nix +++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix @@ -17,16 +17,16 @@ }: rustPlatform.buildRustPackage rec { pname = "rusty-path-of-building"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "meehl"; repo = "rusty-path-of-building"; rev = "v${version}"; - hash = "sha256-J/tTifOcbY1mfcNbQFN4Vdyl78O7vTVbfew3fcnVyTA="; + hash = "sha256-GJP5kuDHDyKFzlDW3EiMzd2KruYB1L51QgK4NT6B3Cc="; }; - cargoHash = "sha256-Oekl6SDIvgFIzPnve7nuib3fEjPGC46F/TNULmgOpew="; + cargoHash = "sha256-RfF53qd/crWDgEDveP58FPInlH7vtpprMU3aLf9KO8A="; nativeBuildInputs = [ pkg-config From 36d97f54b65064b56ce981b5d773cb3c394e8ed3 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 Sep 2025 11:46:42 -0400 Subject: [PATCH 1972/2279] blender: use release config This ensures that we at least default to the config that upstream Blender uses. Remove any config that we have that is redundant with [the current upstream][1]. Need to explicitly turn off `WITH_CYCLES_CUDA_BINARIES` in non-CUDA (as release build will turn it on) and turn off `WITH_CYCLES_DEVICE_ONEAPI` (as it was previously implicitly off and we do not currently support it). [1]: https://projects.blender.org/blender/blender/src/tag/v4.5.2/build_files/cmake/config/blender_release.cmake --- pkgs/by-name/bl/blender/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 8645982537e9..0e5678977f98 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -146,6 +146,7 @@ stdenv'.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; cmakeFlags = [ + "-C../build_files/cmake/config/blender_release.cmake" "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" "-DPYTHON_LIBPATH=${python3}/lib" @@ -153,36 +154,26 @@ stdenv'.mkDerivation (finalAttrs: { "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include" "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}" "-DPYTHON_VERSION=${python3.pythonVersion}" - "-DWITH_ALEMBIC=ON" - "-DWITH_ASSERT_ABORT=OFF" "-DWITH_BUILDINFO=OFF" - "-DWITH_CODEC_FFMPEG=ON" - "-DWITH_CODEC_SNDFILE=ON" "-DWITH_CPU_CHECK=OFF" + "-DWITH_CYCLES_CUDA_BINARIES=${if cudaSupport then "ON" else "OFF"}" "-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_DEVICE_ONEAPI=OFF" "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" "-DWITH_CYCLES_OSL=OFF" - "-DWITH_FFTW3=ON" "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" - "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" "-DWITH_LIBS_PRECOMPILED=OFF" - "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" - "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" - "-DWITH_OPENSUBDIV=ON" - "-DWITH_OPENVDB=ON" "-DWITH_PIPEWIRE=OFF" "-DWITH_PULSEAUDIO=OFF" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" - "-DWITH_SDL=OFF" "-DWITH_STRICT_BUILD_OPTIONS=ON" - "-DWITH_TBB=ON" "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) From 184edc5166eb33e2c06c5dfe5f134781c5dcbdcf Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 8 Nov 2025 09:59:27 -0500 Subject: [PATCH 1973/2279] blender: 4.5.3 -> 4.5.4 Changelog: https://www.blender.org/download/lts/4-5/ --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 0e5678977f98..f7c54e1451b7 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -116,12 +116,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.5.3"; + version = "4.5.4"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-DNVZUZpysCyB/Xt8yB352gO+UK8Cd4aDFGYuUDKyIrs="; + hash = "sha256-/cYMCWgojkO1mqzJ4BZwbwXPuBmg66T+gzpEuLiOskY="; }; postPatch = From 249e49e3890711299408b1e591cdee17f2f2134c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 14 Oct 2025 10:47:09 -0400 Subject: [PATCH 1974/2279] blender: alphabetize --- pkgs/by-name/bl/blender/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index f7c54e1451b7..5243b5fb15db 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -254,11 +254,11 @@ stdenv'.mkDerivation (finalAttrs: { openpgl (opensubdiv.override { inherit cudaSupport; }) openvdb + onetbb potrace pugixml python3 python3Packages.materialx - onetbb zlib zstd ] From 5b7feb5518db2b3728962c59405241473d80b12d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 03:49:47 +0000 Subject: [PATCH 1975/2279] =?UTF-8?q?python3.pkgs.pyatspi:=202.46.1=20?= =?UTF-8?q?=E2=86=92=202.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/pyatspi2/-/compare/PYATSPI_2_46_1...2.58.0 Was ported to Meson. Also clean up, and fix license: - Library is LGPL-2.0-only. - Examples are LGPL-2.1-or-later. - Some tests are LGPL-2.0-or-later, some are GPL-2.0-or-later, and some are PSF-2.0. Changelog-reviewed-by: Jan Tojnar --- .../python-modules/pyatspi/default.nix | 34 +++++++++---------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index df80e01731ee..9e69b571c7fd 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,54 +1,52 @@ { lib, fetchurl, + meson, + ninja, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome, - python, }: buildPythonPackage rec { pname = "pyatspi"; - version = "2.46.1"; - format = "other"; + version = "2.58.0"; + + pyproject = false; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+R9qV0NOnAfRPVxL+BndeOjuYFqsKuRdjGTCgRT7BBs="; + url = "mirror://gnome/sources/pyatspi/${lib.versions.majorMinor version}/pyatspi-${version}.tar.xz"; + sha256 = "6dKQ1TzH4wZtly/RilDuiF77i+CqJSYvGe9/iE/qDv8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; buildInputs = [ at-spi2-core pygobject3 ]; - configureFlags = [ "PYTHON=${python.pythonOnBuildForHost.interpreter}" ]; - - postPatch = '' - # useless python existence check for us - substituteInPlace configure \ - --replace '&& ! which' '&& false' - ''; - disabled = !isPy3k; passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "python3.pkgs.${pname}"; + packageName = "pyatspi"; + attrPath = "python3.pkgs.pyatspi"; versionPolicy = "odd-unstable"; }; }; meta = with lib; { description = "Python client bindings for D-Bus AT-SPI"; - homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus"; - license = licenses.gpl2; + homepage = "https://gitlab.gnome.org/GNOME/pyatspi2"; + license = licenses.lgpl2Only; maintainers = with maintainers; [ jtojnar ]; platforms = with platforms; unix; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a18977fe4ac..3a8a74599032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12745,7 +12745,7 @@ self: super: with self; { pyatome = callPackage ../development/python-modules/pyatome { }; - pyatspi = callPackage ../development/python-modules/pyatspi { }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs.buildPackages) meson; }; pyatv = callPackage ../development/python-modules/pyatv { }; From b36fa015c5c7d5d68db896fbe46f06b796b66d66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Nov 2025 00:28:22 +0100 Subject: [PATCH 1976/2279] papers: add update script --- pkgs/by-name/pa/papers/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index c3dbc70c1983..399cef8184f0 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -33,6 +33,9 @@ exempi, cargo, rustPlatform, + _experimental-update-script-combinators, + common-updater-scripts, + gnome, }: stdenv.mkDerivation (finalAttrs: { @@ -133,6 +136,36 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + passthru = { + updateScript = + let + updateSource = gnome.updateScript { + packageName = "papers"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${ + lib.makeBinPath [ + common-updater-scripts + ] + } + update-source-version papers --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; + }; + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/papers"; changelog = "https://gitlab.gnome.org/GNOME/papers/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; From 62cdfd7e2fb7fa20320e1ba3065b67e29a399455 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Nov 2025 23:29:05 +0000 Subject: [PATCH 1977/2279] =?UTF-8?q?papers:=2048.5=20=E2=86=92=2049.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/papers/-/compare/48.5...49.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/pa/papers/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index 399cef8184f0..5285fd828211 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -6,6 +6,7 @@ ninja, pkg-config, appstream, + blueprint-compiler, desktop-file-utils, gtk4, glib, @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "papers"; - version = "48.5"; + version = "49.1"; outputs = [ "out" @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz"; - hash = "sha256-DMjXLHHT2KqxvhCuGUGkzZLNHip+gwq3aA4sgt+xnAs="; + hash = "sha256-SrI6Z4l73da+LWKYIQ//YCz+wPNWiLxb/ycDYLB4TCk="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pname version ; - hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ="; + hash = "sha256-Pjhpo44Zau2z6aWEQEcIPy3aUYplwdF/XIkO/1Zl+kg="; }; nativeBuildInputs = [ @@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 yelp-tools cargo + blueprint-compiler rustPlatform.cargoSetupHook ]; @@ -112,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; postPatch = '' - substituteInPlace shell/src/meson.build --replace-fail \ + substituteInPlace shell/src/meson.build thumbnailer/meson.build --replace-fail \ "meson.current_build_dir() / rust_target / meson.project_name()" \ "meson.current_build_dir() / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()" ''; From 404b8ce70d2a695625e1fa79ccf14ecb40851f91 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Nov 2025 07:34:49 +0100 Subject: [PATCH 1978/2279] nixos/gnome: Replace evince with papers https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/a392cd2c8b3d027e0595da24f655085c9b61bc17 https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/920445bde786b2793840db748b3d6086627bf3d1 --- nixos/doc/manual/release-notes/rl-2511.section.md | 1 + nixos/modules/services/desktop-managers/gnome.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 8b228d409752..98d4f5085e5b 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -27,6 +27,7 @@ - Removes X11 session support. Though you can still run X11 apps using XWayland. - gnome-session’s custom service manager was removed in favour of using systemd. - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058). + - `papers` document viewer is now installed by default, replacing `evince`. Though we still include `evince` transitively by `sushi` (quick previewer used by Files/Nautilus) You can disable either using [](#opt-environment.gnome.excludePackages) and restore `evince` with [](#opt-programs.evince.enable). Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details. diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 62b6df1ed4e4..b2966715e737 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -465,6 +465,7 @@ in pkgs.gnome-weather pkgs.loupe pkgs.nautilus + pkgs.papers pkgs.gnome-connections pkgs.simple-scan pkgs.snapshot @@ -476,7 +477,6 @@ in # Since some of these have a corresponding package, we only # enable that program module if the package hasn't been excluded # through `environment.gnome.excludePackages` - programs.evince.enable = notExcluded pkgs.evince; programs.file-roller.enable = notExcluded pkgs.file-roller; programs.geary.enable = notExcluded pkgs.geary; programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility; From 3cd66c4c52f51853fa26e8a6a1c334a9968e31f0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Nov 2025 07:46:20 +0100 Subject: [PATCH 1979/2279] showtime: Add gnome team to maintainers It became core app in GNOME 49. --- pkgs/by-name/sh/showtime/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 3cc0e1f47a82..de7831564880 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -73,6 +73,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://apps.gnome.org/Showtime"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo ]; + teams = [ lib.teams.gnome ]; mainProgram = "showtime"; }; } From d3d005fe7dcfbb8f43d06243e8cb02ff6c09d2e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Nov 2025 07:48:10 +0100 Subject: [PATCH 1980/2279] =?UTF-8?q?showtime:=2048.1=20=E2=86=92=2049.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/showtime/-/compare/48.1...49.0 Adding `pkg-config` to `depsBuildBuild` as well, since it is required to find `blueprint-compiler` from `nativeBuildInputs` with `strictDeps`. Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/sh/showtime/package.nix | 39 ++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index de7831564880..85fed910f701 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -3,15 +3,16 @@ appstream, blueprint-compiler, desktop-file-utils, - fetchFromGitLab, + fetchurl, + fetchpatch, glib, + gnome, gobject-introspection, gst_all_1, gtk4, libadwaita, meson, ninja, - nix-update-script, pkg-config, python3Packages, wrapGAppsHook4, @@ -19,20 +20,29 @@ python3Packages.buildPythonApplication rec { pname = "showtime"; - version = "48.1"; + version = "49.0"; pyproject = false; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - group = "GNOME"; - owner = "Incubator"; - repo = "showtime"; - rev = "refs/tags/${version}"; - hash = "sha256-uk3KgiLsYjqBhlKssnkWO6D4ufwJb/o+rQYSA7pa1lU="; + src = fetchurl { + url = "mirror://gnome/sources/showtime/${lib.versions.major version}/showtime-${version}.tar.xz"; + hash = "sha256-Wryvl6telTADgoKEhYjozmwmFztzA+9nVr69sLIO05g="; }; + patches = [ + # Fix startup crash when missing state directory. + # https://gitlab.gnome.org/GNOME/showtime/-/merge_requests/80 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/showtime/-/commit/a5d57a6b023664c9dc5aeb55a3467a8b56e1b7bc.patch"; + hash = "sha256-IUkopJ3J381+9MnvaItx7dn9NAVrqO9y4LjgPh8MU/M="; + }) + ]; + strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ appstream blueprint-compiler @@ -64,8 +74,15 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "showtime" ]; + preInstallCheck = '' + export XDG_DATA_DIRS="${glib.makeSchemaDataDirPath "$out" "$name"}:$XDG_DATA_DIRS" + export HOME="$TEMPDIR" + ''; + passthru = { - updateScript = nix-update-script { }; + updateScript = gnome.updateScript { + packageName = "showtime"; + }; }; meta = { From 809e79828ad66d37fffb0d7dec4798dce9062dac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Nov 2025 07:44:47 +0100 Subject: [PATCH 1981/2279] nixos/gnome: Replace totem with showtime https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/1889a6c96b4ae777f2321f9909e3f666b4811f9b https://gitlab.gnome.org/GNOME/gnome-build-meta/-/commit/ee7940d7b4842d9eee20c2a0d383e8eb08a859c0 --- nixos/doc/manual/release-notes/rl-2511.section.md | 1 + nixos/modules/services/desktop-managers/gnome.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 98d4f5085e5b..7263c13f4bd6 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -28,6 +28,7 @@ - gnome-session’s custom service manager was removed in favour of using systemd. - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058). - `papers` document viewer is now installed by default, replacing `evince`. Though we still include `evince` transitively by `sushi` (quick previewer used by Files/Nautilus) You can disable either using [](#opt-environment.gnome.excludePackages) and restore `evince` with [](#opt-programs.evince.enable). + - `showtime` video player is now installed by default, replacing `totem`. You can disable it using [](#opt-environment.gnome.excludePackages) and restore `totem` with [](#opt-environment.systemPackages). Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details. diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index b2966715e737..faa5085cc9e7 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -232,7 +232,7 @@ in environment.gnome.excludePackages = mkOption { default = [ ]; - example = literalExpression "[ pkgs.totem ]"; + example = literalExpression "[ pkgs.showtime ]"; type = types.listOf types.package; description = "Which packages gnome should exclude from the default environment"; }; @@ -467,9 +467,9 @@ in pkgs.nautilus pkgs.papers pkgs.gnome-connections + pkgs.showtime pkgs.simple-scan pkgs.snapshot - pkgs.totem pkgs.yelp ] config.environment.gnome.excludePackages; From b757b4e03e68b56a79e49ff17b8490f978e8df81 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Nov 2025 02:36:53 +0000 Subject: [PATCH 1982/2279] =?UTF-8?q?ghex:=2048.1=20=E2=86=92=2048.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/48.1...48.3 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gh/ghex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index e1aeacd674dc..61cc33efbcf8 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghex"; - version = "48.1"; + version = "48.3"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz"; - hash = "sha256-T+q4r5Z+J2Pyi8d6Tdz1SjZ6odhUlv7wUBmGvYA9ifI="; + hash = "sha256-y8hEJ7Kt6pQDUCoSXzZrnyiIE/cugb9rGRVGBvFZ3Tk="; }; nativeBuildInputs = [ From f0855fd392c369181374fd324ea51bd54ea5d620 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Nov 2025 02:49:34 +0000 Subject: [PATCH 1983/2279] =?UTF-8?q?glycin-loaders:=202.0.4=20=E2=86=92?= =?UTF-8?q?=202.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.4...2.0.5 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/gl/glycin-loaders/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 97a6e6374acd..2b4f70aeafba 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -25,17 +25,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz"; - hash = "sha256-w4FHIA9YBKJXNBZ46LzjFLz/eadvmGqMMnnZ2Ej4v/c="; + hash = "sha256-hK431LVux1WH/TtDs00Jw64T9sBu2LKWobOyCgGOf80="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "glycin-loaders-deps-${finalAttrs.version}"; - hash = "sha256-r0TmBggpLG3wwZSWJr1bwyG5RHP/nvDGEJ/JFVAzEFA="; + hash = "sha256-U5Ro3ahrYK+B+82bchkdoXR4BwtCBn18oKcqeXl39ag="; dontConfigure = true; }; From ecb7f93013c869a2769b43634cafde1ff642dc56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Nov 2025 02:50:06 +0000 Subject: [PATCH 1984/2279] =?UTF-8?q?zenity:=204.2.0=20=E2=86=92=204.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/zenity/-/compare/4.2.0...4.2.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/ze/zenity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix index 0f612d9468e1..85c9ba21641a 100644 --- a/pkgs/by-name/ze/zenity/package.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; - hash = "sha256-X5gzQMb6VfT6tal2nQdxss3xNl4sFYrBHMFv/Ykva80="; + hash = "sha256-Wp/Y2DFvkMsuGlqPDUEeufyvhZV6ginqPoA+gQBKHr0="; }; nativeBuildInputs = [ From e5f2e4e70bf63ed073c96dc7f656cc6fb839f703 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Nov 2025 02:50:43 +0000 Subject: [PATCH 1985/2279] =?UTF-8?q?libglycin:=202.0.4=20=E2=86=92=202.0.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glycin/-/compare/2.0.4...2.0.5 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/li/libglycin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 53ec905db98e..88bed1c78d5b 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -27,14 +27,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libglycin"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "glycin"; tag = finalAttrs.version; - hash = "sha256-KPhyL7uP621pxxDGlzbF9WG7A0AcyaS95VstfN/FoQ8="; + hash = "sha256-RrklQ1+9v2iEIv0/gQLEyYV7ELazcm+vSn/6gyXA6mo="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-bYUA8WrCWGTs5P1zT7zMSESkHhsyfBBRUvM2D63OBbA="; + hash = "sha256-u1zHQwqrPT22Utl7Woah/JdKJSe65Q2Jc7cuh7b+R5Q="; }; buildInputs = [ From 20d5f1deb9e1bd3d2b1ea82ddd0c71e2cca99e63 Mon Sep 17 00:00:00 2001 From: Gwendal Beaumont Date: Wed, 5 Nov 2025 14:05:43 +0100 Subject: [PATCH 1986/2279] =?UTF-8?q?calls:=2048.2=20=E2=86=92=2049.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/calls/-/compare/v48.2...v49.1.1 Changelog-reviewed-by: Jan Tojnar --- pkgs/by-name/ca/calls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/calls/package.nix b/pkgs/by-name/ca/calls/package.nix index c785ae2d70ba..5c21a92baee2 100644 --- a/pkgs/by-name/ca/calls/package.nix +++ b/pkgs/by-name/ca/calls/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "calls"; - version = "48.2"; + version = "49.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "calls"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-S1YWFkwK1tcIUOfyOxlEFtKcLlRDiSKf4iUGnb+VlG8="; + hash = "sha256-fqvfzdk1szNFm4aRRGNDaA/AmjJdQjBsMhvEolEetE0="; }; outputs = [ From 4b04af0c21c4d0243b57c66092e415acf09e5372 Mon Sep 17 00:00:00 2001 From: Nona Date: Sun, 9 Nov 2025 16:27:15 +0100 Subject: [PATCH 1987/2279] blueprint-compiler: update src to point to GNOME gitlab jwestman/blueprint-compiler has been moved to GNOME/blueprint-compiler. updates the package src (fetchFromGitLab) and homepage URLs to point to the new URL. --- pkgs/by-name/bl/blueprint-compiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix index ff9b8ab44a22..8de33e20aa1b 100644 --- a/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "jwestman"; + owner = "GNOME"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; hash = "sha256-3vAFkP/psM/IsFtzVOIVSU77Z+RV4d3N70U7ggrDqfo="; @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Markup language for GTK user interface files"; mainProgram = "blueprint-compiler"; - homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; + homepage = "https://gitlab.gnome.org/GNOME/blueprint-compiler"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ benediktbroich From 5b74cebfbc61aa7fc528ae285217236036336a20 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 9 Nov 2025 16:23:13 +0100 Subject: [PATCH 1988/2279] prefetch-npm-deps: add support for `npm-shrinkwrap.json` --- pkgs/build-support/node/fetch-npm-deps/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index 1f5ea5a5f17b..997de7becd4a 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -242,12 +242,16 @@ buildPhase = '' runHook preBuild - if [[ ! -e package-lock.json ]]; then + if [[ -f npm-shrinkwrap.json ]]; then + local -r srcLockfile="npm-shrinkwrap.json" + elif [[ -f package-lock.json ]]; then + local -r srcLockfile="package-lock.json" + else echo - echo "ERROR: The package-lock.json file does not exist!" + echo "ERROR: No lock file!" echo - echo "package-lock.json is required to make sure that npmDepsHash doesn't change" - echo "when packages are updated on npm." + echo "package-lock.json or npm-shrinkwrap.json is required to make sure" + echo "that npmDepsHash doesn't change when packages are updated on npm." echo echo "Hint: You can copy a vendored package-lock.json file via postPatch." echo @@ -255,7 +259,7 @@ exit 1 fi - prefetch-npm-deps package-lock.json $out + prefetch-npm-deps $srcLockfile $out runHook postBuild ''; From f640ab99a9d1368af30c181957d9b88693c6aa14 Mon Sep 17 00:00:00 2001 From: Alexandre Ros Date: Sun, 9 Nov 2025 08:25:47 +0100 Subject: [PATCH 1989/2279] qusb2snes: init at 0.7.35 --- pkgs/by-name/qu/qusb2snes/package.nix | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/qu/qusb2snes/package.nix diff --git a/pkgs/by-name/qu/qusb2snes/package.nix b/pkgs/by-name/qu/qusb2snes/package.nix new file mode 100644 index 000000000000..7d1b74825860 --- /dev/null +++ b/pkgs/by-name/qu/qusb2snes/package.nix @@ -0,0 +1,54 @@ +{ + stdenv, + lib, + fetchFromGitHub, + qt6, + installShellFiles, +}: + +stdenv.mkDerivation rec { + pname = "qusb2snes"; + version = "0.7.35"; + + src = fetchFromGitHub { + owner = "Skarsnik"; + repo = "QUsb2snes"; + tag = "v${version}"; + fetchSubmodules = true; + hash = "sha256-521L4awWr4L2W12vAZUMheq4plXUXKYo4d3S6AfHgPA="; + }; + + nativeBuildInputs = [ + qt6.qmake + qt6.wrapQtAppsHook + installShellFiles + ]; + buildInputs = [ + qt6.qtbase + qt6.qtwebsockets + qt6.qtserialport + ]; + qmakeFlags = [ + "QUsb2snes.pro" + "CONFIG+=release" + ]; + + installPhase = '' + runHook preInstall + installBin QUsb2Snes + installManPage --name QUsb2Snes.1 QUsb2Snes.manpage.1 + install -Dm644 ui/icons/cheer128x128.png $out/share/icons/hicolor/128x128/apps/fr.nyo.QUsb2Snes.png + install -Dm644 QUsb2Snes.desktop $out/share/applications/fr.nyo.QUsb2Snes.desktop + runHook postInstall + ''; + + meta = { + description = "Websocket server that provides a unified protocol for accessing SNES (or SNES emulators) software"; + license = lib.licenses.gpl3Plus; + homepage = "https://skarsnik.github.io/QUsb2snes/"; + platforms = lib.platforms.linux; + badPlatforms = lib.platforms.darwin; + mainProgram = "QUsb2Snes"; + maintainers = with lib.maintainers; [ alexland7219 ]; + }; +} From a53ea4159758dc9ba950d9fec848ecf85c4e7520 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 9 Nov 2025 17:00:06 +0100 Subject: [PATCH 1990/2279] ggshield: 1.40.0 -> 1.44.1 https://github.com/GitGuardian/ggshield/blob/v1.44.1/CHANGELOG.md --- pkgs/tools/security/ggshield/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index a197f7e3f85c..bbd189258bb0 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.40.0"; + version = "1.44.1"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; tag = "v${version}"; - hash = "sha256-Y42MBRyjPljUAGTwhH2FS8drUAceuJse8Qd1GbctWQs="; + hash = "sha256-PHCrUzZmpjZMAfKinBYahhwQFjByaIQ/2udSqoGMmdU="; }; pythonRelaxDeps = true; @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ pdm-backend ]; dependencies = with python3.pkgs; [ - appdirs charset-normalizer click cryptography @@ -37,6 +36,8 @@ python3.pkgs.buildPythonApplication rec { requests rich truststore + typing-extensions + urllib3 ]; nativeCheckInputs = [ @@ -49,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { pytest-mock pytest-voluptuous pytestCheckHook - snapshottest + syrupy vcrpy ]); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a89aeaffa4e..da478d44ac62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2779,9 +2779,7 @@ with pkgs; gawkInteractive = gawk.override { interactive = true; }; - ggshield = callPackage ../tools/security/ggshield { - python3 = python311; - }; + ggshield = callPackage ../tools/security/ggshield { }; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; From 09d5435ac28d37ee4ae8d25b90872b71fd03d2be Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 9 Nov 2025 17:05:48 +0100 Subject: [PATCH 1991/2279] ggshield: fix `meta.changelog`, remove `with lib;` --- pkgs/tools/security/ggshield/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index bbd189258bb0..1fb187fe69bb 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -81,12 +81,12 @@ python3.pkgs.buildPythonApplication rec { "test_get_file_sha_in_ref" ]; - meta = with lib; { + meta = { description = "Tool to find and fix various types of hardcoded secrets and infrastructure-as-code misconfigurations"; homepage = "https://github.com/GitGuardian/ggshield"; - changelog = "https://github.com/GitGuardian/ggshield/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/GitGuardian/ggshield/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "ggshield"; }; } From e353d376026cea28562fb8c8e2652006ba2d7901 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 9 Nov 2025 10:12:34 -0500 Subject: [PATCH 1992/2279] blender: prefer lib.cmakeBool & lib.cmakeFeature Been putting this off for too long. --- pkgs/by-name/bl/blender/package.nix | 88 +++++++++++++++-------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 5243b5fb15db..1cedbfce2aac 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -147,58 +147,62 @@ stdenv'.mkDerivation (finalAttrs: { cmakeFlags = [ "-C../build_files/cmake/config/blender_release.cmake" - "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" - "-DPYTHON_LIBPATH=${python3}/lib" - "-DPYTHON_LIBRARY=${python3.libPrefix}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include" - "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}" - "-DPYTHON_VERSION=${python3.pythonVersion}" - "-DWITH_BUILDINFO=OFF" - "-DWITH_CPU_CHECK=OFF" - "-DWITH_CYCLES_CUDA_BINARIES=${if cudaSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_DEVICE_ONEAPI=OFF" - "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" - "-DWITH_CYCLES_OSL=OFF" - "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" - "-DWITH_INSTALL_PORTABLE=OFF" - "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" - "-DWITH_LIBS_PRECOMPILED=OFF" - "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" - "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" - "-DWITH_PIPEWIRE=OFF" - "-DWITH_PULSEAUDIO=OFF" - "-DWITH_PYTHON_INSTALL=OFF" - "-DWITH_PYTHON_INSTALL_NUMPY=OFF" - "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" - "-DWITH_STRICT_BUILD_OPTIONS=ON" - "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" + + (lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX") + (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}") + (lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib") + (lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}") + (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include") + (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}") + (lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}") + + (lib.cmakeBool "WITH_BUILDINFO" false) + (lib.cmakeBool "WITH_CPU_CHECK" false) + (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" cudaSupport) + (lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" hipSupport) + (lib.cmakeBool "WITH_CYCLES_DEVICE_ONEAPI" false) + (lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport) + (lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport) + (lib.cmakeBool "WITH_CYCLES_OSL" false) + (lib.cmakeBool "WITH_HYDRA" openUsdSupport) + (lib.cmakeBool "WITH_INSTALL_PORTABLE" false) + (lib.cmakeBool "WITH_JACK" jackaudioSupport) + (lib.cmakeBool "WITH_LIBS_PRECOMPILED" false) + (lib.cmakeBool "WITH_OPENCOLLADA" colladaSupport) + (lib.cmakeBool "WITH_OPENIMAGEDENOISE" openImageDenoiseSupport) + (lib.cmakeBool "WITH_PIPEWIRE" false) + (lib.cmakeBool "WITH_PULSEAUDIO" false) + (lib.cmakeBool "WITH_PYTHON_INSTALL" false) + (lib.cmakeBool "WITH_PYTHON_INSTALL_NUMPY" false) + (lib.cmakeBool "WITH_PYTHON_INSTALL_REQUESTS" false) + (lib.cmakeBool "WITH_STRICT_BUILD_OPTIONS" true) + (lib.cmakeBool "WITH_USD" openUsdSupport) # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) - "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" - "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}" + (lib.cmakeFeature "ALEMBIC_INCLUDE_DIR" "${lib.getDev alembic}/include") + (lib.cmakeFeature "ALEMBIC_LIBRARY" "${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}") ] ++ lib.optionals cudaSupport [ - "-DOPTIX_ROOT_DIR=${optix}" - "-DWITH_CYCLES_CUDA_BINARIES=ON" + (lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}") + (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true) ] ++ lib.optionals hipSupport [ - "-DHIPRT_INCLUDE_DIR=${rocmPackages.hiprt}/include" - "-DWITH_CYCLES_DEVICE_HIPRT=ON" - "-DWITH_CYCLES_HIP_BINARIES=ON" + (lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include") + (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true) + (lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true) ] ++ lib.optionals waylandSupport [ - "-DWITH_GHOST_WAYLAND=ON" - "-DWITH_GHOST_WAYLAND_DBUS=ON" - "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" - "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" + (lib.cmakeBool "WITH_GHOST_WAYLAND" true) + (lib.cmakeBool "WITH_GHOST_WAYLAND_DBUS" true) + (lib.cmakeBool "WITH_GHOST_WAYLAND_DYNLOAD" false) + (lib.cmakeBool "WITH_GHOST_WAYLAND_LIBDECOR" true) + ] + ++ lib.optionals stdenv.cc.isClang [ + (lib.cmakeFeature "PYTHON_LINKFLAGS" "") # Clang doesn't support "-export-dynamic" ] - ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "-DLIBDIR=/does-not-exist" - "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include" + (lib.cmakeFeature "LIBDIR" "/does-not-exist") + (lib.cmakeFeature "SSE2NEON_INCLUDE_DIR" "${sse2neon}/include") ]; preConfigure = '' From 7660b3d5b6d8a801adfb2623ee42e37ae9a256ca Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 9 Nov 2025 17:11:02 +0100 Subject: [PATCH 1993/2279] ggshield: move to `pkgs/by-name` --- .../ggshield/default.nix => by-name/gg/ggshield/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/ggshield/default.nix => by-name/gg/ggshield/package.nix} (100%) diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/by-name/gg/ggshield/package.nix similarity index 100% rename from pkgs/tools/security/ggshield/default.nix rename to pkgs/by-name/gg/ggshield/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da478d44ac62..2754ead6e806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2779,8 +2779,6 @@ with pkgs; gawkInteractive = gawk.override { interactive = true; }; - ggshield = callPackage ../tools/security/ggshield { }; - gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; gitlab-ee = callPackage ../by-name/gi/gitlab/package.nix { From 95bffe712f336fc064031f18c771490f3d952c70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 16:39:06 +0000 Subject: [PATCH 1994/2279] unordered_dense: 4.8.0 -> 4.8.1 --- pkgs/by-name/un/unordered_dense/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unordered_dense/package.nix b/pkgs/by-name/un/unordered_dense/package.nix index 41d1f23ef0bf..ca4bf94d089a 100644 --- a/pkgs/by-name/un/unordered_dense/package.nix +++ b/pkgs/by-name/un/unordered_dense/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "unordered-dense"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "martinus"; repo = "unordered_dense"; tag = "v${finalAttrs.version}"; - hash = "sha256-irjzMx0QVE6W/Tg4TV+RNw1kD16yIJPR3sBseauu6AQ="; + hash = "sha256-JdPlyShWnAcdgixDHRaroFg7YWdPtD4Nl1PmpcQ1SAk="; }; nativeBuildInputs = [ From 59ea18364b672e45f12ec6a6a91b9d8f7fd5d50c Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 9 Nov 2025 17:48:56 +0100 Subject: [PATCH 1995/2279] hyprland: fix regression for layer-shell-qt --- pkgs/by-name/hy/hyprland/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index f9193601996b..902d2877d877 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -108,6 +108,12 @@ customStdenv.mkDerivation (finalAttrs: { url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch"; hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s="; }) + + # NOTE: fixes regression for layer-shell-qt. should be removed with the next release. + (fetchpatch { + url = "https://github.com/hyprwm/Hyprland/commit/0bd11d5eb941b8038f0723135768d84aa5512b4a.patch"; + hash = "sha256-yY5OsihAzm5cVLg8smGc4i/RIimUDwuZ1RUGqOlfV+Q="; + }) ]; postPatch = '' From 5bf390d89edc5e9439425a245f41efcb62de3b40 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 12:23:01 +0200 Subject: [PATCH 1996/2279] ycmd: 0-unstable-2025-{06-16 -> 10-24} --- pkgs/by-name/yc/ycmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 6978a1b60085..3b2b06cbefaa 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation { pname = "ycmd"; - version = "0-unstable-2025-06-16"; + version = "0-unstable-2025-10-24"; # required for third_party directory creation src = fetchFromGitHub { owner = "ycm-core"; repo = "ycmd"; - rev = "9160b4eee67ea61c8501bad36d061bcec5340021"; + rev = "7895484ad55e0cbd0686e882891d59661f183476"; hash = "sha256-MSzYX1vXuhd4TNxUfHWaRu7O0r89az1XjZBIZ6B3gBk="; fetchSubmodules = true; }; From 9ab2c7619ecb7c7bea3dcba1f523a8483042446f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sun, 9 Nov 2025 12:49:23 +0700 Subject: [PATCH 1997/2279] nixos/tests/h2o: use ports from the actual machines --- nixos/tests/web-servers/h2o/basic.nix | 27 ++++---- nixos/tests/web-servers/h2o/mruby.nix | 8 +-- .../web-servers/h2o/tls-recommendations.nix | 63 +++++++++++-------- 3 files changed, 53 insertions(+), 45 deletions(-) diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix index 622bb96929bf..9b67f3397536 100644 --- a/nixos/tests/web-servers/h2o/basic.nix +++ b/nixos/tests/web-servers/h2o/basic.nix @@ -8,11 +8,6 @@ let TLS = "acme.test"; }; - port = { - HTTP = 8080; - TLS = 8443; - }; - sawatdi_chao_lok = "สวัสดีชาวโลก"; hello_world_txt = hostPkgs.writeTextFile { @@ -41,7 +36,7 @@ in nodes = { server = - { pkgs, ... }: + { pkgs, config, ... }: { environment.systemPackages = [ pkgs.curl @@ -49,8 +44,8 @@ in services.h2o = { enable = true; - defaultHTTPListenPort = port.HTTP; - defaultTLSListenPort = port.TLS; + defaultHTTPListenPort = 8080; + defaultTLSListenPort = 8443; hosts = { "${domain.HTTP}" = { settings = { @@ -107,12 +102,12 @@ in networking = { firewall = { - allowedTCPPorts = with port; [ - HTTP - TLS + allowedTCPPorts = with config.services.h2o; [ + defaultHTTPListenPort + defaultTLSListenPort ]; - allowedUDPPorts = with port; [ - TLS + allowedUDPPorts = with config.services.h2o; [ + defaultTLSListenPort ]; }; extraHosts = '' @@ -123,9 +118,11 @@ in }; }; testScript = + { nodes, ... }: let - portStrHTTP = builtins.toString port.HTTP; - portStrTLS = builtins.toString port.TLS; + inherit (nodes) server; + portStrHTTP = builtins.toString server.services.h2o.defaultHTTPListenPort; + portStrTLS = builtins.toString server.services.h2o.defaultTLSListenPort; in # python '' diff --git a/nixos/tests/web-servers/h2o/mruby.nix b/nixos/tests/web-servers/h2o/mruby.nix index b99a4c840b15..803e6c96de83 100644 --- a/nixos/tests/web-servers/h2o/mruby.nix +++ b/nixos/tests/web-servers/h2o/mruby.nix @@ -3,8 +3,6 @@ let domain = "h2o.local"; - port = 8080; - sawatdi_chao_lok = "สวัสดีชาวโลก"; in { @@ -22,7 +20,7 @@ in enable = true; package = pkgs.h2o.override { withMruby = true; }; settings = { - listen = port; + listen = 8080; hosts = { "${domain}" = { paths = { @@ -50,8 +48,10 @@ in }; testScript = + { nodes, ... }: let - portStr = builtins.toString port; + inherit (nodes) server; + portStr = builtins.toString server.services.h2o.settings.listen; in # python '' diff --git a/nixos/tests/web-servers/h2o/tls-recommendations.nix b/nixos/tests/web-servers/h2o/tls-recommendations.nix index a99725f19b10..be80b9ee9e38 100644 --- a/nixos/tests/web-servers/h2o/tls-recommendations.nix +++ b/nixos/tests/web-servers/h2o/tls-recommendations.nix @@ -2,7 +2,6 @@ let domain = "acme.test"; - port = 8443; hello_txt = name: @@ -13,7 +12,12 @@ let mkH2OServer = recommendations: - { pkgs, lib, ... }: + { + pkgs, + lib, + config, + ... + }: { services.h2o = { enable = true; @@ -31,7 +35,8 @@ let hosts = { "${domain}" = { tls = { - inherit port recommendations; + inherit recommendations; + port = 8443; policy = "force"; identity = [ { @@ -59,7 +64,9 @@ let ]; networking = { - firewall.allowedTCPPorts = [ port ]; + firewall.allowedTCPPorts = [ + config.services.h2o.hosts.${domain}.tls.port + ]; extraHosts = "127.0.0.1 ${domain}"; }; }; @@ -78,43 +85,47 @@ in }; testScript = + { nodes, ... }: let - portStr = builtins.toString port; + inherit (nodes) server_modern server_intermediate server_old; + modernPortStr = builtins.toString server_modern.services.h2o.hosts.${domain}.tls.port; + intermediatePortStr = builtins.toString server_intermediate.services.h2o.hosts.${domain}.tls.port; + oldPortStr = builtins.toString server_old.services.h2o.hosts.${domain}.tls.port; in # python '' - curl_basic = "curl -v --tlsv1.3 --http2 'https://${domain}:${portStr}/'" - curl_head = "curl -v --head 'https://${domain}:${portStr}/'" - curl_max_tls1_2 ="curl -v --tlsv1.0 --tls-max 1.2 'https://${domain}:${portStr}/'" - curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:${portStr}/'" - curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:${portStr}/'" + curl_basic = "curl -v --tlsv1.3 --http2 'https://${domain}:{port}/'" + curl_head = "curl -v --head 'https://${domain}:{port}/'" + curl_max_tls1_2 ="curl -v --tlsv1.0 --tls-max 1.2 'https://${domain}:{port}/'" + curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:{port}/'" + curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:{port}/'" server_modern.wait_for_unit("h2o.service") - server_modern.wait_for_open_port(${portStr}) - modern_response = server_modern.succeed(curl_basic) + server_modern.wait_for_open_port(${modernPortStr}) + modern_response = server_modern.succeed(curl_basic.format(port="${modernPortStr}")) assert "Hello, modern!" in modern_response - modern_head = server_modern.succeed(curl_head) + modern_head = server_modern.succeed(curl_head.format(port="${modernPortStr}")) assert "strict-transport-security" in modern_head - server_modern.fail(curl_max_tls1_2) + server_modern.fail(curl_max_tls1_2.format(port="${modernPortStr}")) server_intermediate.wait_for_unit("h2o.service") - server_intermediate.wait_for_open_port(${portStr}) - intermediate_response = server_intermediate.succeed(curl_basic) + server_intermediate.wait_for_open_port(${intermediatePortStr}) + intermediate_response = server_intermediate.succeed(curl_basic.format(port="${intermediatePortStr}")) assert "Hello, intermediate!" in intermediate_response - intermediate_head = server_modern.succeed(curl_head) + intermediate_head = server_modern.succeed(curl_head.format(port="${intermediatePortStr}")) assert "strict-transport-security" in intermediate_head - server_intermediate.succeed(curl_max_tls1_2) - server_intermediate.succeed(curl_max_tls1_2_intermediate_cipher) - server_intermediate.fail(curl_max_tls1_2_old_cipher) + server_intermediate.succeed(curl_max_tls1_2.format(port="${intermediatePortStr}")) + server_intermediate.succeed(curl_max_tls1_2_intermediate_cipher.format(port="${intermediatePortStr}")) + server_intermediate.fail(curl_max_tls1_2_old_cipher.format(port="${intermediatePortStr}")) server_old.wait_for_unit("h2o.service") - server_old.wait_for_open_port(${portStr}) - old_response = server_old.succeed(curl_basic) + server_old.wait_for_open_port(${oldPortStr}) + old_response = server_old.succeed(curl_basic.format(port="${oldPortStr}")) assert "Hello, old!" in old_response - old_head = server_modern.succeed(curl_head) + old_head = server_modern.succeed(curl_head.format(port="${oldPortStr}")) assert "strict-transport-security" in old_head - server_old.succeed(curl_max_tls1_2) - server_old.succeed(curl_max_tls1_2_intermediate_cipher) - server_old.succeed(curl_max_tls1_2_old_cipher) + server_old.succeed(curl_max_tls1_2.format(port="${oldPortStr}")) + server_old.succeed(curl_max_tls1_2_intermediate_cipher.format(port="${oldPortStr}")) + server_old.succeed(curl_max_tls1_2_old_cipher.format(port="${oldPortStr}")) ''; } From cb89189157d6db26a9eb37b155defee5a6a9a1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sun, 9 Nov 2025 13:21:23 +0700 Subject: [PATCH 1998/2279] nixos/tests/h2o: use client to check + start_all() machines --- nixos/tests/web-servers/h2o/basic.nix | 46 +++++++++++++------ nixos/tests/web-servers/h2o/mruby.nix | 23 +++++++--- .../web-servers/h2o/tls-recommendations.nix | 4 ++ 3 files changed, 52 insertions(+), 21 deletions(-) diff --git a/nixos/tests/web-servers/h2o/basic.nix b/nixos/tests/web-servers/h2o/basic.nix index 9b67f3397536..6c8c863475c0 100644 --- a/nixos/tests/web-servers/h2o/basic.nix +++ b/nixos/tests/web-servers/h2o/basic.nix @@ -36,12 +36,8 @@ in nodes = { server = - { pkgs, config, ... }: + { config, ... }: { - environment.systemPackages = [ - pkgs.curl - ]; - services.h2o = { enable = true; defaultHTTPListenPort = 8080; @@ -111,12 +107,30 @@ in ]; }; extraHosts = '' - 127.0.0.1 ${domain.HTTP} - 127.0.0.1 ${domain.TLS} + ${config.networking.primaryIPAddress} ${domain.HTTP} + ${config.networking.primaryIPAddress} ${domain.TLS} ''; }; }; + + client = + { nodes, pkgs, ... }: + { + environment.systemPackages = [ + pkgs.curl + ]; + + security.pki.certificates = [ + (builtins.readFile ../../common/acme/server/ca.cert.pem) + ]; + + networking.extraHosts = '' + ${nodes.server.networking.primaryIPAddress} ${domain.HTTP} + ${nodes.server.networking.primaryIPAddress} ${domain.TLS} + ''; + }; }; + testScript = { nodes, ... }: let @@ -126,30 +140,32 @@ in in # python '' + start_all() + server.wait_for_unit("h2o.service") server.wait_for_open_port(${portStrHTTP}) server.wait_for_open_port(${portStrTLS}) - assert "${sawatdi_chao_lok}" in server.succeed("curl --fail-with-body 'http://${domain.HTTP}:${portStrHTTP}/hello_world.txt'") + assert "${sawatdi_chao_lok}" in client.succeed("curl --fail-with-body 'http://${domain.HTTP}:${portStrHTTP}/hello_world.txt'") - tls_hello_world_head = server.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower() + tls_hello_world_head = client.succeed("curl -v --head --compressed --http2 --tlsv1.3 --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower() assert "http/2 200" in tls_hello_world_head assert "server: h2o" in tls_hello_world_head assert "content-type: text/x-rst" in tls_hello_world_head - assert "${sawatdi_chao_lok}" in server.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'") + assert "${sawatdi_chao_lok}" in client.succeed("curl -v --http2 --tlsv1.3 --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'") - quic_hello_world_head = server.succeed("curl -v --head --compressed --http3-only --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower() + quic_hello_world_head = client.succeed("curl -v --head --compressed --http3-only --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'").lower() assert "http/3 200" in quic_hello_world_head assert "server: h2o" in quic_hello_world_head assert "content-type: text/x-rst" in quic_hello_world_head - assert "${sawatdi_chao_lok}" in server.succeed("curl -v --http3-only --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'") + assert "${sawatdi_chao_lok}" in client.succeed("curl -v --http3-only --compressed --fail-with-body 'https://${domain.TLS}:${portStrTLS}/hello_world.rst'") - assert "redirected" in server.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'").lower() + assert "redirected" in client.succeed("curl -v --head --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'").lower() - server.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'") + client.fail("curl --location --max-redirs 0 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'") - assert "${sawatdi_chao_lok}" in server.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'") + assert "${sawatdi_chao_lok}" in client.succeed("curl -v --location --fail-with-body 'http://${domain.TLS}:${portStrHTTP}/hello_world.rst'") ''; } diff --git a/nixos/tests/web-servers/h2o/mruby.nix b/nixos/tests/web-servers/h2o/mruby.nix index 803e6c96de83..c9a4d95c056b 100644 --- a/nixos/tests/web-servers/h2o/mruby.nix +++ b/nixos/tests/web-servers/h2o/mruby.nix @@ -14,7 +14,7 @@ in nodes = { server = - { pkgs, ... }: + { pkgs, config, ... }: { services.h2o = { enable = true; @@ -41,9 +41,17 @@ in }; }; - networking.extraHosts = '' - 127.0.0.1 ${domain} - ''; + networking.firewall.allowedTCPPorts = [ + config.services.h2o.settings.listen + ]; + }; + + client = + { pkgs, ... }: + { + environment.systemPackages = [ + pkgs.curl + ]; }; }; @@ -52,14 +60,17 @@ in let inherit (nodes) server; portStr = builtins.toString server.services.h2o.settings.listen; + origin = "http://server:${portStr}"; in # python '' + start_all() + server.wait_for_unit("h2o.service") server.wait_for_open_port(${portStr}) - assert "${sawatdi_chao_lok}" in server.succeed("curl --fail-with-body http://${domain}:${portStr}/hello_world") + assert "${sawatdi_chao_lok}" in client.succeed("curl --fail-with-body ${origin}/hello_world") - assert "FILE_HANDLER" in server.succeed("curl --fail-with-body http://${domain}:${portStr}/file_handler") + assert "FILE_HANDLER" in client.succeed("curl --fail-with-body ${origin}/file_handler") ''; } diff --git a/nixos/tests/web-servers/h2o/tls-recommendations.nix b/nixos/tests/web-servers/h2o/tls-recommendations.nix index be80b9ee9e38..0fca6dbbb1b9 100644 --- a/nixos/tests/web-servers/h2o/tls-recommendations.nix +++ b/nixos/tests/web-servers/h2o/tls-recommendations.nix @@ -78,6 +78,8 @@ in maintainers = with lib.maintainers; [ toastal ]; }; + # not using a `client` since it’s easiest to test with acme.test pointing at + # localhost for these machines nodes = { server_modern = mkH2OServer "modern"; server_intermediate = mkH2OServer "intermediate"; @@ -100,6 +102,8 @@ in curl_max_tls1_2_intermediate_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256' 'https://${domain}:{port}/'" curl_max_tls1_2_old_cipher ="curl -v --tlsv1.0 --tls-max 1.2 --ciphers 'ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256' 'https://${domain}:{port}/'" + start_all() + server_modern.wait_for_unit("h2o.service") server_modern.wait_for_open_port(${modernPortStr}) modern_response = server_modern.succeed(curl_basic.format(port="${modernPortStr}")) From cfbc41e7cbe43a97f942863a2db17cc3161daf45 Mon Sep 17 00:00:00 2001 From: Svenum Date: Sun, 9 Nov 2025 18:56:26 +0100 Subject: [PATCH 1999/2279] tail-tray: 0.2.23 -> 0.2.27 --- pkgs/by-name/ta/tail-tray/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 883285623381..cdb9cf9b9a8b 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, davfs2, cmake, extra-cmake-modules, @@ -12,24 +11,15 @@ stdenv.mkDerivation rec { pname = "tail-tray"; - version = "0.2.23"; + version = "0.2.27"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${version}"; - hash = "sha256-fnr7EheVG3G4oLAe9liAy5qCDED/7eL0mUiE0qXsco4="; + hash = "sha256-/T7t8I1cfhNmTW277X8lz68qsp2KIDJPxAgUibh6O+w="; }; - patches = [ - # https://github.com/SneWs/tail-tray/pull/82 - (fetchpatch { - name = "dont-use-absoulte-paths-in-desktop-file.patch"; - url = "https://github.com/SneWs/tail-tray/commit/08aa4a4e061f21c2dcd07c94249f2eb15c4e4416.patch"; - hash = "sha256-6YOJes40e2rgVabYns55M5h1FGyFG+gjSewCaXesT8U="; - }) - ]; - nativeBuildInputs = with kdePackages; [ wrapQtAppsHook qttools From 528ae39cd99815631ffe21776675e3ac30b2b5b1 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sun, 9 Nov 2025 12:57:15 -0500 Subject: [PATCH 2000/2279] cemu-ti: disable deploy script generation It's broken with Qt 6.10 and not used by this package. --- .../science/math/cemu-ti/cmake-no-deploy.patch | 13 +++++++++++++ pkgs/applications/science/math/cemu-ti/default.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch diff --git a/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch b/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch new file mode 100644 index 000000000000..919dbc05331d --- /dev/null +++ b/pkgs/applications/science/math/cemu-ti/cmake-no-deploy.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68ce1294..5c2924f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -350,7 +350,7 @@ message("Binary dir: ${CMAKE_CURRENT_BINARY_DIR}") + + # TODO: linux .desktop/.xml files + +-if(COMMAND qt_generate_deploy_app_script) ++if(FALSE) + qt_generate_deploy_app_script( + TARGET CEmu + FILENAME_VARIABLE deploy_script diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index 01e1602406fd..1a4f3c253513 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { # This is resolved upstream, but I can't apply the patch because the # sourceRoot isn't set to the base of the Git repo. ./resolve-ambiguous-constexpr.patch + # Disable the deploy_script generation. It's broken with Qt 6.10 and not used by this package. + ./cmake-no-deploy.patch ]; nativeBuildInputs = [ From a01aeeb9b1bb9a646bdbc2f590b29285bf65a3e7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 9 Nov 2025 19:23:47 +0100 Subject: [PATCH 2001/2279] lib/modules: Add false positive info to check coherence assertion Unfortunately, we don't have a good enough way to discern this possibility. Technically we could add yet another attribute, but that does not seem to be worth the cost at this point, in terms of complexity and possibly even performance. I take the blame for this one. I identified the need for the second merge commit in review but didn't require it in the first merge. These changes really should have been done in a single merge. That would have prevented this situation. --- lib/modules.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/modules.nix b/lib/modules.nix index a78bd1a92488..e545f9c9707d 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1147,6 +1147,9 @@ let instead of: baseType // { check = value: /* your check */; } + + Alternatively, this message may also occur as false positive when mixing Nixpkgs + versions, if one Nixpkgs is between 83fed2e6..58696117 (Aug 28 - Oct 28 2025) ''; # Merge definitions of a value of a given type. From 0d3784037e4e7d00f0f3f92f311bfa1fef13fb1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 18:33:56 +0000 Subject: [PATCH 2002/2279] gdevelop: 5.5.244 -> 5.5.245 --- pkgs/by-name/gd/gdevelop/darwin.nix | 2 +- pkgs/by-name/gd/gdevelop/linux.nix | 2 +- pkgs/by-name/gd/gdevelop/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index f97425ccc806..7a5044b9a86f 100644 --- a/pkgs/by-name/gd/gdevelop/darwin.nix +++ b/pkgs/by-name/gd/gdevelop/darwin.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip"; - hash = "sha256-rrPRIOnVPC7Moh+ewRbsV81oO7WridpUUoaOnEqm43o="; + hash = "sha256-F7yYZgCBMmRX1yYWC60RRtIw/ObDcbUcwY0yF4Ikagg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index 89b881330ab0..6412678283de 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -13,7 +13,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage"; - hash = "sha256-IfgeeH+vNjIi0adrmXIjjX41qUxIWpoH2eX+Bd7h9AA="; + hash = "sha256-LwFialu3vQehcGVleuCSmDrrsw7b0uTxuAFhSwdE9jQ="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix index bf42256f33ff..3b0528c4f080 100644 --- a/pkgs/by-name/gd/gdevelop/package.nix +++ b/pkgs/by-name/gd/gdevelop/package.nix @@ -4,7 +4,7 @@ callPackage, }: let - version = "5.5.244"; + version = "5.5.245"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; From c83e2729f5d3d90a0394172c0df2e735c5b96ba7 Mon Sep 17 00:00:00 2001 From: birkb Date: Sun, 9 Nov 2025 18:26:38 +0100 Subject: [PATCH 2003/2279] drbd-utils: 9.32.0 -> 9.33.0 - gettext build inputs added fix the ja docs Signed-off-by: birkb --- pkgs/os-specific/linux/drbd/utils.nix | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix index 9f382c785717..c29891a60215 100644 --- a/pkgs/os-specific/linux/drbd/utils.nix +++ b/pkgs/os-specific/linux/drbd/utils.nix @@ -15,6 +15,7 @@ systemd, keyutils, udevCheckHook, + gettext, # drbd-utils are compiled twice, once with forOCF = true to extract # its OCF definitions for use in the ocf-resource-agents derivation, @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { pname = "drbd"; - version = "9.32.0"; + version = "9.33.0"; src = fetchurl { url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz"; - hash = "sha256-szOM7jSbXEZZ4p1P73W6tK9Put0+wOZar+cUiUNC6M0="; + hash = "sha256-Ij/gfQtkbpkbM7qepBRo+aZvkDVi59p2bdD8a06jPbk="; }; nativeBuildInputs = [ @@ -40,11 +41,13 @@ stdenv.mkDerivation rec { asciidoctor keyutils udevCheckHook + gettext ]; buildInputs = [ perl perlPackages.Po4a + gettext ]; configureFlags = [ @@ -98,20 +101,6 @@ stdenv.mkDerivation rec { patch_docbook45 documentation/v9/drbdsetup.xml.in patch_docbook45 documentation/v84/drbdsetup.xml patch_docbook45 documentation/v84/drbd.conf.xml - # The ja documentation is disabled because: - # make[1]: Entering directory '/build/drbd-utils-9.16.0/documentation/ja/v84' - # /nix/store/wyx2nn2pjcn50lc95c6qgsgm606rn0x2-perl5.32.1-po4a-0.62/bin/po4a-translate -f docbook -M utf-8 -L utf-8 -keep 0 -m ../../v84/drbdsetup.xml -p drbdsetup.xml.po -l drbdsetup.xml - # Use of uninitialized value $args[1] in sprintf at /nix/store/wyx2nn2pjcn50lc95c6qgsgm606rn0x2-perl5.32.1-po4a-0.62/lib/perl5/site_perl/Locale/Po4a/Common.pm line 134. - # Invalid po file drbdsetup.xml.po: - substituteInPlace Makefile.in \ - --replace 'DOC_DIRS := documentation/v9 documentation/ja/v9' \ - 'DOC_DIRS := documentation/v9' \ - --replace 'DOC_DIRS += documentation/v84 documentation/ja/v84' \ - 'DOC_DIRS += documentation/v84' \ - --replace '$(MAKE) -C documentation/ja/v9 doc' \ - "" \ - --replace '$(MAKE) -C documentation/ja/v84 doc' \ - "" substituteInPlace user/v9/drbdtool_common.c \ --replace 'add_component_to_path("/lib/drbd");' \ 'add_component_to_path("${placeholder "out"}/lib/drbd");' @@ -139,7 +128,7 @@ stdenv.mkDerivation rec { ]; longDescription = '' DRBD is a software-based, shared-nothing, replicated storage solution - mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts. + mirroring the content of block devices (hard disks, partitions, logical volumes etc.) between hosts. ''; }; } From d17ec6705fed9ac6238187936c97e3f3cade99f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 18:45:10 +0000 Subject: [PATCH 2004/2279] python3Packages.iamdata: 0.1.202511081 -> 0.1.202511091 --- pkgs/development/python-modules/iamdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index fde5b9ed486e..78261611b7dd 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511081"; + version = "0.1.202511091"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-0yV5yZ0gElw2p8UjwU6ujkXu1DV2cmOPlG9XgObUNUA="; + hash = "sha256-1XO1vovWAMIKOdEPKANLUBTfOHQuQrkp3ie5aAFYlDI="; }; __darwinAllowLocalNetworking = true; From a351f03c86034c7ed6201b84b47fe2b8ed8dc1bf Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 9 Nov 2025 19:07:48 +0100 Subject: [PATCH 2005/2279] logrotate: skip breaking tests --- pkgs/by-name/lo/logrotate/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/logrotate/package.nix b/pkgs/by-name/lo/logrotate/package.nix index 9db688ab8ac1..70642b44ef13 100644 --- a/pkgs/by-name/lo/logrotate/package.nix +++ b/pkgs/by-name/lo/logrotate/package.nix @@ -33,8 +33,12 @@ stdenv.mkDerivation rec { preCheck = '' sed -i 's#/bin/date#${lib.getExe' coreutils "date"}#' test/*.sh - # Skip this test because it depends on a working root user, which we don't have in the sandbox - # Exiting with 77 signals that the test is skipped, and we only place it on line 2 because the shebang is on line 1 + # Exiting with 77 signals that a test is skipped, and we only place it on line 2 because the shebang is on line 1 + # Does not work on certain filesystems due to incorrect sparse file detection. + # Upstream issue: https://github.com/logrotate/logrotate/issues/682 + sed -i '2iexit 77' test/test-0062.sh + sed -i '2iexit 77' test/test-0063.sh + # Depends on a working root user, which we don't have in the sandbox sed -i '2iexit 77' test/test-0110.sh ''; doCheck = true; From 42ec1c05896ee7703f6a8cbcdd0f18a3d2e1be45 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:01:25 -0500 Subject: [PATCH 2006/2279] coc-nginx: migrate from nodePackages --- .../editors/vim/plugins/cocPlugins.nix | 7 ++ .../vim/plugins/nodePackagePlugins.nix | 11 +-- pkgs/by-name/co/coc-nginx/package.nix | 71 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----- 6 files changed, 81 insertions(+), 28 deletions(-) create mode 100644 pkgs/by-name/co/coc-nginx/package.nix diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index c073c194ca1e..2c89ba9de6a6 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -2,6 +2,7 @@ lib, buildVimPlugin, pkgs, + coc-nginx, }: final: prev: let @@ -60,3 +61,9 @@ lib.genAttrs cocPackages ( src = "${cocPkg}/lib/node_modules/${cocPkg.pname}"; } ) +// { + coc-nginx = buildVimPlugin { + inherit (coc-nginx) pname version meta; + src = "${coc-nginx}/lib/node_modules/@yaegassy/coc-nginx"; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix index 03fe172d2380..a19baf3d6f55 100644 --- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix @@ -10,20 +10,13 @@ let "coc-ltex" "coc-tsserver" "coc-ultisnips" - "coc-nginx" ]; - - packageNameOverrides = { - "coc-nginx" = "@yaegassy/coc-nginx"; - }; - - getPackageName = name: packageNameOverrides.${name} or name; in lib.genAttrs nodePackageNames ( name: buildVimPlugin { pname = name; - inherit (nodePackages.${getPackageName name}) version meta; - src = "${nodePackages.${getPackageName name}}/lib/node_modules/${getPackageName name}"; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; } ) diff --git a/pkgs/by-name/co/coc-nginx/package.nix b/pkgs/by-name/co/coc-nginx/package.nix new file mode 100644 index 000000000000..7ffe64dc2314 --- /dev/null +++ b/pkgs/by-name/co/coc-nginx/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, + esbuild, + buildGoModule, +}: +let + esbuild' = + let + version = "0.16.17"; + in + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "coc-nginx"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "yaegassy"; + repo = "coc-nginx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9dca1YUQZCbzmGe+9qVJABCWZCGUUZDvtznMQEP/CCQ="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-CBw2E93EWmBOCppj1gxYuAynHBZDJBPh58X099TP5mE="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + esbuild' + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "nginx-language-server extension for coc.nvim"; + homepage = "https://github.com/yaegassy/coc-nginx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 3c9930c12c27..f8f4c7bddebc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -66,6 +66,7 @@ mapAliases { "@webassemblyjs/wasm-text-gen-1.11.1" = pkgs.wasm-text-gen; # Added 2025-11-06 "@webassemblyjs/wast-refmt-1.11.1" = pkgs.wast-refmt; # Added 2025-11-06 "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25 + "@yaegassy/coc-nginx" = pkgs.coc-nginx; # Added 2025-11-08 "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09 inherit (pkgs) autoprefixer; # added 2024-06-25 inherit (pkgs) asar; # added 2023-08-26 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6ffa0b2e5281..be35ffa34b4d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -76,5 +76,4 @@ , "vega-cli" , "vercel" , "wavedrom-cli" -, "@yaegassy/coc-nginx" ] diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b882ae1a03f7..f7a1dc56e47d 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -40129,22 +40129,4 @@ in bypassCache = true; reconstructLock = true; }; - "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage { - name = "_at_yaegassy_slash_coc-nginx"; - packageName = "@yaegassy/coc-nginx"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yaegassy/coc-nginx/-/coc-nginx-0.4.1.tgz"; - sha512 = "GJeiQWiBDxKsWPowBLBjxnPzaRT50L9tLDtD9dZcKh8OQTdrOJGa7cqNz7T/xuqSq3r+AyD1mmeNSL7141HMsQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "nginx-language-server extension for coc.nvim"; - homepage = "https://github.com/yaegassy/coc-nginx#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; } From 9cf3ceab665cb2896754bb3e34c5794c6f0f1983 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:13:26 -0500 Subject: [PATCH 2007/2279] code-theme-converter: migrate from nodePackages --- .../co/code-theme-converter/package.nix | 43 ++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 684 ------------------ 4 files changed, 44 insertions(+), 685 deletions(-) create mode 100644 pkgs/by-name/co/code-theme-converter/package.nix diff --git a/pkgs/by-name/co/code-theme-converter/package.nix b/pkgs/by-name/co/code-theme-converter/package.nix new file mode 100644 index 000000000000..01ceba741263 --- /dev/null +++ b/pkgs/by-name/co/code-theme-converter/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "code-theme-converter"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "tobiastimm"; + repo = "code-theme-converter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-b6b0s6FXyHwoAJnPTaLu9fMQJVpBSqfGBk/KqDbaK9U="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-M8zLr/BPQfS50ZsTwN/YdJAlYUtS9edE/jh+l1wBqR8="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Convert any Visual Studio Code Theme to Sublime Text 3 or IntelliJ IDEA"; + homepage = "https://github.com/tobiastimm/code-theme-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f8f4c7bddebc..cb18bf8fd1d2 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -130,6 +130,7 @@ mapAliases { inherit (pkgs) coc-wxml; # Added 2025-11-05 inherit (pkgs) coc-yaml; # Added 2025-11-05 inherit (pkgs) coc-yank; # Added 2025-11-05 + inherit (pkgs) code-theme-converter; # Added 2025-11-08 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index be35ffa34b4d..abcad7ed111e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,7 +17,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "code-theme-converter" , "conventional-changelog-cli" , "cpy-cli" , "dhcp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f7a1dc56e47d..7b2cbcb8c933 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3513,15 +3513,6 @@ let sha512 = "/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="; }; }; - "@xmldom/xmldom-0.8.10" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; - sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; - }; - }; "@xmldom/xmldom-0.9.8" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; @@ -3531,15 +3522,6 @@ let sha512 = "p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A=="; }; }; - "@xstate/fsm-1.6.5" = { - name = "_at_xstate_slash_fsm"; - packageName = "@xstate/fsm"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; - sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; - }; - }; "@yarnpkg/lockfile-1.0.2" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -5178,15 +5160,6 @@ let sha512 = "YFgPTVRhUMncZr8tM3ige7gnViMGhKoGF23qaiISRG8xtYebTGHrMSMXsTXo6O1KbtdEI+4jzvGY1K/wdT9GUA=="; }; }; - "bl-1.2.3" = { - name = "bl"; - packageName = "bl"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"; - sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -6069,15 +6042,6 @@ let sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw=="; }; }; - "capture-stack-trace-1.0.2" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.2.tgz"; - sha512 = "X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w=="; - }; - }; "cardinal-2.1.1" = { name = "cardinal"; packageName = "cardinal"; @@ -6114,15 +6078,6 @@ let sha512 = "prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A=="; }; }; - "caw-2.0.1" = { - name = "caw"; - packageName = "caw"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; - }; - }; "ccount-2.0.1" = { name = "ccount"; packageName = "ccount"; @@ -6771,15 +6726,6 @@ let sha512 = "iWDjmP8kvsMdBmLTHxFaqXikO8EdFRDfim7k6vUHglY/2xJ5jLrPsnQGijdfp4U+sr/BeecG0wKm02dSIAeQ1g=="; }; }; - "cmd-shim-2.1.0" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.1.0.tgz"; - sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; - }; - }; "cmdln-3.2.1" = { name = "cmdln"; packageName = "cmdln"; @@ -7059,15 +7005,6 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.1.0" = { - name = "commander"; - packageName = "commander"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -7788,15 +7725,6 @@ let sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; - }; - }; "create-hash-1.2.0" = { name = "create-hash"; packageName = "create-hash"; @@ -7842,15 +7770,6 @@ let sha512 = "Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="; }; }; - "cross-spawn-6.0.6" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "6.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz"; - sha512 = "VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw=="; - }; - }; "cross-spawn-7.0.6" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -8436,15 +8355,6 @@ let sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; }; - "decompress-4.2.1" = { - name = "decompress"; - packageName = "decompress"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz"; - sha512 = "e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ=="; - }; - }; "decompress-response-3.3.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -8472,42 +8382,6 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; - "decompress-tar-4.1.1" = { - name = "decompress-tar"; - packageName = "decompress-tar"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz"; - sha512 = "JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ=="; - }; - }; - "decompress-tarbz2-4.1.1" = { - name = "decompress-tarbz2"; - packageName = "decompress-tarbz2"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz"; - sha512 = "s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A=="; - }; - }; - "decompress-targz-4.1.1" = { - name = "decompress-targz"; - packageName = "decompress-targz"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz"; - sha512 = "4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w=="; - }; - }; - "decompress-unzip-4.0.1" = { - name = "decompress-unzip"; - packageName = "decompress-unzip"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz"; - sha512 = "1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw=="; - }; - }; "deep-equal-1.1.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -9183,24 +9057,6 @@ let sha512 = "vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw=="; }; }; - "download-5.0.3" = { - name = "download"; - packageName = "download"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/download/-/download-5.0.3.tgz"; - sha512 = "rE0V29BV5FyylK3Uw5hmP90TBuwGHAqPYfaRHW/VHsKe9Xqi7RACVg0k0FokeE+MTWr9mtUy75GyszRACiD3Ow=="; - }; - }; - "download-git-repo-1.1.0" = { - name = "download-git-repo"; - packageName = "download-git-repo"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-1.1.0.tgz"; - sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -10299,15 +10155,6 @@ let sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; - "execa-1.0.0" = { - name = "execa"; - packageName = "execa"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; - }; - }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -10848,33 +10695,6 @@ let sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; }; }; - "file-type-3.9.0" = { - name = "file-type"; - packageName = "file-type"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; - sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; - }; - }; - "file-type-5.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz"; - sha512 = "Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ=="; - }; - }; - "file-type-6.2.0" = { - name = "file-type"; - packageName = "file-type"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz"; - sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -10902,24 +10722,6 @@ let sha512 = "BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="; }; }; - "filename-reserved-regex-2.0.0" = { - name = "filename-reserved-regex"; - packageName = "filename-reserved-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; - sha512 = "lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ=="; - }; - }; - "filenamify-2.1.0" = { - name = "filenamify"; - packageName = "filenamify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz"; - sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -11604,15 +11406,6 @@ let sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="; }; }; - "get-proxy-2.1.0" = { - name = "get-proxy"; - packageName = "get-proxy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; - }; - }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -11649,24 +11442,6 @@ let sha512 = "dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA=="; }; }; - "get-stream-2.3.1" = { - name = "get-stream"; - packageName = "get-stream"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; - sha512 = "AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA=="; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; - }; - }; "get-stream-4.1.0" = { name = "get-stream"; packageName = "get-stream"; @@ -11757,15 +11532,6 @@ let sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; }; }; - "git-clone-0.1.0" = { - name = "git-clone"; - packageName = "git-clone"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-clone/-/git-clone-0.1.0.tgz"; - sha512 = "zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="; - }; - }; "git-diff-tree-1.1.0" = { name = "git-diff-tree"; packageName = "git-diff-tree"; @@ -12135,15 +11901,6 @@ let sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA=="; }; }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha512 = "Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg=="; - }; - }; "got-9.6.0" = { name = "got"; packageName = "got"; @@ -12360,15 +12117,6 @@ let sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; - "has-symbol-support-x-1.4.2" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; - }; - }; "has-symbols-1.1.0" = { name = "has-symbols"; packageName = "has-symbols"; @@ -12378,15 +12126,6 @@ let sha512 = "1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="; }; }; - "has-to-string-tag-x-1.4.1" = { - name = "has-to-string-tag-x"; - packageName = "has-to-string-tag-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; - }; - }; "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; @@ -14133,15 +13872,6 @@ let sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="; }; }; - "is-natural-number-4.0.1" = { - name = "is-natural-number"; - packageName = "is-natural-number"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz"; - sha512 = "Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ=="; - }; - }; "is-npm-5.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -14232,15 +13962,6 @@ let sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; - "is-object-1.0.2" = { - name = "is-object"; - packageName = "is-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz"; - sha512 = "2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA=="; - }; - }; "is-observable-1.1.0" = { name = "is-observable"; packageName = "is-observable"; @@ -14358,15 +14079,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; - }; - }; "is-reference-3.0.3" = { name = "is-reference"; packageName = "is-reference"; @@ -14754,15 +14466,6 @@ let sha512 = "7731a/t2llyrk8Hdwl1x3LkhIFGzxHQGpJA7Ur9cIRViakQF2y25Lwhx8Ziy1B068+kBYUmYPBzw5uo3DdWrdQ=="; }; }; - "isurl-1.0.0" = { - name = "isurl"; - packageName = "isurl"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; - }; - }; "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; @@ -18570,15 +18273,6 @@ let sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="; }; }; - "nice-try-1.0.5" = { - name = "nice-try"; - packageName = "nice-try"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; - }; - }; "nijs-0.0.25" = { name = "nijs"; packageName = "nijs"; @@ -18966,15 +18660,6 @@ let sha512 = "tlEhXU3689VLUHYEZTS/BC61vfeN2xSSZwoWDT6WLuenZTpDmGmNT5mtl15erTR0/A15ldK06/NEKg9jYJ9OTQ=="; }; }; - "npm-conf-1.1.3" = { - name = "npm-conf"; - packageName = "npm-conf"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; - }; - }; "npm-install-checks-7.1.1" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -19083,15 +18768,6 @@ let sha512 = "LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ=="; }; }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; - }; - }; "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -19767,15 +19443,6 @@ let sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -20370,15 +20037,6 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "path-key-2.0.1" = { - name = "path-key"; - packageName = "path-key"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; - }; - }; "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; @@ -20793,15 +20451,6 @@ let sha512 = "dL9Xc2Aj3YyBnwvCNuHmFl2LWvQacm/HEAsoVwLiuu0POboMChETt5wexpU1P6F6MnibIucXlVsMFFgNUT2IyA=="; }; }; - "plist-3.1.0" = { - name = "plist"; - packageName = "plist"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz"; - sha512 = "uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ=="; - }; - }; "plur-4.0.0" = { name = "plur"; packageName = "plur"; @@ -20946,15 +20595,6 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha512 = "PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="; - }; - }; "prepend-http-2.0.0" = { name = "prepend-http"; packageName = "prepend-http"; @@ -23421,15 +23061,6 @@ let sha512 = "yEsN6TuxZhZ1Tl9iB81frTNS292m0I/IG7+w8lTvfcJQP2x3vnpOoevjBoE3Np5A6KnZM2+RtVenihj9t6NiYg=="; }; }; - "seek-bzip-1.0.6" = { - name = "seek-bzip"; - packageName = "seek-bzip"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz"; - sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -23718,15 +23349,6 @@ let sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg=="; }; }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; - }; - }; "shebang-command-2.0.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -23736,15 +23358,6 @@ let sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; - }; - }; "shebang-regex-3.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; @@ -24015,15 +23628,6 @@ let sha512 = "oVTC072yJCXdkjUXAA3rRsRo1op6XfAH1/AXJQznxdwwiYTEvYB6eG9SOU8FeVaEuz+LuoPDYEY5BBMj+uRHVQ=="; }; }; - "slash-2.0.0" = { - name = "slash"; - packageName = "slash"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; - }; - }; "slash-3.0.0" = { name = "slash"; packageName = "slash"; @@ -25095,24 +24699,6 @@ let sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; - "strip-dirs-2.1.0" = { - name = "strip-dirs"; - packageName = "strip-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz"; - sha512 = "JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g=="; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; - }; - }; "strip-final-newline-2.0.0" = { name = "strip-final-newline"; packageName = "strip-final-newline"; @@ -25185,15 +24771,6 @@ let sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; - "strip-outer-1.0.1" = { - name = "strip-outer"; - packageName = "strip-outer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"; - sha512 = "k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg=="; - }; - }; "strnum-1.1.2" = { name = "strnum"; packageName = "strnum"; @@ -25473,15 +25050,6 @@ let sha512 = "ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg=="; }; }; - "tar-stream-1.6.2" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"; - sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A=="; - }; - }; "tar-stream-2.2.0" = { name = "tar-stream"; packageName = "tar-stream"; @@ -25707,15 +25275,6 @@ let sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g=="; }; }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha512 = "G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="; - }; - }; "timers-browserify-1.4.2" = { name = "timers-browserify"; packageName = "timers-browserify"; @@ -25770,15 +25329,6 @@ let sha512 = "LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="; }; }; - "to-buffer-1.1.1" = { - name = "to-buffer"; - packageName = "to-buffer"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; - sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="; - }; - }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -25968,15 +25518,6 @@ let sha512 = "jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ=="; }; }; - "trim-repeated-1.0.0" = { - name = "trim-repeated"; - packageName = "trim-repeated"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"; - sha512 = "pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg=="; - }; - }; "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; @@ -27057,15 +26598,6 @@ let sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha512 = "N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw=="; - }; - }; "upath-1.2.0" = { name = "upath"; packageName = "upath"; @@ -27165,15 +26697,6 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha512 = "BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA=="; - }; - }; "url-parse-lax-3.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -27183,15 +26706,6 @@ let sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; }; }; - "url-to-options-1.0.1" = { - name = "url-to-options"; - packageName = "url-to-options"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="; - }; - }; "urlpattern-polyfill-10.0.0" = { name = "urlpattern-polyfill"; packageName = "urlpattern-polyfill"; @@ -32512,204 +32026,6 @@ in bypassCache = true; reconstructLock = true; }; - code-theme-converter = nodeEnv.buildNodePackage { - name = "code-theme-converter"; - packageName = "code-theme-converter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/code-theme-converter/-/code-theme-converter-1.2.1.tgz"; - sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; - }; - dependencies = [ - sources."@xmldom/xmldom-0.8.10" - sources."@xstate/fsm-1.6.5" - sources."ansi-styles-3.2.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-1.2.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."capture-stack-trace-1.0.2" - sources."caw-2.0.1" - sources."chalk-2.4.2" - sources."cmd-shim-2.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."config-chain-1.1.13" - sources."core-util-is-1.0.3" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.6" - sources."decompress-4.2.1" - sources."decompress-tar-4.1.1" - ( - sources."decompress-tarbz2-4.1.1" - // { - dependencies = [ - sources."file-type-6.2.0" - ]; - } - ) - sources."decompress-targz-4.1.1" - ( - sources."decompress-unzip-4.0.1" - // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - } - ) - sources."download-5.0.3" - sources."download-git-repo-1.1.0" - sources."duplexer3-0.1.5" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - ( - sources."execa-1.0.0" - // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - } - ) - sources."fd-slicer-1.1.0" - sources."file-type-5.2.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" - sources."git-clone-0.1.0" - sources."glob-7.2.3" - sources."got-6.7.1" - sources."graceful-fs-4.2.11" - sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-to-string-tag-x-1.4.1" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-natural-number-4.0.1" - sources."is-object-1.0.2" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isurl-1.0.0" - sources."js2xmlparser-4.0.2" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."lowercase-keys-1.0.1" - ( - sources."make-dir-1.3.0" - // { - dependencies = [ - sources."pify-3.0.0" - ]; - } - ) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."nice-try-1.0.5" - ( - sources."npm-conf-1.1.3" - // { - dependencies = [ - sources."pify-3.0.0" - ]; - } - ) - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."p-finally-1.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."plist-3.1.0" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."pump-3.0.2" - sources."ramda-0.27.2" - ( - sources."readable-stream-2.3.8" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.1" - ( - sources."seek-bzip-1.0.6" - // { - dependencies = [ - sources."commander-2.20.3" - ]; - } - ) - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."slash-2.0.0" - ( - sources."string_decoder-1.1.1" - // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - } - ) - sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" - sources."strip-outer-1.0.1" - sources."supports-color-5.5.0" - sources."tar-stream-1.6.2" - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."to-buffer-1.1.1" - sources."trim-repeated-1.0.0" - sources."tunnel-agent-0.6.0" - sources."unbzip2-stream-1.4.3" - sources."universalify-0.1.2" - sources."unzip-response-2.0.1" - sources."url-parse-lax-1.0.0" - sources."url-to-options-1.0.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."xmlbuilder-15.1.1" - sources."xmlcreate-2.0.4" - sources."xtend-4.0.2" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Convert any vscode theme with ease"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; conventional-changelog-cli = nodeEnv.buildNodePackage { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; From 0d94a711119266f5be117c53042e9f5bd65cd176 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 15:24:32 -0500 Subject: [PATCH 2008/2279] diff2html-cli: migrate from nodePackages --- pkgs/by-name/di/diff2html-cli/package.nix | 47 +++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 182 ------------------ 5 files changed, 48 insertions(+), 184 deletions(-) create mode 100644 pkgs/by-name/di/diff2html-cli/package.nix diff --git a/pkgs/by-name/di/diff2html-cli/package.nix b/pkgs/by-name/di/diff2html-cli/package.nix new file mode 100644 index 000000000000..f978092e7352 --- /dev/null +++ b/pkgs/by-name/di/diff2html-cli/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "diff2html-cli"; + version = "5.2.15"; + + src = fetchFromGitHub { + owner = "rtfpessoa"; + repo = "diff2html-cli"; + rev = finalAttrs.version; + hash = "sha256-aQoWn5n+xpYjhDQjw9v5HzWf/Hhmm6AK22OG4Ugq6Gk="; + }; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail "4.2.1" "${finalAttrs.version}"; + ''; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-9JkzWhsXUrjnMcDDJfqm+tZ+WV5j3CHJbpn9j7v/KLg="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + meta = { + description = "Generate pretty HTML diffs from unified and git diff output in your terminal"; + homepage = "https://diff2html.xyz#cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "diff2html"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index cb18bf8fd1d2..dc1d6b7986f5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -144,6 +144,7 @@ mapAliases { dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 + inherit (pkgs) diff2html-cli; # Added 2025-11-08 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 6979f88e5242..e49eb1dbc12c 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -10,7 +10,6 @@ clipboard-cli = "clipboard"; conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; - diff2html-cli = "diff2html"; fast-cli = "fast"; fauna-shell = "fauna"; fkill-cli = "fkill"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index abcad7ed111e..23004c2d7a22 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -20,7 +20,6 @@ , "conventional-changelog-cli" , "cpy-cli" , "dhcp" -, "diff2html-cli" , "dotenv-vault" , "elasticdump" , "emoj" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7b2cbcb8c933..82a019701046 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -8184,15 +8184,6 @@ let sha512 = "NxuWFXR3+HJULO6F6VprWnUQbx0MXgfEuOfz3m+pw8LYZV06SHRjcaBVvVlwH132xJq12mljySVDLcbMcFM7EA=="; }; }; - "data-uri-to-buffer-4.0.1" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz"; - sha512 = "0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="; - }; - }; "data-uri-to-buffer-6.0.2" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -8823,24 +8814,6 @@ let sha512 = "uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="; }; }; - "diff-7.0.0" = { - name = "diff"; - packageName = "diff"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz"; - sha512 = "PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw=="; - }; - }; - "diff2html-3.4.51" = { - name = "diff2html"; - packageName = "diff2html"; - version = "3.4.51"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.51.tgz"; - sha512 = "/rVCSDyokkzSCEGaGjkkElXtIRwyNDRzIa3S8VUhR6pjk25p6+AMnb1s2zGmhjl66D5m/HnV3IeZoxnWsvTy+w=="; - }; - }; "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; @@ -10596,15 +10569,6 @@ let sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; - "fetch-blob-3.2.0" = { - name = "fetch-blob"; - packageName = "fetch-blob"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz"; - sha512 = "7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="; - }; - }; "fifo-0.1.4" = { name = "fifo"; packageName = "fifo"; @@ -11091,15 +11055,6 @@ let sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; - "formdata-polyfill-4.0.10" = { - name = "formdata-polyfill"; - packageName = "formdata-polyfill"; - version = "4.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz"; - sha512 = "buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g=="; - }; - }; "formidable-1.2.6" = { name = "formidable"; packageName = "formidable"; @@ -12396,15 +12351,6 @@ let sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; }; }; - "hogan.js-3.0.2" = { - name = "hogan.js"; - packageName = "hogan.js"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; - sha512 = "RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg=="; - }; - }; "homedir-polyfill-1.0.3" = { name = "homedir-polyfill"; packageName = "homedir-polyfill"; @@ -17823,15 +17769,6 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha512 = "OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew=="; - }; - }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -18381,15 +18318,6 @@ let sha512 = "h66cRVEWnPQFxh5Y1hk9MNs6jvlB26CjT727ZztkIkPN+eyRI2c9powQrBJ9pty2Kj7IBySDnYHig7QElmU4Pg=="; }; }; - "node-domexception-1.0.0" = { - name = "node-domexception"; - packageName = "node-domexception"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz"; - sha512 = "/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="; - }; - }; "node-emoji-1.11.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -18426,15 +18354,6 @@ let sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; }; }; - "node-fetch-3.3.2" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz"; - sha512 = "dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="; - }; - }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -18498,15 +18417,6 @@ let sha512 = "5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ=="; }; }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; - }; - }; "nopt-2.0.0" = { name = "nopt"; packageName = "nopt"; @@ -27624,15 +27534,6 @@ let sha512 = "bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ=="; }; }; - "web-streams-polyfill-3.3.3" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"; - sha512 = "d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="; - }; - }; "web-vitals-0.2.4" = { name = "web-vitals"; packageName = "web-vitals"; @@ -32187,89 +32088,6 @@ in bypassCache = true; reconstructLock = true; }; - diff2html-cli = nodeEnv.buildNodePackage { - name = "diff2html-cli"; - packageName = "diff2html-cli"; - version = "5.2.15"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html-cli/-/diff2html-cli-5.2.15.tgz"; - sha512 = "w1WJSzyiXDSVsz6cYPE7eu0f3KptN1fT2s/i0ENavaB9aT1Fj/3zjH00mYB14JiPdj3X0hl4PsrtBNjgGKdpkA=="; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."bundle-name-4.1.0" - sources."clipboardy-4.0.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.6" - sources."data-uri-to-buffer-4.0.1" - sources."default-browser-5.2.1" - sources."default-browser-id-5.0.0" - sources."define-lazy-prop-3.0.0" - sources."diff-7.0.0" - sources."diff2html-3.4.51" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."execa-8.0.1" - sources."fetch-blob-3.2.0" - sources."formdata-polyfill-4.0.10" - sources."get-caller-file-2.0.5" - sources."get-stream-8.0.1" - sources."hogan.js-3.0.2" - sources."human-signals-5.0.0" - sources."is-docker-3.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-inside-container-1.0.0" - sources."is-stream-3.0.0" - sources."is-wsl-3.1.0" - sources."is64bit-2.0.0" - sources."isexe-2.0.0" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mkdirp-0.3.0" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."nopt-1.0.10" - ( - sources."npm-run-path-5.3.0" - // { - dependencies = [ - sources."path-key-4.0.0" - ]; - } - ) - sources."onetime-6.0.0" - sources."open-10.1.0" - sources."path-key-3.1.1" - sources."require-directory-2.1.1" - sources."run-applescript-7.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."system-architecture-0.1.0" - sources."web-streams-polyfill-3.3.3" - sources."which-2.0.2" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast Diff to colorized HTML"; - homepage = "https://diff2html.xyz/index.html#cli"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; From e99bf3b9616ba34ba15c46c32cc72573dfbf3484 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 16:01:07 -0500 Subject: [PATCH 2009/2279] katex: migrate from nodePackages --- pkgs/by-name/ka/katex/package.nix | 67 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 21 ------ 4 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 pkgs/by-name/ka/katex/package.nix diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix new file mode 100644 index 000000000000..3c01de945680 --- /dev/null +++ b/pkgs/by-name/ka/katex/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + yarn-berry, + nodejs, + makeBinaryWrapper, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "katex"; + version = "0.16.25"; + + src = fetchFromGitHub { + owner = "katex"; + repo = "katex"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XwKjoXkn96YNxrBv2qcUSqKMtHxz9+levevc4Rz1SYw="; + }; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src; + hash = "sha256-vPYzt+ZBbi1sR7T1I08f/syTnN8hnUTqH4fKCBiFIM0="; + }; + + nativeBuildInputs = [ + yarn-berry.yarnBerryConfigHook + yarn-berry + nodejs + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn config set nodeLinker "node-modules" + yarn install --mode=skip-build --inline-builds + mkdir -p $out/lib/node_modules/katex/ + mkdir $out/bin + mv * $out/lib/node_modules/katex/ + makeWrapper ${lib.getExe nodejs} $out/bin/katex \ + --add-flags "$out/lib/node_modules/katex/cli.js" \ + --set NODE_PATH "$out/lib/node_modules/katex/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/KaTeX/KaTeX/releases/tag/v${finalAttrs.version}"; + description = "Render TeX to HTML"; + homepage = "https://katex.org/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "katex"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index dc1d6b7986f5..f05a7ab63cd5 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -203,6 +203,7 @@ mapAliases { joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 karma = pkgs.karma-runner; # added 2023-07-29 + inherit (pkgs) katex; # Added 2025-11-08 keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20 leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lerna; # added 2025-02-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 23004c2d7a22..c3283adf1511 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -39,7 +39,6 @@ , "json" , "json-refs" , "jsonlint" -, "katex" , "lcov-result-merger" , "live-server" , "livedown" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 82a019701046..8639481e8a11 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -34589,27 +34589,6 @@ in bypassCache = true; reconstructLock = true; }; - katex = nodeEnv.buildNodePackage { - name = "katex"; - packageName = "katex"; - version = "0.16.21"; - src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.21.tgz"; - sha512 = "XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A=="; - }; - dependencies = [ - sources."commander-8.3.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Fast math typesetting for the web"; - homepage = "https://katex.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; From d8e0983f4fb6816ae8082cf21d41f88734d2f118 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 16:10:48 -0500 Subject: [PATCH 2010/2279] localtunnel: migrate from nodePackages --- pkgs/by-name/lo/localtunnel/package.nix | 44 +++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 77 ------------------- 5 files changed, 45 insertions(+), 79 deletions(-) create mode 100644 pkgs/by-name/lo/localtunnel/package.nix diff --git a/pkgs/by-name/lo/localtunnel/package.nix b/pkgs/by-name/lo/localtunnel/package.nix new file mode 100644 index 000000000000..34781bea138e --- /dev/null +++ b/pkgs/by-name/lo/localtunnel/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "localtunnel"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "localtunnel"; + repo = "localtunnel"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6gEK1VjF25Kbe2drxbxUKDNJGqZ+OXgkulPkAkMR2+k="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-zq9ygsKDU4lIsNxc6ovW+IXVztQoEaJAekzBrwCK7ik="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnInstallHook + nodejs + ]; + + updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/localtunnel/localtunnel/blob/v${finalAttrs.version}/CHANGELOG.md"; + description = "CLI for localtunnel"; + homepage = "https://localtunnel.me"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "lt"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index f05a7ab63cd5..c20bcd79d4cf 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -209,6 +209,7 @@ mapAliases { inherit (pkgs) lerna; # added 2025-02-12 less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 + inherit (pkgs) localtunnel; # Added 2025-11-08 lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18 lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07 inherit (pkgs) lv_font_conv; # added 2024-06-28 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index e49eb1dbc12c..b9b549847bca 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -16,7 +16,6 @@ grunt-cli = "grunt"; gulp-cli = "gulp"; jsonlint = "jsonlint"; - localtunnel = "lt"; poor-mans-t-sql-formatter-cli = "sqlformat"; pulp = "pulp"; purescript-language-server = "purescript-language-server"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c3283adf1511..fe92e3018860 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -42,7 +42,6 @@ , "lcov-result-merger" , "live-server" , "livedown" -, "localtunnel" , "madoko" , "mathjax" , "multi-file-swagger" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8639481e8a11..b0a4ab1b2f51 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4845,15 +4845,6 @@ let sha512 = "lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="; }; }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; "axios-1.8.3" = { name = "axios"; packageName = "axios"; @@ -8247,15 +8238,6 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -19155,15 +19137,6 @@ let sha512 = "9asTNB9IkKEzWMcHmVZE7Ts3kC9G7AFHfs8i7caD8HbI76gEjdkId4z/AkP83xdZsH7PLAnnbl47qZkXuxpArw=="; }; }; - "openurl-1.1.1" = { - name = "openurl"; - packageName = "openurl"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; - sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -28200,15 +28173,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-17.1.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; - sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -35595,47 +35559,6 @@ in bypassCache = true; reconstructLock = true; }; - localtunnel = nodeEnv.buildNodePackage { - name = "localtunnel"; - packageName = "localtunnel"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; - sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."axios-0.21.4" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."debug-4.3.2" - sources."emoji-regex-8.0.0" - sources."escalade-3.2.0" - sources."follow-redirects-1.15.9" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."ms-2.1.2" - sources."openurl-1.1.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Expose localhost to the world"; - homepage = "https://github.com/localtunnel/localtunnel#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; From 2bdcf95276a78d96b31daaa44692f6b389ec0e98 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:02:11 -0500 Subject: [PATCH 2011/2279] conventional-changelog-cli: migrate from nodePackages --- .../co/conventional-changelog-cli/package.nix | 68 ++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 318 ------------------ 5 files changed, 69 insertions(+), 320 deletions(-) create mode 100644 pkgs/by-name/co/conventional-changelog-cli/package.nix diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix new file mode 100644 index 000000000000..c3d264d6ec0f --- /dev/null +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "conventional-changelog-cli"; + version = "7.1.1"; + + src = fetchFromGitHub { + owner = "conventional-changelog"; + repo = "conventional-changelog"; + tag = "conventional-changelog-v${finalAttrs.version}"; + hash = "sha256-Pgx5gM4SdSL6WCkStByA7AP2O96MjAjyeMOI+Lo2mt0="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-ZfG3F0J1hIhZlF2OadhVdbxhQrFcMYDG9gEXR04DgEI="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/conventional-changelog/ + mkdir $out/bin + mv * $out/lib/node_modules/conventional-changelog/ + chmod +x $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js + ln -s $out/lib/node_modules/conventional-changelog/packages/conventional-changelog/dist/cli/index.js $out/bin/conventional-changelog + patchShebangs $out/bin/conventional-changelog + + runHook postInstall + ''; + + postInstall = '' + substituteInPlace $out/lib/node_modules/conventional-changelog/packages/*/package.json \ + --replace-warn '"exports": "./src/index.ts"' '"exports": "./dist/index.js"' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/conventional-changelog/conventional-changelog/releases/tag/conventional-changelog-v${finalAttrs.version}"; + description = "Generate a CHANGELOG from git metadata"; + homepage = "https://github.com/conventional-changelog/conventional-changelog"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "conventional-changelog"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c20bcd79d4cf..b0133d617fb8 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -135,6 +135,7 @@ mapAliases { coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) concurrently; # added 2024-08-05 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 + inherit (pkgs) conventional-changelog-cli; # Added 2025-11-08 copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16 inherit (pkgs) cordova; # added 2023-08-18 create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index b9b549847bca..d907f1456299 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -8,7 +8,6 @@ aws-cdk = "cdk"; cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; - conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; fast-cli = "fast"; fauna-shell = "fauna"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index fe92e3018860..c92752a7f4b9 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -17,7 +17,6 @@ , "coc-ltex" , "coc-tsserver" , "coc-ultisnips" -, "conventional-changelog-cli" , "cpy-cli" , "dhcp" , "dotenv-vault" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b0a4ab1b2f51..4bb78775ca20 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -444,15 +444,6 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@conventional-changelog/git-client-1.0.1" = { - name = "_at_conventional-changelog_slash_git-client"; - packageName = "@conventional-changelog/git-client"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@conventional-changelog/git-client/-/git-client-1.0.1.tgz"; - sha512 = "PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw=="; - }; - }; "@cspotcode/source-map-support-0.8.1" = { name = "_at_cspotcode_slash_source-map-support"; packageName = "@cspotcode/source-map-support"; @@ -732,15 +723,6 @@ let sha512 = "xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ=="; }; }; - "@hutson/parse-repository-url-5.0.0" = { - name = "_at_hutson_slash_parse-repository-url"; - packageName = "@hutson/parse-repository-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-5.0.0.tgz"; - sha512 = "e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg=="; - }; - }; "@ibm-cloud/openapi-ruleset-1.29.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; @@ -3234,15 +3216,6 @@ let sha512 = "JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g=="; }; }; - "@types/semver-7.5.8" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "7.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz"; - sha512 = "I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="; - }; - }; "@types/supports-color-8.1.3" = { name = "_at_types_slash_supports-color"; packageName = "@types/supports-color"; @@ -3702,15 +3675,6 @@ let sha512 = "ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g=="; }; }; - "add-stream-1.0.0" = { - name = "add-stream"; - packageName = "add-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; - sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; - }; - }; "addr-to-ip-port-1.5.4" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -4377,15 +4341,6 @@ let sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; - "array-ify-1.0.0" = { - name = "array-ify"; - packageName = "array-ify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; - sha512 = "c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="; - }; - }; "array-iterate-1.1.4" = { name = "array-iterate"; packageName = "array-iterate"; @@ -7050,15 +7005,6 @@ let sha512 = "3D+EY5nsRhqnOwDxveBv5T8wGo4DEvYxjDtPGmdOX+gfr5gE92c2RC0w2wa+xEefm07QuVqqcF3nZJUZ92l/og=="; }; }; - "compare-func-2.0.0" = { - name = "compare-func"; - packageName = "compare-func"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"; - sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; - }; - }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -7365,141 +7311,6 @@ let sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; }; }; - "conventional-changelog-6.0.0" = { - name = "conventional-changelog"; - packageName = "conventional-changelog"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-6.0.0.tgz"; - sha512 = "tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w=="; - }; - }; - "conventional-changelog-angular-8.0.0" = { - name = "conventional-changelog-angular"; - packageName = "conventional-changelog-angular"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.0.0.tgz"; - sha512 = "CLf+zr6St0wIxos4bmaKHRXWAcsCXrJU6F4VdNDrGRK3B8LDLKoX3zuMV5GhtbGkVR/LohZ6MT6im43vZLSjmA=="; - }; - }; - "conventional-changelog-atom-5.0.0" = { - name = "conventional-changelog-atom"; - packageName = "conventional-changelog-atom"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-5.0.0.tgz"; - sha512 = "WfzCaAvSCFPkznnLgLnfacRAzjgqjLUjvf3MftfsJzQdDICqkOOpcMtdJF3wTerxSpv2IAAjX8doM3Vozqle3g=="; - }; - }; - "conventional-changelog-codemirror-5.0.0" = { - name = "conventional-changelog-codemirror"; - packageName = "conventional-changelog-codemirror"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-5.0.0.tgz"; - sha512 = "8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ=="; - }; - }; - "conventional-changelog-conventionalcommits-8.0.0" = { - name = "conventional-changelog-conventionalcommits"; - packageName = "conventional-changelog-conventionalcommits"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-8.0.0.tgz"; - sha512 = "eOvlTO6OcySPyyyk8pKz2dP4jjElYunj9hn9/s0OB+gapTO8zwS9UQWrZ1pmF2hFs3vw1xhonOLGcGjy/zgsuA=="; - }; - }; - "conventional-changelog-core-8.0.0" = { - name = "conventional-changelog-core"; - packageName = "conventional-changelog-core"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-8.0.0.tgz"; - sha512 = "EATUx5y9xewpEe10UEGNpbSHRC6cVZgO+hXQjofMqpy+gFIrcGvH3Fl6yk2VFKh7m+ffenup2N7SZJYpyD9evw=="; - }; - }; - "conventional-changelog-ember-5.0.0" = { - name = "conventional-changelog-ember"; - packageName = "conventional-changelog-ember"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-5.0.0.tgz"; - sha512 = "RPflVfm5s4cSO33GH/Ey26oxhiC67akcxSKL8CLRT3kQX2W3dbE19sSOM56iFqUJYEwv9mD9r6k79weWe1urfg=="; - }; - }; - "conventional-changelog-eslint-6.0.0" = { - name = "conventional-changelog-eslint"; - packageName = "conventional-changelog-eslint"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-6.0.0.tgz"; - sha512 = "eiUyULWjzq+ybPjXwU6NNRflApDWlPEQEHvI8UAItYW/h22RKkMnOAtfCZxMmrcMO1OKUWtcf2MxKYMWe9zJuw=="; - }; - }; - "conventional-changelog-express-5.0.0" = { - name = "conventional-changelog-express"; - packageName = "conventional-changelog-express"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-5.0.0.tgz"; - sha512 = "D8Q6WctPkQpvr2HNCCmwU5GkX22BVHM0r4EW8vN0230TSyS/d6VQJDAxGb84lbg0dFjpO22MwmsikKL++Oo/oQ=="; - }; - }; - "conventional-changelog-jquery-6.0.0" = { - name = "conventional-changelog-jquery"; - packageName = "conventional-changelog-jquery"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-6.0.0.tgz"; - sha512 = "2kxmVakyehgyrho2ZHBi90v4AHswkGzHuTaoH40bmeNqUt20yEkDOSpw8HlPBfvEQBwGtbE+5HpRwzj6ac2UfA=="; - }; - }; - "conventional-changelog-jshint-5.0.0" = { - name = "conventional-changelog-jshint"; - packageName = "conventional-changelog-jshint"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-5.0.0.tgz"; - sha512 = "gGNphSb/opc76n2eWaO6ma4/Wqu3tpa2w7i9WYqI6Cs2fncDSI2/ihOfMvXveeTTeld0oFvwMVNV+IYQIk3F3g=="; - }; - }; - "conventional-changelog-preset-loader-5.0.0" = { - name = "conventional-changelog-preset-loader"; - packageName = "conventional-changelog-preset-loader"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-5.0.0.tgz"; - sha512 = "SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA=="; - }; - }; - "conventional-changelog-writer-8.0.1" = { - name = "conventional-changelog-writer"; - packageName = "conventional-changelog-writer"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-8.0.1.tgz"; - sha512 = "hlqcy3xHred2gyYg/zXSMXraY2mjAYYo0msUCpK+BGyaVJMFCKWVXPIHiaacGO2GGp13kvHWXFhYmxT4QQqW3Q=="; - }; - }; - "conventional-commits-filter-5.0.0" = { - name = "conventional-commits-filter"; - packageName = "conventional-commits-filter"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-5.0.0.tgz"; - sha512 = "tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q=="; - }; - }; - "conventional-commits-parser-6.1.0" = { - name = "conventional-commits-parser"; - packageName = "conventional-commits-parser"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.1.0.tgz"; - sha512 = "5nxDo7TwKB5InYBl4ZC//1g9GRwB/F3TXOGR9hgUjMGfvSP4Vu5NkpNro2+1+TIEy1vwxApl5ircECr2ri5JIw=="; - }; - }; "convert-hrtime-3.0.0" = { name = "convert-hrtime"; packageName = "convert-hrtime"; @@ -11478,15 +11289,6 @@ let sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; - "git-raw-commits-5.0.0" = { - name = "git-raw-commits"; - packageName = "git-raw-commits"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-5.0.0.tgz"; - sha512 = "I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg=="; - }; - }; "git-repo-info-2.1.1" = { name = "git-repo-info"; packageName = "git-repo-info"; @@ -11496,15 +11298,6 @@ let sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; }; }; - "git-semver-tags-8.0.0" = { - name = "git-semver-tags"; - packageName = "git-semver-tags"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-8.0.0.tgz"; - sha512 = "N7YRIklvPH3wYWAR2vysaqGLPRcpwQ0GKdlqTiVN5w1UmCdaeY3K8s6DMKRCh54DDdzyt/OAB6C8jgVtb7Y2Fg=="; - }; - }; "git-spawned-stream-1.0.1" = { name = "git-spawned-stream"; packageName = "git-spawned-stream"; @@ -11919,15 +11712,6 @@ let sha512 = "V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A=="; }; }; - "handlebars-4.7.8" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz"; - sha512 = "vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="; - }; - }; "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; @@ -18138,15 +17922,6 @@ let sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; "nested-error-stacks-2.1.1" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -24987,15 +24762,6 @@ let sha512 = "nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw=="; }; }; - "tempfile-5.0.0" = { - name = "tempfile"; - packageName = "tempfile"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tempfile/-/tempfile-5.0.0.tgz"; - sha512 = "bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q=="; - }; - }; "tempy-3.1.0" = { name = "tempy"; packageName = "tempy"; @@ -25770,15 +25536,6 @@ let sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; }; }; - "uglify-js-3.19.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz"; - sha512 = "v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ=="; - }; - }; "uid-number-0.0.5" = { name = "uid-number"; packageName = "uid-number"; @@ -31891,81 +31648,6 @@ in bypassCache = true; reconstructLock = true; }; - conventional-changelog-cli = nodeEnv.buildNodePackage { - name = "conventional-changelog-cli"; - packageName = "conventional-changelog-cli"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-5.0.0.tgz"; - sha512 = "9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ=="; - }; - dependencies = [ - sources."@babel/code-frame-7.26.2" - sources."@babel/helper-validator-identifier-7.25.9" - sources."@conventional-changelog/git-client-1.0.1" - sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.4" - sources."@types/semver-7.5.8" - sources."add-stream-1.0.0" - sources."array-ify-1.0.0" - sources."compare-func-2.0.0" - sources."conventional-changelog-6.0.0" - sources."conventional-changelog-angular-8.0.0" - sources."conventional-changelog-atom-5.0.0" - sources."conventional-changelog-codemirror-5.0.0" - sources."conventional-changelog-conventionalcommits-8.0.0" - sources."conventional-changelog-core-8.0.0" - sources."conventional-changelog-ember-5.0.0" - sources."conventional-changelog-eslint-6.0.0" - sources."conventional-changelog-express-5.0.0" - sources."conventional-changelog-jquery-6.0.0" - sources."conventional-changelog-jshint-5.0.0" - sources."conventional-changelog-preset-loader-5.0.0" - sources."conventional-changelog-writer-8.0.1" - sources."conventional-commits-filter-5.0.0" - sources."conventional-commits-parser-6.1.0" - sources."dot-prop-5.3.0" - sources."find-up-simple-1.0.1" - sources."git-raw-commits-5.0.0" - sources."git-semver-tags-8.0.0" - sources."handlebars-4.7.8" - sources."hosted-git-info-7.0.2" - sources."index-to-position-0.1.2" - sources."is-obj-2.0.0" - sources."js-tokens-4.0.0" - sources."lru-cache-10.4.3" - sources."meow-13.2.0" - sources."minimist-1.2.8" - sources."neo-async-2.6.2" - sources."normalize-package-data-6.0.2" - sources."parse-json-8.1.0" - sources."picocolors-1.1.1" - sources."read-package-up-11.0.0" - sources."read-pkg-9.0.1" - sources."semver-7.7.1" - sources."source-map-0.6.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.21" - sources."temp-dir-3.0.0" - sources."tempfile-5.0.0" - sources."type-fest-4.37.0" - sources."uglify-js-3.19.3" - sources."unicorn-magic-0.1.0" - sources."validate-npm-package-license-3.0.4" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate a changelog from git metadata"; - homepage = "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; From 39c4aa65ec553304fde23e5162fe48f179b13076 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:15:56 -0500 Subject: [PATCH 2012/2279] nrm: migrate from nodePackages --- pkgs/by-name/nr/nrm/package.nix | 65 +++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 71 ------------------- 4 files changed, 66 insertions(+), 72 deletions(-) create mode 100644 pkgs/by-name/nr/nrm/package.nix diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix new file mode 100644 index 000000000000..dda095ebb145 --- /dev/null +++ b/pkgs/by-name/nr/nrm/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + pnpm, + makeBinaryWrapper, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nrm"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "pana"; + repo = "nrm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2P0dSZa17A3NslNatCx1edLnrcDtGGpOlk6srcvjL1Y="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeBinaryWrapper + ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-PENYS5xO2LwT3+TGl/wU2r0ALEj/JQfbkpf/0MJs0uw="; + }; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/nrm + mkdir $out/bin + mv * $out/lib/node_modules/nrm/ + makeWrapper ${lib.getExe nodejs} $out/bin/nrm \ + --add-flags "$out/lib/node_modules/nrm/dist/index.js" \ + --set "NODE_PATH" "$out/lib/node_modules/nrm/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/Pana/nrm/releases/tag/v${finalAttrs.version}"; + description = "Helps you switch between npm registries easily"; + homepage = "https://github.com/Pana/nrm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "nrm"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b0133d617fb8..71d845fa6d3f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -240,6 +240,7 @@ mapAliases { }); # added 2024-10-04 inherit (pkgs) npm-check-updates; # added 2023-08-22 npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07 + inherit (pkgs) nrm; # Added 2025-11-08 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 orval = throw "orval has been removed because it was broken"; # added 2025-03-23 parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c92752a7f4b9..38761a8c7dff 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -48,7 +48,6 @@ , "node-gyp-build" , "node2nix" , "np" -, "nrm" , "peerflix" , "peerflix-server" , "poor-mans-t-sql-formatter-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 4bb78775ca20..455d9400a826 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -6960,15 +6960,6 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "commander-8.3.0" = { - name = "commander"; - packageName = "commander"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; - }; - }; "comment-json-4.2.5" = { name = "comment-json"; packageName = "comment-json"; @@ -25653,15 +25644,6 @@ let sha512 = "5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg=="; }; }; - "undici-5.28.2" = { - name = "undici"; - packageName = "undici"; - version = "5.28.2"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz"; - sha512 = "wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w=="; - }; - }; "undici-5.28.4" = { name = "undici"; packageName = "undici"; @@ -36191,59 +36173,6 @@ in bypassCache = true; reconstructLock = true; }; - nrm = nodeEnv.buildNodePackage { - name = "nrm"; - packageName = "nrm"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nrm/-/nrm-2.0.1.tgz"; - sha512 = "4QDRVI64plGF/tXei29gYGl9zNkB0YwtASnjGaB7EUmqnMPoKLNlL43lrylg4HA8DBGoKI+9SuomDDXJone4rw=="; - }; - dependencies = [ - sources."@fastify/busboy-2.1.1" - sources."@inquirer/checkbox-4.1.3" - sources."@inquirer/core-10.1.8" - sources."@inquirer/figures-1.0.11" - sources."@inquirer/select-4.0.10" - sources."@inquirer/type-3.0.5" - sources."@types/node-22.13.10" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-width-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-8.3.0" - sources."define-lazy-prop-2.0.0" - sources."emoji-regex-8.0.0" - sources."has-flag-4.0.0" - sources."ini-4.1.3" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-wsl-2.2.0" - sources."mute-stream-2.0.0" - sources."open-8.4.2" - sources."signal-exit-4.1.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."type-fest-0.21.3" - sources."undici-5.28.2" - sources."undici-types-6.20.0" - sources."wrap-ansi-6.2.0" - sources."yoctocolors-cjs-2.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "npm registry manager can help you switch different npm registries easily and quickly"; - homepage = "https://github.com/Pana/nrm"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; From c4a3db606ee082f53b761b52bbfc14415eda3363 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Nov 2025 20:05:45 +0100 Subject: [PATCH 2013/2279] nixos/postfix: allow path values in main.cf This is useful for passing a tls_config_file for example. --- nixos/modules/services/mail/postfix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index bdfc53c83767..86b9223eb604 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -522,6 +522,7 @@ in nullOr (oneOf [ bool int + path str (listOf str) ]) From 013af00de98ee4a9801be912bf253b93a545a04a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 19:20:19 +0000 Subject: [PATCH 2014/2279] trufflehog: 3.90.12 -> 3.90.13 --- 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 08fa92c2bb99..78a2fdd64e37 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.90.12"; + version = "3.90.13"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-r+j9YnRKQ5m7XLavM5rARRZwDiNTcGmxpL6Sv8eTZLE="; + hash = "sha256-mds8LVRws1r91OoGy4kQXyXdPM0GfTnbkh1Q6ib52x8="; }; vendorHash = "sha256-zQ67yLN/HCshOndP/FAUOOyiQpOjyOJChkZZmFb06WM="; From 4934c0596f5788514fb7a70f6e9789132be7a882 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 9 Nov 2025 20:22:40 +0100 Subject: [PATCH 2015/2279] xkeyboard-config: improve license list Previously I just set this to "free", however with https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/527 being resolved and https://github.com/spdx/license-list-XML/pull/2864 being merged this license is now a thing. --- lib/licenses.nix | 5 +++++ pkgs/by-name/xk/xkeyboard-config/package.nix | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index c38379ed405b..5dcf1a781f4f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -747,6 +747,11 @@ lib.mapAttrs mkLicense ( fullName = "Historical Permission Notice and Disclaimer - University of California variant"; }; + hyphenBulgarian = { + fullName = "hyphen-bulgarian License"; + spdxId = "hyphen-bulgarian"; + }; + # Intel's license, seems free iasl = { spdxId = "Intel-ACPI"; diff --git a/pkgs/by-name/xk/xkeyboard-config/package.nix b/pkgs/by-name/xk/xkeyboard-config/package.nix index 666de77d7b00..76f05d89a425 100644 --- a/pkgs/by-name/xk/xkeyboard-config/package.nix +++ b/pkgs/by-name/xk/xkeyboard-config/package.nix @@ -81,9 +81,7 @@ stdenv.mkDerivation (finalAttrs: { mit hpnd cronyx - # there is another unknown license at the end but it seems free - # also see this issue https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/527 - free + hyphenBulgarian ]; maintainers = [ ]; platforms = lib.platforms.unix; From 72197fdd5a619fe9d48e604d05968812dc328b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 11:28:03 -0800 Subject: [PATCH 2016/2279] home-assistant-custom-components.garmin_connect: 0.2.37 -> 0.2.38 Diff: https://github.com/cyberjunky/home-assistant-garmin_connect/compare/0.2.37...0.2.38 Changelog: https://github.com/cyberjunky/home-assistant-garmin_connect/releases/tag/0.2.38 --- .../custom-components/garmin_connect/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 df8f306173e5..d3dca515c8e6 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "cyberjunky"; domain = "garmin_connect"; - version = "0.2.37"; + version = "0.2.38"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "home-assistant-garmin_connect"; tag = version; - hash = "sha256-d6RbDplrdqvFGSDcTgoYzYLSHDYdXG3/XvFxj8IfSbY="; + hash = "sha256-Df/ecgePR10LIeaGy0kmIWqiP9G7j+KscL/YA3VsARE="; }; dependencies = [ From 6ce2b613d1d6c8cd8fe1efa0fe1faf7ece9910ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 19:38:13 +0000 Subject: [PATCH 2017/2279] python3Packages.xknx: 3.10.0 -> 3.10.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index e7e06f673eb8..958102290648 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.10.0"; + version = "3.10.1"; pyproject = true; src = fetchFromGitHub { owner = "XKNX"; repo = "xknx"; tag = version; - hash = "sha256-tkZ0Hltpd5DARxYc05LjDTlB62jsJJJ8v/oUuVPT/uo="; + hash = "sha256-vyGQ1e4MDkCau1hQkcxKfUgEo9PYUXzeky4LSqOW93E="; }; build-system = [ setuptools ]; From 6d66a500dd71cd67605af283513dd3cfe6a49f2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 19:42:29 +0000 Subject: [PATCH 2018/2279] ttdl: 4.12.0 -> 4.13.0 --- pkgs/by-name/tt/ttdl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index d8924c8338dd..b5b3840b6e5d 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.12.0"; + version = "4.13.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-nA5fX8NZko49ctgwJOt0A07/7SFyM5I2840zeBZnFCs="; + sha256 = "sha256-A3hzGBimQ2p4AjCKCHQaEe2U6GUaoTZdDEzmUcJuTfA="; }; - cargoHash = "sha256-yCEdsxoKxudI7ae8Lz+8TAFblJSSB4tSD3GLdT6VtFI="; + cargoHash = "sha256-NpV7SxRrLREtpyB59mdLk3KoGOIMvsxs71eQqKgo6EY="; meta = { description = "CLI tool to manage todo lists in todo.txt format"; From a394acc1ce8c8c77549fc6e6ddf126076e14883e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 19:43:22 +0000 Subject: [PATCH 2019/2279] treemd: 0.1.2 -> 0.1.5 --- pkgs/by-name/tr/treemd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/treemd/package.nix b/pkgs/by-name/tr/treemd/package.nix index 8b2344206f12..a97f6ada2a63 100644 --- a/pkgs/by-name/tr/treemd/package.nix +++ b/pkgs/by-name/tr/treemd/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "treemd"; - version = "0.1.2"; + version = "0.1.5"; src = fetchFromGitHub { owner = "Epistates"; repo = "treemd"; tag = "v${finalAttrs.version}"; - hash = "sha256-PloG2eYelsp0Y3bG2ZNgSuwwPnKufBWwLW2TMQBGu1M="; + hash = "sha256-fD+LH7OziXsQdpcIFxh2fi+Dxb5kbJ7+eVVW0NIpeug="; }; - cargoHash = "sha256-jX2X90Kk8iAVVNm/r37v+0X1WSXje/GRr0Tv0ZzuwWI="; + cargoHash = "sha256-fU0i6a/9oXWJMNdoWCmv04am5qtrFe3ERhQiY25YCCo="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From ab25ffc65af3587f8368cc73b73e71a21885c355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 Oct 2025 19:33:53 +0000 Subject: [PATCH 2020/2279] mathmod: 12.1 -> 13.0 --- pkgs/by-name/ma/mathmod/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix index 2eec8e24f29d..02af5659929b 100644 --- a/pkgs/by-name/ma/mathmod/package.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -7,19 +7,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "mathmod"; - version = "12.1"; + version = "13.0"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; tag = finalAttrs.version; - hash = "sha256-gDIYDXI9X24JAM1HP10EhJXkHZV2X8QngD5KPCUqdyI="; + hash = "sha256-+UR8Tk20StplyNqPDNxR0HfjAzAru4r+WtVsW81LR9c="; }; patches = [ ./fix-paths.patch ]; postPatch = '' - substituteInPlace MathMod.pro --subst-var out + substituteInPlace MathMod.pro \ + --replace-fail "@out@" "$out" ''; nativeBuildInputs = with libsForQt5; [ From 0771b8c0eab638b3eef1e62521acb98fafbc8dc2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 8 Nov 2025 23:21:19 +0000 Subject: [PATCH 2021/2279] vimPlugins.floaterm: init at 2025-09-23 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 54d95e730d12..08942cb6cd7b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5307,6 +5307,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + floaterm = buildVimPlugin { + pname = "floaterm"; + version = "2025-09-23"; + src = fetchFromGitHub { + owner = "nvzone"; + repo = "floaterm"; + rev = "34e14f0b5e2687fd31a93fe75982ec84e5145856"; + sha256 = "0g0wf1f049sayj9d11xjjz37ssvp7g9q39b5dwimf3i6fn80b42k"; + }; + meta.homepage = "https://github.com/nvzone/floaterm/"; + meta.hydraPlatforms = [ ]; + }; + floating-input-nvim = buildVimPlugin { pname = "floating-input.nvim"; version = "2025-05-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f714b498bbc6..e53cf7a738f7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1215,6 +1215,10 @@ assertNoAdditions { dependencies = [ self.leap-nvim ]; }; + floaterm = super.floaterm.overrideAttrs { + dependencies = [ self.nvzone-volt ]; + }; + flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs { # Optional dap integration checkInputs = [ self.nvim-dap ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d3ec2a41bd9b..6208e68e00ae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -406,6 +406,7 @@ https://github.com/willothy/flatten.nvim/,HEAD, https://github.com/felipeagc/fleet-theme-nvim/,, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, +https://github.com/nvzone/floaterm/,HEAD, https://github.com/liangxianzhe/floating-input.nvim/,HEAD, https://github.com/floobits/floobits-neovim/,, https://github.com/nvim-flutter/flutter-tools.nvim/,HEAD, From d5485055bbe887289f1c526c7fc113def2eef4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 11:54:07 -0800 Subject: [PATCH 2022/2279] opencode: unpin bun --- pkgs/by-name/op/opencode/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index b284368643ee..ab7e65fab508 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -87,6 +87,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ./skip-npm-pack.patch ]; + postPatch = '' + # don't require a specifc bun version + substituteInPlace packages/script/src/index.ts \ + --replace-fail "if (process.versions.bun !== expectedBunVersion)" "if (false)" + ''; + configurePhase = '' runHook preConfigure From 01698a9baaad99a010ffe2e53762f480f39ff1ae Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 3 May 2024 17:05:10 +0200 Subject: [PATCH 2023/2279] klipper: fix $mcu.serial guard when $mcu.enableKlipperFlash This patch allows to set $mcu.canbus_uuid by setting $mcu.enableKlipperFlash to false. --- nixos/modules/services/misc/klipper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 223bc8125915..78bd208ca1b6 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -217,7 +217,7 @@ in } ] ++ lib.mapAttrsToList (mcu: firmware: { - assertion = firmware.enable -> firmware.serial != null; + assertion = firmware.enableKlipperFlash -> firmware.serial != null; message = '' Unable to determine the serial connection for services.klipper.firmwares."${mcu}". Please set one of the following: From 3ca72815d58b77ec1ff0bef0950bd3f6478cd23d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:08:31 +0000 Subject: [PATCH 2024/2279] python3Packages.metaflow: 2.19.0 -> 2.19.6 --- pkgs/development/python-modules/metaflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index fa6892b17517..1c8e541c5f48 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.19.0"; + version = "2.19.6"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-MMPkQ1cjl/Sid4RyvP04xIDb6Xtr5S+LdJTOYgo0LFQ="; + hash = "sha256-heJz9rk2nTMrHc2213J1die6QX/jkOG6ohmufGXCNso="; }; build-system = [ From 9d221d1fb4d783ba3151b886580fd01c8d1850a1 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 9 Nov 2025 15:03:00 -0500 Subject: [PATCH 2025/2279] krane: remove kira-bruneau as maintainer I don't actively use this package anymore. I originally packaged it for use at a company that I haven't been working at for over 2 years now. --- pkgs/by-name/kr/krane/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/kr/krane/package.nix b/pkgs/by-name/kr/krane/package.nix index 7b08e8a59083..5a5ddc115557 100644 --- a/pkgs/by-name/kr/krane/package.nix +++ b/pkgs/by-name/kr/krane/package.nix @@ -16,6 +16,6 @@ bundlerApp { homepage = "https://github.com/Shopify/krane"; changelog = "https://github.com/Shopify/krane/blob/main/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kira-bruneau ]; + maintainers = [ ]; }; } From 546a63e5b5bba2657a4e5e6bb2563e2dcd0f85df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:16:32 +0000 Subject: [PATCH 2026/2279] python3Packages.anndata: 0.12.4 -> 0.12.6 --- pkgs/development/python-modules/anndata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix index ecbe0c49d412..b46103d35455 100644 --- a/pkgs/development/python-modules/anndata/default.nix +++ b/pkgs/development/python-modules/anndata/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "anndata"; - version = "0.12.4"; + version = "0.12.6"; pyproject = true; src = fetchFromGitHub { owner = "scverse"; repo = "anndata"; tag = version; - hash = "sha256-8tHM46wRr896JzZcWKBDy1QLrz/iwKE8YKfRby2Fmb8="; + hash = "sha256-VFZrPcb6uaBSOPxJKTJtcYewD8K2Qrsuk3/7+QW6F78="; }; build-system = [ From c1322b2d37383f634777d4242b6ff6de8181d0f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:17:13 +0000 Subject: [PATCH 2027/2279] bruno: 2.13.2 -> 2.14.0 --- pkgs/by-name/br/bruno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 6d5bd7e5153c..da03f9443d09 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -20,20 +20,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.13.2"; + version = "2.14.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-oYp4sSL36HrDyK+YJfjvSQuYV0NdYcB6UeTGksbrcuI="; + hash = "sha256-fmT+KA8v/fdVQu7KUkZNOkNtcl5uPxzHVKplml2HbSM="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-TkPjT2SW5KgbaZiSCjWEd1UTqSsFq+MI58bMShkm/yI="; + npmDepsHash = "sha256-H2v9dm4VCRQrhs9g/D1QOu1L5AeN+Vqhez4qrBdd9Gs="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ From eee63d9431c4b080d8b1edfdf46ceacab1bc0bf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:21:44 +0000 Subject: [PATCH 2028/2279] mympd: 22.1.2 -> 23.0.0 --- pkgs/by-name/my/mympd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 819ad8a5e463..eaeb8b2f410d 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "22.1.2"; + version = "23.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jgRzfVwVf6QOBGAsKNm9f8YqWBWd0KMJj0FTFcnu4NM="; + sha256 = "sha256-tD7ywqZJEix+ET26z3yJmgHXBACBOrSAlR9U1Uff/v8="; }; nativeBuildInputs = [ From ee618d2e121391d737235aa17778b98475842cbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:26:40 +0000 Subject: [PATCH 2029/2279] mcp-k8s-go: 0.5.0 -> 0.6.0 --- pkgs/by-name/mc/mcp-k8s-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcp-k8s-go/package.nix b/pkgs/by-name/mc/mcp-k8s-go/package.nix index 3ee42b813767..131cd879243a 100644 --- a/pkgs/by-name/mc/mcp-k8s-go/package.nix +++ b/pkgs/by-name/mc/mcp-k8s-go/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "mcp-k8s-go"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "strowk"; repo = "mcp-k8s-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-4pS0X1G/wGemBkLC9UFLHxaRLtCDALIRPnOCzAf/6JA="; + hash = "sha256-/5tmKngZTp5n8jDZwKAaG4ad+MPRFEJfgV/A5TMVLlM="; }; - vendorHash = "sha256-BPmocRaqqV7p5Yjto3UEbzc2vdlyRSGkdPye3EWXEe4="; + vendorHash = "sha256-WULy61Ntra9Jz4fhSVOzftzWyQxvPFyBfjuKlKTORqI="; doCheck = false; From ab10b4da90cb0c5d3a66eccd5704dc26fad6e360 Mon Sep 17 00:00:00 2001 From: MithicSpirit Date: Sun, 9 Nov 2025 15:28:35 -0500 Subject: [PATCH 2030/2279] idris2Packages.pack: 2024-02-07 -> 2025-11-06 Now that the compiler is updated, we can also update pack. This introduces several dependency changes, and a more scaleable solution for handling these will be necessary in the future. --- pkgs/development/compilers/idris2/pack.nix | 168 +++++++++++++++++++-- 1 file changed, 153 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix index 5ceb285f4b5b..5f38ee28fe51 100644 --- a/pkgs/development/compilers/idris2/pack.nix +++ b/pkgs/development/compilers/idris2/pack.nix @@ -11,41 +11,176 @@ }: let inherit (idris2Packages) idris2Api buildIdris; - toml = buildIdris { - ipkgName = "toml"; - version = "2022-05-05"; + + elab-util = buildIdris { + ipkgName = "elab-util"; + version = "2025-08-14"; src = fetchFromGitHub { - owner = "cuddlefishie"; - repo = "toml-idr"; - rev = "b4f5a4bd874fa32f20d02311a62a1910dc48123f"; - hash = "sha256-+bqfCE6m0aJ+S65urT+zQLuZUtUkC1qcuSsefML/fAE="; + owner = "stefan-hoeck"; + repo = "idris2-elab-util"; + rev = "6786ac7ef9931b1c8321a83e007f36a66e139e86"; + hash = "sha256-qInoAE28tEJIP8/R0Yjgn/+DoIDzI3GU8BAyWaIrrJE="; }; idrisLibraries = [ ]; }; + filepath = buildIdris { ipkgName = "filepath"; - version = "2023-12-04"; + version = "2024-10-06"; src = fetchFromGitHub { owner = "stefan-hoeck"; repo = "idris2-filepath"; - rev = "eac02d51b631633f32330c788bcebeb24221fa09"; - hash = "sha256-noylxQvT2h50H0xmAiwe/cI6vz5gkbOhSD7mXuhJGfU="; + rev = "0441eaee9ff1d921fc3f4619c2a8d542588c0e99"; + hash = "sha256-HiaT1Ggbzm7aAEMnCobhhavdheKbYyMA5D9BO0cdG7Y="; }; idrisLibraries = [ ]; }; + + getopts = buildIdris { + ipkgName = "getopts"; + version = "2023-10-28"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "idris2-getopts"; + rev = "0d41b98f83f3707deb0ffbc595ef36b7d9cb9eab"; + hash = "sha256-CthWByg4uFic0ktri1AuFqkHtyRzIUrreCTegQgdpVo="; + }; + idrisLibraries = [ ]; + }; + + algebra = buildIdris { + ipkgName = "algebra"; + version = "2024-04-05"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-algebra"; + rev = "829f44b7fd961e3f0a7ad9174b395f97ebc33336"; + hash = "sha256-etsWqF07j/XBgfnlaA8pyF06BeoXqg7iViG0o09s4Zc="; + }; + idrisLibraries = [ ]; + }; + + ref1 = buildIdris { + ipkgName = "ref1"; + version = "2025-10-30"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ref1"; + rev = "ef6d4265deaa6a4f1b5228932102847a4e54e4d2"; + hash = "sha256-NwA6KezZFdF/ZGTOf3Z1zDjsGiy2hgYinGPeeofhZfw="; + }; + idrisLibraries = [ ]; + }; + + array = buildIdris { + ipkgName = "array"; + version = "2025-10-30"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-array"; + rev = "cecbd1dd3bae94669a2ed3689ee91ce1616cc34f"; + hash = "sha256-fRhIzkvL7n7wyXNQE3LHalexqYmTt6RVPoVEOqTb7d4="; + }; + idrisLibraries = [ + algebra + ref1 + ]; + }; + + bytestring = buildIdris { + ipkgName = "bytestring"; + version = "2025-10-02"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-bytestring"; + rev = "082c5114b4016425c9957e955e22fcb0b194ada4"; + hash = "sha256-KuHa1pDfsR4BmBiaw7k6ghZMf2/b+5AQc5I+NuQqbyw="; + }; + idrisLibraries = [ + algebra + array + ]; + }; + + refined = buildIdris { + ipkgName = "refined"; + version = "2024-04-05"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-refined"; + rev = "c585013c33ad5398c91beed71fec61a5b721a8da"; + hash = "sha256-9YQjVpJ5McpgjJx6hXCaXMKyEAFCnynw4ahHdY3Kz8Y="; + }; + idrisLibraries = [ + elab-util + algebra + ]; + }; + + ilex-core = buildIdris { + ipkgName = "core/ilex-core"; + version = "2025-10-31"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ilex"; + rev = "c2d5a219c701a8f694aa95e8d34c7a58d58e5795"; + hash = "sha256-EseTOCNr0EuYqrjEd2SLqSz5ONOO3hRYghrHul0ccPA="; + }; + idrisLibraries = [ + elab-util + bytestring + ]; + }; + + ilex = buildIdris { + ipkgName = "ilex"; + version = "2025-10-31"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ilex"; + rev = "c2d5a219c701a8f694aa95e8d34c7a58d58e5795"; + hash = "sha256-EseTOCNr0EuYqrjEd2SLqSz5ONOO3hRYghrHul0ccPA="; + }; + idrisLibraries = [ + elab-util + algebra + array + bytestring + ilex-core + refined + ]; + }; + + ilex-toml = buildIdris { + ipkgName = "toml/ilex-toml"; + version = "2025-10-31"; + src = fetchFromGitHub { + owner = "stefan-hoeck"; + repo = "idris2-ilex"; + rev = "c2d5a219c701a8f694aa95e8d34c7a58d58e5795"; + hash = "sha256-EseTOCNr0EuYqrjEd2SLqSz5ONOO3hRYghrHul0ccPA="; + }; + idrisLibraries = [ + ilex + refined + ]; + }; + packPkg = buildIdris { ipkgName = "pack"; - version = "2024-02-07"; + version = "2025-11-06"; src = fetchFromGitHub { owner = "stefan-hoeck"; repo = "idris2-pack"; - rev = "305123401a28a57b02f750c589c35af628b2a5eb"; - hash = "sha256-IPAkwe6fEYWT3mpyKKkUPU0qFJX9gGIM1f7OeNWyB9w="; + rev = "37787fa16550ef761d3242bf8ccb8ab672d9f2d1"; + hash = "sha256-pvunaZSXj5Ee0utBFZfagxRKFuoSBxeU0IN7VTc56rY="; }; idrisLibraries = [ idris2Api - toml + elab-util filepath + getopts + ilex-toml ]; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -76,7 +211,10 @@ let mainProgram = "pack"; homepage = "https://github.com/stefan-hoeck/idris2-pack"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mattpolzin ]; + maintainers = with lib.maintainers; [ + mattpolzin + mithicspirit + ]; inherit (idris2Packages.idris2.meta) platforms; }; }; From e25af6d45f7547f45c19b72968a0b3f8a4ec54e6 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 9 Nov 2025 21:25:09 +0100 Subject: [PATCH 2031/2279] vicinae: 0.16.1 -> 0.16.2 --- pkgs/by-name/vi/vicinae/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index ccdabb49d74e..9393aaa0fa4e 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-PWfgR7wyQINl0Xy/AJAaaUo1WtrkznGcaL1aCACqI7U="; + hash = "sha256-CNL45FJG8JAtFFbc8V8Hhf+RwZuWXFwz/v5E1yAi1bQ="; }; apiDeps = fetchNpmDeps { From 0036294983207d9eb155306978cc36507dc836e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:36:12 +0000 Subject: [PATCH 2032/2279] libretro.bluemsx: 0-unstable-2025-11-01 -> 0-unstable-2025-11-04 --- pkgs/applications/emulators/libretro/cores/bluemsx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index db0bd46bd5c0..724e20af4e5b 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-11-04"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "1f8aeb9ac3f3a4202736ac22e1785f01a834b975"; - hash = "sha256-VnTL7MLhB/WEHm9930OvM84I5Vp4AaAI6qh7I4QRkVw="; + rev = "036376d6679c9e153712dbbb3fdca774afc49706"; + hash = "sha256-0oT+m30bay/3BQgKBxX397a8o+QP1/IHIo0jGmSWGGg="; }; meta = { From 092b37cf298ffb3a7f5a5974a012291a0cb956d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:39:37 +0000 Subject: [PATCH 2033/2279] kdePackages.karousel: 0.14 -> 0.15 --- pkgs/kde/third-party/karousel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix index 9e0f2fee23ee..512c0bc4b900 100644 --- a/pkgs/kde/third-party/karousel/default.nix +++ b/pkgs/kde/third-party/karousel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "karousel"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "peterfajdiga"; repo = "karousel"; rev = "v${finalAttrs.version}"; - hash = "sha256-bJv3fQ8w4bAtthlrDjj3cWA8lSpcJCEtJFk5C+94K5M="; + hash = "sha256-pxcKfhQmudxCJ7fwteT+QZrRib03tYZEWiRjmZtVKgQ="; }; postPatch = '' From 0a877d70adef740b4a52d2e3bd68291241b18cc3 Mon Sep 17 00:00:00 2001 From: lignus <64274485+linnnus@users.noreply.github.com> Date: Sat, 2 Aug 2025 14:58:36 +0200 Subject: [PATCH 2034/2279] virt-viewer: add project homepage --- pkgs/by-name/vi/virt-viewer/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/vi/virt-viewer/package.nix b/pkgs/by-name/vi/virt-viewer/package.nix index 999489c0f61f..4f08bc08e0fd 100644 --- a/pkgs/by-name/vi/virt-viewer/package.nix +++ b/pkgs/by-name/vi/virt-viewer/package.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://virt-manager.org/"; description = "Viewer for remote virtual machines"; maintainers = with maintainers; [ raskin From ea7d824f56fa6dad9a9c3c47a5afdbf21e3979c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:55:09 +0000 Subject: [PATCH 2035/2279] jj-pre-push: 0.3.0 -> 0.3.2 --- pkgs/by-name/jj/jj-pre-push/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index e38527c20d8f..e9407b41f636 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "jj-pre-push"; - version = "0.3.0"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; tag = "v${version}"; - hash = "sha256-nWkMXXlzJeXz0kHBuN4g8YWW6JmwrfE/y9oFfEOqeQk="; + hash = "sha256-/fh06T7kTlyyzj+ez9JkbU5h80Ez9B0nwZ/znjwTUJg="; }; build-system = [ From 305fb9514a1e3cd81449317927c884ebc362f6a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 20:55:32 +0000 Subject: [PATCH 2036/2279] files-cli: 2.15.131 -> 2.15.134 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 9f8f148a0878..ed6f3d130e3a 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.131"; + version = "2.15.134"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-G2GnYYcY2CQLwlbcnykC50ajrSQlKoGYUoRY6hHD8Bo="; + hash = "sha256-gk8oLcCxlS/T2d1IYRQzZokrrJm2b/hrGgL77C8UW1c="; }; - vendorHash = "sha256-c5bRlz4i8/7esBCmfbQxbGd8d+yvl5Y9BSZL8nV0Sfw="; + vendorHash = "sha256-cjqOv0o8HIHnu6RKFVyCz+Phfh21IZOwRCJlYQdG+Q8="; ldflags = [ "-s" From 450237964fe30774a87443509d824cb19e87fa5a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 9 Nov 2025 21:50:08 +0100 Subject: [PATCH 2037/2279] python313Packages.sqlalchemy-views: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sqlalchemy-views is broken for Python ≥3.12 [1] and the last relevant upstream code change and release were in 2023 [2]. [1] https://hydra.nixos.org/build/310475445 [2] https://github.com/jklukas/sqlalchemy-views --- .../sqlalchemy-views/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/python-modules/sqlalchemy-views/default.nix diff --git a/pkgs/development/python-modules/sqlalchemy-views/default.nix b/pkgs/development/python-modules/sqlalchemy-views/default.nix deleted file mode 100644 index a462e48bfede..000000000000 --- a/pkgs/development/python-modules/sqlalchemy-views/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - sqlalchemy, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "sqlalchemy-views"; - version = "0.3.2"; - format = "setuptools"; - - src = fetchFromGitHub { - repo = "sqlalchemy-views"; - owner = "jklukas"; - tag = "v${version}"; - hash = "sha256-MJgikWXo3lpMsSYbb5sOSOTbJPOx5gEghW1V9jKvHKU="; - }; - - postPatch = '' - substituteInPlace tox.ini --replace '--cov=sqlalchemy_views --cov-report=term' "" - ''; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ sqlalchemy ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "sqlalchemy_views" ]; - - meta = with lib; { - description = "Adds CreateView and DropView constructs to SQLAlchemy"; - homepage = "https://github.com/jklukas/sqlalchemy-views"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7cf00fbaa665..b0cfdae16fc8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -440,6 +440,7 @@ mapAliases { sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29 sphinxcontrib_newsfeed = throw "'sphinxcontrib_newsfeed' has been renamed to/replaced by 'sphinxcontrib-newsfeed'"; # Converted to throw 2025-10-29 sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2025-10-29 + sqlalchemy-views = throw "'sqlalchemy-views' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-09 sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29 subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99e66e842b76..bde77dda5bc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17654,8 +17654,6 @@ self: super: with self; { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - sqlalchemy-views = callPackage ../development/python-modules/sqlalchemy-views { }; - sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { }; sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { }; From cf9b08c97ad3a2802161916410c5a9cb66f0c862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 03:49:07 +0000 Subject: [PATCH 2038/2279] framework-tool-tui: 0.5.7 -> 0.5.8 --- pkgs/by-name/fr/framework-tool-tui/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index 0c791d715a11..07a6c9c2258c 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,13 +7,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-D9twqVizYqrglVOrwc8KuB5mk4vc/BTMv+HR3rv5yEk="; + hash = "sha256-6rphmprOTg+Zk3HbE6mdszmQsCQ8mUbs59rvLeKQkps="; }; cargoHash = "sha256-0/6b0C+uUNz03r5IEBvAGzagSyjzXFVbE74rgfGJoyM="; @@ -21,9 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; - # test suite needs a framework laptop - doCheck = false; - meta = { description = "TUI for controlling and monitoring Framework Computers hardware"; longDescription = '' From 812abc85bd9bdefd59efe645f911c373e49d9ec7 Mon Sep 17 00:00:00 2001 From: sportshead Date: Sun, 9 Nov 2025 21:03:23 +0000 Subject: [PATCH 2039/2279] base16-schemes: 0-unstable-2025-06-04 -> 0-unstable-2025-11-08 Diff: https://github.com/tinted-theming/schemes/compare/28c26a621123ad4ebd5bbfb34ab39421c0144bdd..4ac26dc99141c1b2a26eb7fefe46e22e07eec77c --- pkgs/by-name/ba/base16-schemes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/base16-schemes/package.nix b/pkgs/by-name/ba/base16-schemes/package.nix index 6edb3a44086d..687a7a6e3066 100644 --- a/pkgs/by-name/ba/base16-schemes/package.nix +++ b/pkgs/by-name/ba/base16-schemes/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "base16-schemes"; - version = "0-unstable-2025-06-04"; + version = "0-unstable-2025-11-08"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "schemes"; - rev = "de3eeb6add0a6051bfc717684e36c8c9a78a1812"; - hash = "sha256-C8VZuwzaQfNYbQQcc0Fh4RS+1nqc6j+IOy80NGmV4IQ="; + rev = "4ac26dc99141c1b2a26eb7fefe46e22e07eec77c"; + hash = "sha256-pr+RtDs+3qo0v7ZXfcSdtP0PoDDPU9EHw2Oe5EUwWtQ="; }; installPhase = '' From 1bc6ed0dc26940419b238f26fe2b24667f8169ac Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 1 Nov 2025 10:37:19 -0700 Subject: [PATCH 2040/2279] python3Packages.curl-cffi: disable tests that hang and OOM --- pkgs/development/python-modules/curl-cffi/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 4f5a6eec18f0..310fd84f70ad 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { }; patches = [ ./use-system-libs.patch ]; + buildInputs = [ curl-impersonate-chrome ]; build-system = [ @@ -98,8 +99,11 @@ buildPythonPackage rec { disabledTestPaths = [ # test accesses network "tests/unittest/test_smoke.py::test_async" + # Hangs the build (possibly forever) under websockets > 12 + # https://github.com/lexiforest/curl_cffi/issues/657 + "tests/unittest/test_websockets.py::test_websocket" # Runs out of memory while testing - "tests/unittest/test_websockets.py" + "tests/unittest/test_websockets.py::test_receive_large_messages_run_forever" ]; disabledTests = [ @@ -121,6 +125,9 @@ buildPythonPackage rec { description = "Python binding for curl-impersonate via cffi"; homepage = "https://curl-cffi.readthedocs.io"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ chuangzhu ]; + maintainers = with lib.maintainers; [ + chuangzhu + sarahec + ]; }; } From 3e551073f4613b05148d53d8ee626b3c56d65932 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 5 Nov 2025 10:19:08 -0800 Subject: [PATCH 2041/2279] python3Packages.curl-cffi: add sarahec as maintainer From d8c575bf0ce3471ca4e51213e4b861992b207be5 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 7 Nov 2025 11:59:59 -0800 Subject: [PATCH 2042/2279] cen64: 0-unstable-2023-05-29 -> 0.3-unstable-2025-10-24 --- ...read-arg-type-for-pthread_setname_np.patch | 137 ------------------ pkgs/by-name/ce/cen64/package.nix | 16 +- 2 files changed, 6 insertions(+), 147 deletions(-) delete mode 100644 pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch diff --git a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch b/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch deleted file mode 100644 index 7d3ff742c57a..000000000000 --- a/pkgs/by-name/ce/cen64/fix-thread-arg-type-for-pthread_setname_np.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 41ad58ab1953835313ad2b89686931b08b5b47e8 Mon Sep 17 00:00:00 2001 -From: ghpzin -Date: Tue, 25 Mar 2025 15:26:07 +0300 -Subject: [PATCH] Fix thread arg type for pthread_setname_np - -- change `thread` arg type to `cen64_thread` instead of `cen64_thread *` -(`pthread_t` instead of `pthread_t *`) according to definition of -`pthread_setname_np` from ``: -`int pthread_setname_np(pthread_t thread, const char *name);` -fixes gcc14 errors: -``` -/build/source/cen64.c:475:24: error: passing argument 1 of 'cen64_thread_setname' makes pointer from integer without a cast [-Wint-conversion] - 475 | cen64_thread_setname(thread, "device"); - | ^~~~~~ - | | - | cen64_thread {aka long unsigned int} -In file included from /build/source/device/device.h:26, - from /build/source/cen64.c:15: -/build/source/os/posix/thread.h:59:54: note: expected 'cen64_thread *' {aka 'long unsigned int *'} but argument is of type 'cen64_thread' {aka 'lo> - 59 | static inline int cen64_thread_setname(cen64_thread *t, const char *name) { - | ~~~~~~~~~~~~~~^ -``` - -- add cast to `cen64_thread` from NULL where `cen64_thread` is called -with it, fixes gcc14 errors: -``` -/build/source/gdb/gdb.c:82:24: error: passing argument 1 of 'cen64_thread_setname' makes integer from pointer without a cast [-Wint-conversion] - 82 | cen64_thread_setname(NULL, "gdb"); - | ^~~~ - | | - | void * -/build/source/os/posix/thread.h:59:53: note: expected 'cen64_thread' {aka 'long unsigned int'} but argument is of type 'void *' - 59 | static inline int cen64_thread_setname(cen64_thread t, const char *name) { - | ~~~~~~~~~~~~~^ -``` ---- - cen64.c | 2 +- - device/device.c | 4 ++-- - gdb/gdb.c | 4 ++-- - os/posix/thread.h | 6 +++--- - os/winapi/thread.h | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/cen64.c b/cen64.c -index 51014a4..ca6bda1 100644 ---- a/cen64.c -+++ b/cen64.c -@@ -483,7 +483,7 @@ int run_device(struct cen64_device *device, bool no_video) { - } - - CEN64_THREAD_RETURN_TYPE run_device_thread(void *opaque) { -- cen64_thread_setname(NULL, "device"); -+ cen64_thread_setname((cen64_thread)NULL, "device"); - struct cen64_device *device = (struct cen64_device *) opaque; - - device_run(device); -diff --git a/device/device.c b/device/device.c -index cd5a046..c915846 100644 ---- a/device/device.c -+++ b/device/device.c -@@ -224,7 +224,7 @@ CEN64_THREAD_RETURN_TYPE run_rcp_thread(void *opaque) { - } - - CEN64_THREAD_RETURN_TYPE run_vr4300_thread(void *opaque) { -- cen64_thread_setname(NULL, "vr4300"); -+ cen64_thread_setname((cen64_thread)NULL, "vr4300"); - struct cen64_device *device = (struct cen64_device *) opaque; - - while (likely(device->running)) { -@@ -351,4 +351,4 @@ int device_debug_spin(struct cen64_device *device) { - - cen64_cold void device_connect_debugger(struct cen64_device *device, void* break_handler_data, vr4300_debug_break_handler break_handler) { - vr4300_connect_debugger(device->vr4300, break_handler_data, break_handler); --} -\ No newline at end of file -+} -diff --git a/gdb/gdb.c b/gdb/gdb.c -index 021784d..0e8d188 100644 ---- a/gdb/gdb.c -+++ b/gdb/gdb.c -@@ -79,7 +79,7 @@ bool gdb_parse_packet(const char* input, int len, const char** command_start, co - } - - CEN64_THREAD_RETURN_TYPE gdb_thread(void *opaque) { -- cen64_thread_setname(NULL, "gdb"); -+ cen64_thread_setname((cen64_thread)NULL, "gdb"); - struct gdb *gdb = (struct gdb *) opaque; - - cen64_mutex_lock(&gdb->client_mutex); -@@ -257,4 +257,4 @@ cen64_cold void gdb_destroy(struct gdb* gdb) { - - gdb->device = NULL; - free(gdb); --} -\ No newline at end of file -+} -diff --git a/os/posix/thread.h b/os/posix/thread.h -index 2a261c6..e8e6144 100644 ---- a/os/posix/thread.h -+++ b/os/posix/thread.h -@@ -45,9 +45,9 @@ static inline int cen64_thread_join(cen64_thread *t) { - #ifdef __APPLE__ - int pthread_setname_np(const char*); - #elif __NETBSD__ --int pthread_setname_np(cen64_thread*, const char*, const char*); -+int pthread_setname_np(cen64_thread, const char*, const char*); - #else --int pthread_setname_np(cen64_thread*, const char*); -+int pthread_setname_np(cen64_thread, const char*); - #endif - - // Sets the name of the thread to a specific value -@@ -56,7 +56,7 @@ int pthread_setname_np(cen64_thread*, const char*); - // If you call it at the wrong time or your OS doesn't support custom thread names - // the return value will be non-zero. - // If cen64_thread is not set the name of the current thread will be changed. --static inline int cen64_thread_setname(cen64_thread *t, const char *name) { -+static inline int cen64_thread_setname(cen64_thread t, const char *name) { - #ifdef __APPLE__ - if (t == NULL) - return pthread_setname_np(name); -diff --git a/os/winapi/thread.h b/os/winapi/thread.h -index d7c162a..128d935 100644 ---- a/os/winapi/thread.h -+++ b/os/winapi/thread.h -@@ -57,7 +57,7 @@ static inline int cen64_thread_join(cen64_thread *t) { - // - // Windows isn't supported for the moment. - // --static inline int cen64_thread_setname(cen64_thread *t, const char *name) { -+static inline int cen64_thread_setname(cen64_thread t, const char *name) { - return ENOSYS; - } - --- -2.48.1 - diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix index ea6071c71260..3eded229e9c9 100644 --- a/pkgs/by-name/ce/cen64/package.nix +++ b/pkgs/by-name/ce/cen64/package.nix @@ -11,22 +11,18 @@ stdenv.mkDerivation rec { pname = "cen64"; - version = "0-unstable-2023-05-29"; + version = "0.3-unstable-2025-10-24"; src = fetchFromGitHub { owner = "n64dev"; repo = "cen64"; - rev = "1c1118462bd9d9b8ceb4c556a647718072477aab"; - sha256 = "sha256-vFk29KESATcEY0eRNbS+mHLD9T1phJiG1fqjOlI19/w="; + rev = "e0641c8452a3ae8edcd2bf4e46794bb4eaafc076"; + sha256 = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64="; }; - patches = [ - # fix build with gcc14: - # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 - ./cast-mi_regs-callbacks.patch - # https://github.com/n64dev/cen64/pull/237 - ./fix-thread-arg-type-for-pthread_setname_np.patch - ]; + # fix build with gcc14: + # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 + patches = [ ./cast-mi_regs-callbacks.patch ]; nativeBuildInputs = [ cmake ]; buildInputs = [ From 8811aee7dbc61c14d53bbe3e172a283f47126280 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Fri, 7 Nov 2025 12:08:33 -0800 Subject: [PATCH 2043/2279] cen64: cleanup --- pkgs/by-name/ce/cen64/package.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ce/cen64/package.nix b/pkgs/by-name/ce/cen64/package.nix index 3eded229e9c9..38f8abc10daa 100644 --- a/pkgs/by-name/ce/cen64/package.nix +++ b/pkgs/by-name/ce/cen64/package.nix @@ -1,15 +1,16 @@ { lib, - cmake, + stdenv, fetchFromGitHub, + cmake, libGL, libiconv, libX11, openal, - stdenv, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cen64"; version = "0.3-unstable-2025-10-24"; @@ -17,33 +18,39 @@ stdenv.mkDerivation rec { owner = "n64dev"; repo = "cen64"; rev = "e0641c8452a3ae8edcd2bf4e46794bb4eaafc076"; - sha256 = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64="; + hash = "sha256-PpaD3hgksPD729LyFm7+ID8i+x3yZ0f+S11eSQyoB64="; }; # fix build with gcc14: # https://github.com/n64dev/cen64/pull/191/commits/f13bdf94c00a9da3b152ed9fe20001e240215b96 patches = [ ./cast-mi_regs-callbacks.patch ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; buildInputs = [ libGL libiconv - openal libX11 + openal ]; installPhase = '' runHook preInstall - install -D {,$out/bin/}${pname} + + install -D ${finalAttrs.meta.mainProgram} \ + --target-directory=$out/bin + runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { description = "Cycle-Accurate Nintendo 64 Emulator"; - license = licenses.bsd3; + license = lib.licenses.bsd3; homepage = "https://github.com/n64dev/cen64"; - maintainers = [ maintainers._414owen ]; + maintainers = with lib.maintainers; [ _414owen ]; platforms = [ "x86_64-linux" ]; mainProgram = "cen64"; }; -} +}) From 6e9ab8cc41a39c598b3db4ebc476d7c3a7237a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:19:21 +0000 Subject: [PATCH 2044/2279] velocity: 3.4.0-unstable-2025-10-23 -> 3.4.0-unstable-2025-11-09 --- pkgs/by-name/ve/velocity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix index 82e035b2c226..eaa30ca3419c 100644 --- a/pkgs/by-name/ve/velocity/package.nix +++ b/pkgs/by-name/ve/velocity/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "velocity"; - version = "3.4.0-unstable-2025-10-23"; + version = "3.4.0-unstable-2025-11-09"; src = fetchFromGitHub { owner = "PaperMC"; repo = "Velocity"; - rev = "b6b6b20fe97cd9cb0d6b4e817d3e7db72aca2d8d"; - hash = "sha256-UHkioSGKikYxHq/petnJSHpvx/ioH01N6FSl0176YVA="; + rev = "6cc1be7746ec49d2b600b1af1dcec99584750d38"; + hash = "sha256-zDB9bIkclEBf+NdBkufmsmKM8Qo8uqeZ26OUdyzczi8="; }; nativeBuildInputs = [ From 40796a06a3f7fcb1ce8d7209cbe3dde16a74bf84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 13:23:51 -0800 Subject: [PATCH 2045/2279] python3Packages.python-openzwave: doesn't depend on systemd --- pkgs/development/python-modules/python-openzwave/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openzwave/default.nix b/pkgs/development/python-modules/python-openzwave/default.nix index 6b516823c5ab..90025773dad4 100644 --- a/pkgs/development/python-modules/python-openzwave/default.nix +++ b/pkgs/development/python-modules/python-openzwave/default.nix @@ -4,7 +4,6 @@ fetchPypi, isPy3k, pkg-config, - systemd, libyaml, openzwave, cython, @@ -30,7 +29,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - systemd libyaml openzwave cython From 8cb3f2194a8d35caf5d5ce7734e1b48b8f2c9d9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:25:25 +0000 Subject: [PATCH 2046/2279] doublecmd: 1.1.29 -> 1.1.30 --- pkgs/by-name/do/doublecmd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 7cf0bb6e70ed..c3e24ede3e80 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.29"; + version = "1.1.30"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-WEBCP5l9XZhule26thiti/NQpT0FPSu7b6ZffouHipQ="; + hash = "sha256-QEjwZ4jYkmgym4ap7GGD02O2yvEHFOw0jp6f65dfO+w="; }; nativeBuildInputs = [ From fd8857715ae8d0fa963b62deeb91a9bd3d1e9afb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:28:29 +0100 Subject: [PATCH 2047/2279] tslib: 1.23 -> 1.24 --- pkgs/by-name/ts/tslib/package.nix | 9 ++------- pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch | 11 ----------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix index ec21279b1272..58a3c1ff0112 100644 --- a/pkgs/by-name/ts/tslib/package.nix +++ b/pkgs/by-name/ts/tslib/package.nix @@ -8,20 +8,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "tslib"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "libts"; repo = "tslib"; tag = finalAttrs.version; - hash = "sha256-2YJDADh/WCksAEIjngAdji98YGmwjpvxSBZkxAwFc7k="; + hash = "sha256-WrzOTZlceYnFXi5AI5vb+ZDSRoqUDk/yyCdBUWKn0sM="; }; - patches = [ - # CMake 4 dropped support of versions lower than 3.5 - ./tslib-1.23-cmake4.patch - ]; - nativeBuildInputs = [ cmake ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch deleted file mode 100644 index d9f6b3ce0c5d..000000000000 --- a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ - # - # - --cmake_minimum_required(VERSION 3.3) -+cmake_minimum_required(VERSION 3.10) - - project(tslib LANGUAGES C) - \ No newline at end of file From cd9eb6359065afcf4c7b19258c72ae74a4264512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:34:30 +0000 Subject: [PATCH 2048/2279] python3Packages.django-filer: 3.3.2 -> 3.3.3 --- pkgs/development/python-modules/django-filer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix index 6ae38904969f..84ce11b3b5f1 100644 --- a/pkgs/development/python-modules/django-filer/default.nix +++ b/pkgs/development/python-modules/django-filer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-filer"; - version = "3.3.2"; + version = "3.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "django-filer"; tag = version; - hash = "sha256-XB+imTAcWCj9C6bNAo+uEdrshYKBlhxYXT37l92VW9M="; + hash = "sha256-EAiqGRdmUii86QwHkZ2BT5vBRaiXpNWbr9INmuYW444="; }; build-system = [ setuptools ]; From e07098d2d2076c9737c16045fa90f6be56085125 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:37:15 +0000 Subject: [PATCH 2049/2279] python3Packages.msgraph-sdk: 1.47.0 -> 1.48.0 --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index adcf9271a8ba..d4caf51ba126 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.47.0"; + version = "1.48.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-/S9dJ5eeYG7I+COizOb3TpaYpx7Qu+R5brRxbLuV3F8="; + hash = "sha256-855hgTTjdgKuzpMHws4BppEHIQVlIwUgC/oANwTE+qM="; }; build-system = [ flit-core ]; From fa8030c458a6a6f1aa65063f96fc650885154be8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:38:14 +0100 Subject: [PATCH 2050/2279] mongoose: 3.3.5 -> 3.3.6 --- pkgs/by-name/mo/mongoose/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mo/mongoose/package.nix b/pkgs/by-name/mo/mongoose/package.nix index 500a2a135357..2a226b5c7994 100644 --- a/pkgs/by-name/mo/mongoose/package.nix +++ b/pkgs/by-name/mo/mongoose/package.nix @@ -8,11 +8,11 @@ }: let - suitesparseVersion = "7.11.0"; + suitesparseVersion = "7.12.1"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.3.5"; + version = "3.3.6"; outputs = [ "bin" @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; tag = "v${suitesparseVersion}"; - hash = "sha256-8CnN2P/W15GpK0nCNoRQongOrzcz5E8l9SgKksqLxd0="; + hash = "sha256-6EMPEH5dcNT1qtuSlzR26RhpfN7MbYJdSKcrsQ0Pzow="; }; nativeBuildInputs = [ @@ -41,7 +41,6 @@ stdenv.mkDerivation { dontUseCmakeConfigure = true; cmakeFlags = [ - "-DBLAS_LIBRARIES=${blas}" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; From 3f0c046c5b41319aa8d651e054f9349dcc527676 Mon Sep 17 00:00:00 2001 From: Tom Vincent Date: Tue, 4 Nov 2025 12:36:29 +0000 Subject: [PATCH 2051/2279] python3Packages.rapidocr-onnxruntime: fix aarch64-linux build --- .../on/onnxruntime/cpuinfo-logging.patch | 45 +++++++++++++++++++ pkgs/by-name/on/onnxruntime/package.nix | 6 +++ .../rapidocr-onnxruntime/default.nix | 3 -- .../python-modules/rapidocr/default.nix | 3 -- 4 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch diff --git a/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch b/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch new file mode 100644 index 000000000000..e071b24afec3 --- /dev/null +++ b/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch @@ -0,0 +1,45 @@ +diff --git a/onnxruntime/core/common/cpuid_info.cc b/onnxruntime/core/common/cpuid_info.cc +--- a/onnxruntime/core/common/cpuid_info.cc ++++ b/onnxruntime/core/common/cpuid_info.cc +@@ -3,6 +3,7 @@ + #include "core/common/cpuid_info.h" + #include "core/common/logging/logging.h" + #include "core/common/logging/severity.h" ++#include + + #ifdef __linux__ + +@@ -364,8 +365,14 @@ + #if defined(CPUINFO_SUPPORTED) + pytorch_cpuinfo_init_ = cpuinfo_initialize(); + if (!pytorch_cpuinfo_init_) { +- LOGS_DEFAULT(WARNING) << "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation " +- "due to undetected CPU features."; ++ constexpr const char* message = ++ "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation due to undetected CPU " ++ "features."; ++ if (logging::LoggingManager::HasDefaultLogger()) { ++ LOGS_DEFAULT(WARNING) << message; ++ } else { ++ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl; ++ } + } + #endif // defined(CPUINFO_SUPPORTED) + #if defined(__linux__) +diff --git a/onnxruntime/core/platform/posix/env.cc b/onnxruntime/core/platform/posix/env.cc +--- a/onnxruntime/core/platform/posix/env.cc ++++ b/onnxruntime/core/platform/posix/env.cc +@@ -605,7 +605,12 @@ + PosixEnv() { + cpuinfo_available_ = cpuinfo_initialize(); + if (!cpuinfo_available_) { +- LOGS_DEFAULT(INFO) << "cpuinfo_initialize failed"; ++ constexpr const char* message = "cpuinfo_initialize failed"; ++ if (logging::LoggingManager::HasDefaultLogger()) { ++ LOGS_DEFAULT(INFO) << message; ++ } else { ++ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl; ++ } + } + } + bool cpuinfo_available_{false}; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index dcbea042fe7d..25166af7fb2a 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -92,6 +92,12 @@ effectiveStdenv.mkDerivation rec { url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch"; hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0="; }) + # Handle missing default logger when cpuinfo initialization fails in the build sandbox + # TODO: Remove on next release + # https://github.com/microsoft/onnxruntime/issues/10038 + # https://github.com/microsoft/onnxruntime/pull/15661 + # https://github.com/microsoft/onnxruntime/pull/20509 + ./cpuinfo-logging.patch ] ++ lib.optionals cudaSupport [ # We apply the referenced 1064.patch ourselves to our nix dependency. diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 6e369d6dcc97..6e4f3efadadb 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -120,9 +120,6 @@ buildPythonPackage { passthru.skipBulkUpdate = true; meta = { - # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 - # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - badPlatforms = [ "aarch64-linux" ]; changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; diff --git a/pkgs/development/python-modules/rapidocr/default.nix b/pkgs/development/python-modules/rapidocr/default.nix index 5734de8c8bc6..e70f956e6809 100644 --- a/pkgs/development/python-modules/rapidocr/default.nix +++ b/pkgs/development/python-modules/rapidocr/default.nix @@ -110,9 +110,6 @@ buildPythonPackage { doCheck = false; meta = { - # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 - # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 - badPlatforms = [ "aarch64-linux" ]; changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; From 2e8b033772d53b450c381e5f2ae0febc2cd61431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 9 Nov 2025 12:55:00 -0800 Subject: [PATCH 2052/2279] python3Packages.systemd-python: rename from systemd The former is what the package is called on PyPI. --- pkgs/by-name/fa/fail2ban/package.nix | 2 +- pkgs/by-name/jo/journalwatch/package.nix | 2 +- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 2 +- pkgs/by-name/ma/matrix-synapse/package.nix | 2 +- pkgs/by-name/on/onboard/package.nix | 2 +- pkgs/by-name/op/openvpn3/package.nix | 2 +- pkgs/by-name/py/pykms/package.nix | 2 +- .../python-modules/dnf-plugins-core/default.nix | 4 ++-- pkgs/development/python-modules/swh-core/default.nix | 4 ++-- .../python-modules/swh-objstorage/default.nix | 4 ++-- .../{systemd => systemd-python}/default.nix | 9 ++++++--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +++- 13 files changed, 23 insertions(+), 17 deletions(-) rename pkgs/development/python-modules/{systemd => systemd-python}/default.nix (91%) diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix index 7038122ab0d6..13165ea62bd5 100644 --- a/pkgs/by-name/fa/fail2ban/package.nix +++ b/pkgs/by-name/fa/fail2ban/package.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; lib.optionals stdenv.hostPlatform.isLinux [ - systemd + systemd-python pyinotify # https://github.com/fail2ban/fail2ban/issues/3787, remove it in the next release diff --git a/pkgs/by-name/jo/journalwatch/package.nix b/pkgs/by-name/jo/journalwatch/package.nix index b7c2a10c41b2..30d3fde59354 100644 --- a/pkgs/by-name/jo/journalwatch/package.nix +++ b/pkgs/by-name/jo/journalwatch/package.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ systemd ]; + dependencies = with python3Packages; [ systemd-python ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 4ba829f3b248..8a9863f7d70b 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -108,7 +108,7 @@ python3Packages.buildPythonApplication rec { authlib ]; systemd = [ - systemd + systemd-python ]; url-preview = [ lxml diff --git a/pkgs/by-name/ma/matrix-synapse/package.nix b/pkgs/by-name/ma/matrix-synapse/package.nix index e1e8e264b1f8..38609ee1ba2d 100644 --- a/pkgs/by-name/ma/matrix-synapse/package.nix +++ b/pkgs/by-name/ma/matrix-synapse/package.nix @@ -7,7 +7,7 @@ "postgres" "url-preview" ] - ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd", + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd-python) "systemd", plugins ? [ ], }: diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 6de18aa2945f..e54a7bd835de 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -103,7 +103,7 @@ python3.pkgs.buildPythonApplication rec { pyatspi pycairo pygobject3 - systemd + systemd-python ]; propagatedUserEnvPkgs = [ dconf ]; diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix index 6eb179c1612f..10560959b300 100644 --- a/pkgs/by-name/op/openvpn3/package.nix +++ b/pkgs/by-name/op/openvpn3/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { pythonPath = python3.withPackages (ps: [ ps.dbus-python ps.pygobject3 - ps.systemd + ps.systemd-python ]); nativeBuildInputs = [ diff --git a/pkgs/by-name/py/pykms/package.nix b/pkgs/by-name/py/pykms/package.nix index a00cdbe4b45c..46fa64fb1d49 100644 --- a/pkgs/by-name/py/pykms/package.nix +++ b/pkgs/by-name/py/pykms/package.nix @@ -48,7 +48,7 @@ pypkgs.buildPythonApplication rec { sourceRoot = "${src.name}/py-kms"; propagatedBuildInputs = with pypkgs; [ - systemd + systemd-python pytz tzlocal dnspython diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 2b5432e7c6a1..906fe2de124d 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -15,7 +15,7 @@ python, rpm, sphinx, - systemd, + systemd-python, }: let @@ -68,7 +68,7 @@ buildPythonPackage rec { libcomps libdnf rpm - systemd + systemd-python ]; cmakeFlags = [ diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index abe4979eb1f1..3ce0191925f6 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -29,7 +29,7 @@ pytest-postgresql, pytz, requests-mock, - systemd, + systemd-python, types-deprecated, types-psycopg2, types-pytz, @@ -90,7 +90,7 @@ buildPythonPackage rec { pytest-postgresql pytz requests-mock - systemd + systemd-python types-deprecated types-psycopg2 types-pytz diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix index 5dda6b224fa5..ee234b521c95 100644 --- a/pkgs/development/python-modules/swh-objstorage/default.nix +++ b/pkgs/development/python-modules/swh-objstorage/default.nix @@ -31,7 +31,7 @@ pytest-postgresql, requests-mock, requests-toolbelt, - systemd, + systemd-python, types-python-dateutil, types-pyyaml, types-requests, @@ -96,7 +96,7 @@ buildPythonPackage rec { pytest-postgresql requests-mock requests-toolbelt - systemd + systemd-python types-python-dateutil types-pyyaml types-requests diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd-python/default.nix similarity index 91% rename from pkgs/development/python-modules/systemd/default.nix rename to pkgs/development/python-modules/systemd-python/default.nix index 72fe6ed5cd2b..e680a563bad2 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd-python/default.nix @@ -7,20 +7,23 @@ pkg-config, pytest, python, + setuptools, }: buildPythonPackage rec { - pname = "systemd"; + pname = "systemd-python"; version = "235"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "systemd"; repo = "python-systemd"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6031507b5b91..189327506239 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -444,6 +444,7 @@ mapAliases { subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29 synologydsm-api = throw "'synologydsm-api' has been renamed to/replaced by 'py-synologydsm-api'"; # Converted to throw 2025-10-29 + systemd = throw "systemd was removed because it was misnamed; use systemd-python instead"; # added 2025-11-09 sysv_ipc = throw "'sysv_ipc' has been renamed to/replaced by 'sysv-ipc'"; # Converted to throw 2025-10-29 tensorflow-bin_2 = throw "'tensorflow-bin_2' has been renamed to/replaced by 'tensorflow-bin'"; # Converted to throw 2025-10-29 tensorflow-build_2 = throw "'tensorflow-build_2' has been renamed to/replaced by 'tensorflow-build'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99e66e842b76..901b98d4a711 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18136,7 +18136,9 @@ self: super: with self; { systembridgemodels = callPackage ../development/python-modules/systembridgemodels { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; + systemd-python = callPackage ../development/python-modules/systemd-python { + inherit (pkgs) systemd; + }; systemdunitparser = callPackage ../development/python-modules/systemdunitparser { }; From 9773c37a2fadbae2d1dd4c8fc9c3528829c7c987 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Fri, 31 Oct 2025 07:43:41 -0300 Subject: [PATCH 2053/2279] itsycal: 0.15.7 -> 0.15.8 --- pkgs/by-name/it/itsycal/package.nix | 8 ++++++-- pkgs/by-name/it/itsycal/update.sh | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100755 pkgs/by-name/it/itsycal/update.sh diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix index b60ea425eb6b..2f6c0ad48f17 100644 --- a/pkgs/by-name/it/itsycal/package.nix +++ b/pkgs/by-name/it/itsycal/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "itsycal"; - version = "0.15.7"; + version = "0.15.8"; src = fetchzip { url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip"; - hash = "sha256-0JQ7fZ0cZM8DnAODZQKzUQEHQGhkNvV+0NY10Ef7MEw="; + hash = "sha256-zo77yCfIzb2ZmExJslQ64GPQqakXtiRmm0UYEgj+3eM="; }; installPhase = '' @@ -22,6 +22,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = ./update.sh; + }; + meta = { changelog = "https://www.mowglii.com/itsycal/versionhistory.html"; description = "Tiny menu bar calendar"; diff --git a/pkgs/by-name/it/itsycal/update.sh b/pkgs/by-name/it/itsycal/update.sh new file mode 100755 index 000000000000..cd176cc46860 --- /dev/null +++ b/pkgs/by-name/it/itsycal/update.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl xq-xml common-updater-scripts + +set -eu + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/package.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find package.nix in $ROOT" + exit 1 +fi + +LATEST_VERSION="$(curl -Ls https://www.mowglii.com/itsycal/versionhistory.html | xq -m -q 'h4' -a 'id' | head -n1)" + +if [ -z "$LATEST_VERSION" ]; then + echo "ERROR: Failed to scrape the latest version." + exit 1 +fi + +update-source-version itsycal "$LATEST_VERSION" --file="$NIX_DRV" From 7b3e094d9e67441418619e30a54d0cc3e49c932b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 21:50:54 +0000 Subject: [PATCH 2054/2279] ruffle: 0.2.0-nightly-2025-11-03 -> 0.2.0-nightly-2025-11-09 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 1acc5e8c6098..6709bf59af50 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2.0-nightly-2025-11-03"; + version = "0.2.0-nightly-2025-11-09"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version; - hash = "sha256-CthzW6yJLQPqzLotDD8jy46nvQKSUbK5I3z18y/CyyU="; + hash = "sha256-InOLycAjM1w1G+6yvPK5Je+X/EE5/wpeyJ5JAbB7YzU="; }; postPatch = @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "OpenH264Version(${major}, ${minor}, ${patch})" ''; - cargoHash = "sha256-i0qyi3hBEmc5LuKaBpKPFwk24BQNj2AT26Erz2P5ENk="; + cargoHash = "sha256-GV9tXroySDCA6JWxa2Zgxp0R/Xy9ZPVoYZW2GEow7Tk="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From 577a8e8d521090ef0a763eac4055a2a90db4184e Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Sun, 9 Nov 2025 22:51:40 +0100 Subject: [PATCH 2055/2279] nixos/meilisearch: remove redundant package setting The `services.meilisearch.package` option already defaults to `pkgs.meilisearch`, due to the nature of `mkPackageOption`. --- nixos/modules/services/search/meilisearch.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 1c335d8591ed..d58ed0f7c7e4 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -182,8 +182,6 @@ in no_analytics = lib.mkDefault true; }; - services.meilisearch.package = lib.mkDefault pkgs.meilisearch; - # used to restore dumps environment.systemPackages = [ cfg.package ]; From 93409ad5f961fd9a14ef0a5fd5ba48337d555517 Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Sun, 9 Nov 2025 23:02:08 +0100 Subject: [PATCH 2056/2279] maintainers: update adamperkowski --- 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 4ef067bbd57e..ec4e9be9cb15 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -588,7 +588,7 @@ adamperkowski = { name = "Adam Perkowski"; email = "me@adamperkowski.dev"; - matrix = "@xx0a_q:matrix.org"; + matrix = "@adam:matrix.system72.dev"; github = "adamperkowski"; githubId = 75480869; keys = [ From b615f1825dd7d68f46bdfa3481b7b615e8e9ad9c Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 18 Oct 2025 12:29:18 +0200 Subject: [PATCH 2057/2279] nixos/utils: Add support for LoadCredential= with genJqSecretsReplacementSnippet --- nixos/lib/utils.nix | 175 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 137 insertions(+), 38 deletions(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 35f5853e3f66..08678f5a6d00 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -229,7 +229,7 @@ let listToAttrs (flatten (recurse "." item)); /* - Takes an attrset and a file path and generates a bash snippet that + Takes some options, an attrset and a file path and generates a bash snippet that outputs a JSON file at the file path with all instances of { _secret = "/path/to/secret" } @@ -237,6 +237,28 @@ let in the attrset replaced with the contents of the file "/path/to/secret" in the output JSON. + The first argument exposes the following options: + + - attr: The name of the secret attribute that will be processed, defaults to "_secret" + - loadCredential: A boolean determining whether the script should load secrets directly (false) + or load them from $CREDENTIALS_DIRECTORY (true). In the latter case the output attribute set + will contain a .credentials attribute with the necessary credential list that can be passed + to systemd's `LoadCredential=` option. + + The output of this utility is an attribute set containing the main script and optionally + a list of credentials: + + { + # The main script + script = "..."; + + # If the loadCredential option was set: + credentials = [ + "secret1:/path/to/secret1" + #... + ]; + } + When a configuration option accepts an attrset that is finally converted to JSON, this makes it possible to let the user define arbitrary secret values. @@ -245,7 +267,7 @@ let If the file "/path/to/secret" contains the string "topsecretpassword1234", - genJqSecretsReplacementSnippet { + genJqSecretsReplacement { } { example = [ { irrelevant = "not interesting"; @@ -293,7 +315,7 @@ let { "b": "topsecretpassword5678" } ] - genJqSecretsReplacementSnippet { + genJqSecretsReplacement { } { example = [ { irrelevant = "not interesting"; @@ -330,12 +352,12 @@ let ] } */ - genJqSecretsReplacementSnippet = genJqSecretsReplacementSnippet' "_secret"; - - # Like genJqSecretsReplacementSnippet, but allows the name of the - # attr which identifies the secret to be changed. - genJqSecretsReplacementSnippet' = - attr: set: output: + genJqSecretsReplacement = + { + attr ? "_secret", + loadCredential ? false, + }: + set: output: let secretsRaw = recursiveGetAttrsetWithJqPrefix set attr; # Set default option values @@ -347,38 +369,115 @@ let // set ) secretsRaw; stringOrDefault = str: def: if str == "" then def else str; - in - '' - if [[ -h '${output}' ]]; then - rm '${output}' - fi - inherit_errexit_enabled=0 - shopt -pq inherit_errexit && inherit_errexit_enabled=1 - shopt -s inherit_errexit - '' - + concatStringsSep "\n" ( - imap1 (index: name: '' - secret${toString index}=$(<'${secrets.${name}.${attr}}') - export secret${toString index} - '') (attrNames secrets) - ) - + "\n" - + "${pkgs.jq}/bin/jq >'${output}' " - + escapeShellArg ( - stringOrDefault (concatStringsSep " | " ( + # Sanitize path to create a valid credential tag (same as in genLoadCredentialForJqSecretsReplacementSnippet) + sanitizePath = + path: lib.stringAsChars (c: if builtins.match "[a-zA-Z0-9_.#=!-]" c != null then c else "_") path; + + # Generate credential tag for a given index and path + credentialTag = index: path: "${toString index}_${sanitizePath (secrets.${path}.${attr})}"; + + credentialPath = + index: name: + if loadCredential then + ''"$CREDENTIALS_DIRECTORY/${credentialTag index name}"'' + else + "'${secrets.${name}.${attr}}'"; + in + { + script = '' + if [[ -h '${output}' ]]; then + rm '${output}' + fi + + inherit_errexit_enabled=0 + shopt -pq inherit_errexit && inherit_errexit_enabled=1 + shopt -s inherit_errexit + '' + + concatStringsSep "\n" ( imap1 ( index: name: - ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'' - ) (attrNames secrets) - )) "." - ) - + '' - <<'EOF' - ${toJSON set} - EOF - (( ! inherit_errexit_enabled )) && shopt -u inherit_errexit - ''; + # We keep variable assignment and export separated to avoid masking the return code of the file access. + # With `set -e` this will now fail if a file doesn't exist. + '' + secret${toString index}=$(<${credentialPath index name}) + export secret${toString index} + '') (attrNames secrets) + ) + + "\n" + + "${pkgs.jq}/bin/jq >'${output}' " + + escapeShellArg ( + stringOrDefault (concatStringsSep " | " ( + imap1 ( + index: name: + ''${name} = ($ENV.secret${toString index}${optionalString (!secrets.${name}.quote) " | fromjson"})'' + ) (attrNames secrets) + )) "." + ) + + '' + <<'EOF' + ${toJSON set} + EOF + (( ! inherit_errexit_enabled )) && shopt -u inherit_errexit + ''; + + /* + Generates a list of systemd LoadCredential entries if loadCredential was set, + otherwise returns null. + + The tag is sanitized to only contain characters a-zA-Z0-9_-.#=! and prefixed + with an index to ensure uniqueness. + + Example: + genLoadCredentialForJqSecretsReplacementSnippet { } { + example = { + secret1 = { _secret = "/path/to/secret"; }; + secret2 = { _secret = "/another/secret"; }; + }; + } + -> [ "0_path_to_secret:/path/to/secret" "1_another_secret:/another/secret" ] + */ + credentials = + if loadCredential then + imap1 ( + index: path: + "${toString index}_${sanitizePath (secretsRaw.${path}.${attr})}:${secretsRaw.${path}.${attr}}" + ) (attrNames secretsRaw) + else + null; + }; + + /* + A convenience function around `genJqSecretsReplacement` without any additional + settings that returns just the script that does the secret replacing. Make sure + to have a look at `genJqSecretsReplacement` first to decide whether you need + the additional functionality. + + Example: + If the file "/path/to/secret" contains the string + "topsecretpassword1234", + + genJqSecretsReplacementSnippet { + example = [ + { + irrelevant = "not interesting"; + } + { + ignored = "ignored attr"; + relevant = { + secret = { + _secret = "/path/to/secret"; + }; + }; + } + ]; + } "/path/to/output.json" + + will return a set of bash commands that replaces the secret values + in the given attrset with values from the respective files and saves the result + as a JSON file. + */ + genJqSecretsReplacementSnippet = set: output: (genJqSecretsReplacement { } set output).script; /* Remove packages of packagesToRemove from packages, based on their names. From c01c52791798bbcede95c0c6bc4769a9b79928ba Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 8 Nov 2025 11:10:32 +0100 Subject: [PATCH 2058/2279] nixos/immich: switch to genJqSecretsReplacement and deprecate secretSettings --- nixos/modules/services/web-apps/immich.nix | 64 ++++++++-------------- nixos/tests/web-apps/immich.nix | 14 ++--- 2 files changed, 30 insertions(+), 48 deletions(-) diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 23017629a329..7dff3515a268 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: let @@ -9,10 +10,9 @@ let format = pkgs.formats.json { }; isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host; isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host; - - # convert a Nix attribute path to jq object identifier-index: - # https://jqlang.org/manual/#object-identifier-index - attrPathToIndex = attrPath: "." + lib.concatStringsSep "." attrPath; + secretsReplacement = utils.genJqSecretsReplacement { + loadCredential = true; + } cfg.settings "/run/immich/config.json"; commonServiceConfig = { Type = "simple"; @@ -55,6 +55,22 @@ let if cfg.database.enable then config.services.postgresql.package else pkgs.postgresql; in { + imports = [ + (lib.mkRemovedOptionModule + [ + "services" + "immich" + "secretSettings" + ] + '' + `secretSettings` has been deprecated as secrets can now be specified + directly in `settings`. To do so, set `_secret` of the desired + attribute to a file path, for example: + `services.immich.settings.oauth.clientSecret._secret = "/path/to/secret/file";` + '' + ) + ]; + options.services.immich = { enable = mkEnableOption "Immich"; package = lib.mkPackageOption pkgs "immich" { }; @@ -128,6 +144,7 @@ in for options and defaults. Setting it to `null` allows configuring Immich in the web interface. + You can load secret values from a file in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly. ''; type = types.nullOr ( types.submodule { @@ -151,27 +168,6 @@ in ); }; - secretSettings = mkOption { - default = { }; - description = '' - Secrets to to be added to the JSON file generated from {option}`settings`, read from files. - ''; - example = lib.literalExpression '' - { - notifications.smtp.transport.password = "/path/to/secret"; - oauth.clientSecret = "/path/to/other/secret"; - } - ''; - type = - let - inherit (types) attrsOf either path; - recursiveType = either (attrsOf recursiveType) path // { - description = "nested " + (attrsOf path).description; - }; - in - recursiveType; - }; - machine-learning = { enable = mkEnableOption "immich's machine-learning functionality to detect faces and search for objects" @@ -424,24 +420,10 @@ in postgresqlPackage ]; - preStart = mkIf (cfg.settings != null) ( - '' - cat '${format.generate "immich-config.json" cfg.settings}' > /run/immich/config.json - '' - + lib.concatStrings ( - lib.mapAttrsToListRecursive (attrPath: _: '' - tmp="$(mktemp)" - ${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \ - '${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp" - mv "$tmp" /run/immich/config.json - '') cfg.secretSettings - ) - ); + preStart = mkIf (cfg.settings != null) secretsReplacement.script; serviceConfig = commonServiceConfig // { - LoadCredential = lib.mapAttrsToListRecursive ( - attrPath: file: "${attrPathToIndex attrPath}:${file}" - ) cfg.secretSettings; + LoadCredential = secretsReplacement.credentials; ExecStart = lib.getExe cfg.package; EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; Slice = "system-immich.slice"; diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix index fddc681620f1..406b51600c4e 100644 --- a/nixos/tests/web-apps/immich.nix +++ b/nixos/tests/web-apps/immich.nix @@ -17,14 +17,14 @@ services.immich = { enable = true; environment.IMMICH_LOG_LEVEL = "verbose"; - settings.backup.database = { - enabled = true; - cronExpression = "invalid"; - }; - secretSettings = { - backup.database.cronExpression = "${pkgs.writeText "cron" "0 02 * * *"}"; + settings = { + backup.database = { + enabled = true; + # Test loading secrets from files: + cronExpression._secret = "${pkgs.writeText "cron" "0 02 * * *"}"; + }; # thanks to LoadCredential files only readable by root should work - notifications.smtp.transport.password = "/etc/shadow"; + notifications.smtp.transport.password._secret = "/etc/shadow"; }; }; From 2fc0d21d4b5c634b63dc2b17149080f4ad5fe71f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 22:29:56 +0000 Subject: [PATCH 2059/2279] github-copilot-cli: 0.0.353 -> 0.0.354 --- pkgs/by-name/gi/github-copilot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index ec8334fcd9ce..7ce880ba0030 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-copilot-cli"; - version = "0.0.353"; + version = "0.0.354"; src = fetchzip { url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz"; - hash = "sha256-OWlEz75vVEvbtDNobLJ/a1iUuepYewCTWoqTbDG+4wg="; + hash = "sha256-W0KiqTThHv/G69X35Sma0KBGH0JAdZhC4/goosSZUDs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 1ab63e30c3bb6fb4f59271531e872f39441ebaf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 22:44:12 +0000 Subject: [PATCH 2060/2279] trealla: 2.84.11 -> 2.84.16 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 26228e5e77d4..382066844a4c 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.84.11"; + version = "2.84.16"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-x42s6h0niDUnFqqi/t8Mn/FdncivlI7ApTmo6TIx1aE="; + hash = "sha256-E2lbKPWy4KfBqAI+BC7pc0F/U4qf63nLGeIKmIfURX4="; }; postPatch = '' From ffa60e60defacbeeb9b96ff417e5efa6fafddbcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 22:52:06 +0000 Subject: [PATCH 2061/2279] terraform-providers.oracle_oci: 7.24.0 -> 7.25.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 2c413730cf25..616ff1b3d9c7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1048,11 +1048,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-R+Khf/BCDaFf1ExD3+zUIEoL/egRw0ube83cP3opO/I=", + "hash": "sha256-Pp2eOcz1LQv2Ft2oiwW+7dypDO1PuRE0I7Wcr2E/G4w=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v7.24.0", + "rev": "v7.25.0", "spdx": "MPL-2.0", "vendorHash": null }, From ca04f3d6ba79eca3f48e565ca284251d6d61abae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 22:59:35 +0000 Subject: [PATCH 2062/2279] yarn-berry: 4.10.3 -> 4.11.0 --- pkgs/by-name/ya/yarn-berry/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index a08f8f6712d0..5c79ce512407 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -10,9 +10,9 @@ }: let - version_4 = "4.10.3"; + version_4 = "4.11.0"; version_3 = "3.8.7"; - hash_4 = "sha256-sPA9XxWuYvxw/eYAsePuHOaaY2jIBRAv5YfDgVUF6YY="; + hash_4 = "sha256-6TfmeUdLkZi5SMtcrgvJWUS66HvENKOIvbavbO0+L2I="; hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo="; in From 01d9d4a19b2e768561d9b634cdea039c1c9a2ebe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 23:22:08 +0000 Subject: [PATCH 2063/2279] warp-terminal: 0.2025.10.29.08.12.stable_03 -> 0.2025.11.05.08.12.stable_00 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 141842198ee4..82adb5dab130 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-7l9U9onDdMhyWwXs2+qfkTJwujq+KricG40YCXknMF4=", - "version": "0.2025.10.29.08.12.stable_03" + "hash": "sha256-H1ay2Xrp9ouUjICQKtKboWWPfXaOi3EU4UWWNhgtsqU=", + "version": "0.2025.11.05.08.12.stable_00" }, "linux_x86_64": { - "hash": "sha256-Se1/UN9W8jiI6ylhC8H9l4RKdg1OAm6gcg1OWjS31mo=", - "version": "0.2025.10.29.08.12.stable_03" + "hash": "sha256-yk/8tS5Pd0bHy4mTB+AyOufTrjZ4QmvOQLBmz3Bc1YM=", + "version": "0.2025.11.05.08.12.stable_00" }, "linux_aarch64": { - "hash": "sha256-9m0oK+OIxCOMp2YZaRUDlj5kBTUxsf+HIA0glMLeu8w=", - "version": "0.2025.10.29.08.12.stable_03" + "hash": "sha256-E+ZncXLnREVZ//2Q724Yuh9brO+biUglPkr/g2SfLIA=", + "version": "0.2025.11.05.08.12.stable_00" } } From fa853ef3cf76fc0b9d9fe86299e55057b455cc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 23:49:45 +0000 Subject: [PATCH 2064/2279] chirp: 0.4.0-unstable-2025-10-30 -> 0.4.0-unstable-2025-11-05 --- pkgs/by-name/ch/chirp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index 2b8bcba2d8f1..135f5710e008 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-10-30"; + version = "0.4.0-unstable-2025-11-05"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "a3b973cceb46e431423b3599fb365668958963d5"; - hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M="; + rev = "0d2703ecad8b055a33220de592dc11bcbc153a20"; + hash = "sha256-5O0bmxVpmAkonRInl3L2MplYnZSkkFVLRd4bz59HFv4="; }; nativeBuildInputs = [ From bc0ebc8383b5294308a904b9286082c08fb93dbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Nov 2025 23:55:42 +0000 Subject: [PATCH 2065/2279] python3Packages.mitogen: 0.3.30 -> 0.3.31 --- pkgs/development/python-modules/mitogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index b11f0420ecfd..08115a3690df 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.30"; + version = "0.3.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; tag = "v${version}"; - hash = "sha256-witxGRPi2TOwLOnsJcxOKLJdZ6ggapANXneFMJdHa98="; + hash = "sha256-ecDRva+K/caMV9T5W5dxFRwJyGvrURpexOa5bNyXkb4="; }; build-system = [ setuptools ]; From 9a86a3568f4653758c8aeff29852a60248901bba Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 10 Nov 2025 01:02:42 +0100 Subject: [PATCH 2066/2279] chicago95: fix `noBrokenSymlinks` --- pkgs/by-name/ch/chicago95/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ch/chicago95/package.nix b/pkgs/by-name/ch/chicago95/package.nix index d3a9e61289a7..1901362a646c 100644 --- a/pkgs/by-name/ch/chicago95/package.nix +++ b/pkgs/by-name/ch/chicago95/package.nix @@ -18,6 +18,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ gtk3 ]; + buildPhase = '' + runHook preBuild + find . -xtype l -delete + runHook postBuild + ''; + installPhase = '' runHook preInstall From 6361da1a99e99e040247ccea67dfd94be707f7cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 00:08:47 +0000 Subject: [PATCH 2067/2279] cargo-nextest: 0.9.110 -> 0.9.111 --- pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index b8e34fcbc070..9a0b870f0c04 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.110"; + version = "0.9.111"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-ipxPE3nugBJt/gLUdy/LQOTqat1Li2ovVPq3i81Yd/w="; + hash = "sha256-5ri4KI0dvWAkReUznRkibI45ZeZV5DMyq5VAr+az+b4="; }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ./no-dtrace-macos.patch ]; - cargoHash = "sha256-9IvBgn+2taygTU+RjUWoiS3yI1LzejvzrYJ7VoiHpJI="; + cargoHash = "sha256-/YvzJO+GWo/B5AMXFYvFKfCS72QjOo8aZg+trKm+etI="; cargoBuildFlags = [ "-p" From cde176055628c6d9080ff138bcf542cb2deb31b2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Nov 2025 22:57:19 +0800 Subject: [PATCH 2068/2279] budgie-desktop: 10.9.3-unstable-2025-09-13 -> 10.9.4 https://github.com/BuddiesOfBudgie/budgie-desktop/compare/68d5136613fa1b15d39cc67ada3085590ec162ae...v10.9.4 --- doc/release-notes/rl-2511.section.md | 2 +- pkgs/by-name/bu/budgie-desktop/package.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 98d9f0826060..2d959f0b47b9 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -168,7 +168,7 @@ - `meilisearch_1_11` has been removed, as it is no longer supported. -- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`. +- `budgie-desktop` has been updated [10.9.4](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.4). This changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie` and contains ABI bumps for libpeas2 migration. - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 8e14de959279..ac014cfcd01a 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -48,14 +48,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-desktop"; - version = "10.9.3-unstable-2025-09-13"; + version = "10.9.4"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = "budgie-desktop"; - rev = "68d5136613fa1b15d39cc67ada3085590ec162ae"; + tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xqN06CGS4xyUwnJCsLplYzKtO/V8hDmb6UNJu/nhQHs="; + hash = "sha256-e1kkmzSYX8TwiY0IIZYIK/FgMbZ/8PqkUn8pk3CcXHU="; }; outputs = [ @@ -147,8 +147,8 @@ stdenv.mkDerivation (finalAttrs: { teams = [ lib.teams.budgie ]; platforms = lib.platforms.linux; pkgConfigModules = [ - "budgie-1.0" - "budgie-raven-plugin-1.0" + "budgie-2.0" + "budgie-raven-plugin-2.0" "budgie-theme-1.0" ]; }; From 8eca5533464b9e1ff884ebc908e363faa7a7af6c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Nov 2025 23:06:32 +0800 Subject: [PATCH 2069/2279] budgie-analogue-clock-applet: Support budgie-desktop 10.9.4 Switch to budgie-2.0. --- .../bu/budgie-analogue-clock-applet/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix index f2c93edc49b6..d050b32d7ff1 100644 --- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix +++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix @@ -8,6 +8,7 @@ vala, budgie-desktop, gtk3, + gtk-layer-shell, libpeas2, nix-update-script, }: @@ -33,15 +34,22 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ budgie-desktop gtk3 + gtk-layer-shell libpeas2 ]; postPatch = '' - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 - substituteInPlace meson.build \ - --replace-fail "dependency('libpeas-1.0')" "dependency('libpeas-2')" + # https://github.com/samlane-ma/analogue-clock-applet/issues/7 + substituteInPlace budgie-analogue-clock-widget/src/meson.build \ + --replace-fail "dependency('budgie-raven-plugin-1.0')" "dependency('budgie-raven-plugin-2.0')" ''; + mesonFlags = [ + # The meson option actually enables libpeas2 support + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + "-Dfor-wayland=true" + ]; + passthru = { updateScript = nix-update-script { }; }; From 243bf5509c8ed67d73b7e697798f9534b59d58ba Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Nov 2025 23:09:09 +0800 Subject: [PATCH 2070/2279] budgie-media-player-applet: Support budgie-desktop 10.9.4 Switch to budgie-2.0. --- .../bu/budgie-media-player-applet/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 9e2f0419ae0c..4e42ee0e6482 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -43,12 +43,18 @@ stdenv.mkDerivation (finalAttrs: { requests ]; + mesonFlags = [ + # The meson option actually enables libpeas2 support + # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + "-Dfor-wayland=true" + ]; + postPatch = '' substituteInPlace meson.build --replace-fail "/usr" "$out" - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 - substituteInPlace budgie-media-player-applet.plugin.in \ - --replace-fail "Loader=@PYTHON@" "Loader=python" + # https://github.com/zalesyc/budgie-media-player-applet/issues/25 + substituteInPlace src/{applet,testWin,Popover,BudgieMediaPlayer}.py \ + --replace-fail "gi.require_version('Budgie', '1.0')" "gi.require_version('Budgie', '2.0')" ''; postFixup = '' From 1975bdfb8a86160644a12b9b4af3ce292f0d3188 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Nov 2025 23:14:35 +0800 Subject: [PATCH 2071/2279] budgie-systemmonitor-applet: Support budgie-desktop 10.9.4 Switch to budgie-2.0. --- pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix index 14ca2c0c4188..462a6daa5bf8 100644 --- a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix +++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 + # https://github.com/prateekmedia/budgie-systemmonitor-applet/issues/4 substituteInPlace meson.build \ - --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" + --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')" \ + --replace-fail "dependency('budgie-1.0', version: '>= 2')" "dependency('budgie-2.0')" ''; passthru = { From dcfc769265dd4d744dae8ab88162293c6c824d6c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Nov 2025 23:18:28 +0800 Subject: [PATCH 2072/2279] budgie-user-indicator-redux: 1.0.2 -> 1.1.0 https://github.com/EbonJaeger/budgie-user-indicator-redux/compare/v1.0.2...v1.1.0 Switch to budgie-2.0. --- .../bu/budgie-user-indicator-redux/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix index 4c398702469d..1da60058ec24 100644 --- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix +++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "budgie-user-indicator-redux"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "EbonJaeger"; repo = "budgie-user-indicator-redux"; - rev = "v${finalAttrs.version}"; - hash = "sha256-X9b4H4PnrYGb/T7Sg9iXQeNDLoO1l0VCdbOCGUAgwC4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZvT114F0g+3zpskyb4Bn6grAXHWtMqRqb9MzfF0WLQ8="; }; nativeBuildInputs = [ @@ -44,12 +44,6 @@ stdenv.mkDerivation (finalAttrs: { sassc ]; - postPatch = '' - # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749 - substituteInPlace meson.build \ - --replace-fail "dependency('libpeas-1.0', version: '>= 1.26.0')" "dependency('libpeas-2')" - ''; - passthru = { updateScript = nix-update-script { }; }; From bd9cca6797f9815c11598d1dc0d110acd69aa648 Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 8 Nov 2025 17:40:10 -0500 Subject: [PATCH 2073/2279] docuseal: remove in-tree yarn.lock --- pkgs/by-name/do/docuseal/package.nix | 18 +- pkgs/by-name/do/docuseal/update.sh | 9 +- pkgs/by-name/do/docuseal/yarn.lock | 6605 -------------------------- 3 files changed, 8 insertions(+), 6624 deletions(-) delete mode 100644 pkgs/by-name/do/docuseal/yarn.lock diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix index c6869b24ed80..1b2f33d88b7d 100644 --- a/pkgs/by-name/do/docuseal/package.nix +++ b/pkgs/by-name/do/docuseal/package.nix @@ -10,7 +10,7 @@ bundler, fetchYarnDeps, yarn, - fixup-yarn-lock, + yarnConfigHook, nodejs, }: @@ -45,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: { ; offlineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - hash = "sha256-IQOWLkVueuRs0CBv3lEdj6DOiumC4ZPuQRDxQHFh5fQ="; + inherit (finalAttrs) src; + hash = "sha256-WypnmgUbt+qlJivg1oWX6dabD/1o0H6c3ODcv+S5Ptw="; }; nativeBuildInputs = [ yarn - fixup-yarn-lock + yarnConfigHook nodejs finalAttrs.rubyEnv ]; @@ -64,12 +64,6 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild export HOME=$(mktemp -d) - fixup-yarn-lock yarn.lock - - yarn config --offline set yarn-offline-mirror $offlineCache - - yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress - patchShebangs node_modules bundle exec rails assets:precompile bundle exec rails shakapacker:compile @@ -88,7 +82,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ finalAttrs.rubyEnv ]; propagatedBuildInputs = [ finalAttrs.rubyEnv.wrappedRuby ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; RAILS_ENV = "production"; BUNDLE_WITHOUT = "development:test"; diff --git a/pkgs/by-name/do/docuseal/update.sh b/pkgs/by-name/do/docuseal/update.sh index fe351f5d55a3..7fa0ebea1bc3 100755 --- a/pkgs/by-name/do/docuseal/update.sh +++ b/pkgs/by-name/do/docuseal/update.sh @@ -32,15 +32,8 @@ BUNDLE_GEMFILE="$repo/Gemfile" bundler lock --remove-platform aarch64-linux --lo # generate gemset.nix bundix --lock --lockfile="$repo/Gemfile.lock" --gemfile="$repo/Gemfile" --gemset="$dir/gemset.nix" -# patch yarn.lock -sed -i 's$, "@hotwired/turbo@https://github.com/docusealco/turbo#main"$$g' "$repo/yarn.lock" - -# calc yarn hash -YARN_HASH="$(prefetch-yarn-deps "$repo/yarn.lock")" -YARN_HASH="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$YARN_HASH")" - # update -cp "$repo/Gemfile" "$repo/Gemfile.lock" "$repo/yarn.lock" "$dir/" +cp "$repo/Gemfile" "$repo/Gemfile.lock" "$dir/" nix-update docuseal --version "$latest" nix-update docuseal --subpackage "docusealWeb" diff --git a/pkgs/by-name/do/docuseal/yarn.lock b/pkgs/by-name/do/docuseal/yarn.lock deleted file mode 100644 index a31a6729ca0b..000000000000 --- a/pkgs/by-name/do/docuseal/yarn.lock +++ /dev/null @@ -1,6605 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@alloc/quick-lru@^5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" - integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== - -"@ampproject/remapping@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" - integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/code-frame@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" - integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== - dependencies: - "@babel/highlight" "^7.24.7" - picocolors "^1.0.0" - -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5": - version "7.21.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" - integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA== - -"@babel/core@7.21.8": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4" - integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.5" - "@babel/helper-compilation-targets" "^7.21.5" - "@babel/helper-module-transforms" "^7.21.5" - "@babel/helpers" "^7.21.5" - "@babel/parser" "^7.21.8" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.0" - -"@babel/eslint-parser@^7.21.8": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.21.8.tgz#59fb6fc4f3b017ab86987c076226ceef7b2b2ef2" - integrity sha512-HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ== - dependencies: - "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" - eslint-visitor-keys "^2.1.0" - semver "^6.3.0" - -"@babel/generator@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" - integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w== - dependencies: - "@babel/types" "^7.21.5" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/generator@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" - integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== - dependencies: - "@babel/types" "^7.25.0" - "@jridgewell/gen-mapping" "^0.3.5" - "@jridgewell/trace-mapping" "^0.3.25" - jsesc "^2.5.1" - -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz#817f73b6c59726ab39f6ba18c234268a519e5abb" - integrity sha512-uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g== - dependencies: - "@babel/types" "^7.21.5" - -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366" - integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w== - dependencies: - "@babel/compat-data" "^7.21.5" - "@babel/helper-validator-option" "^7.21.0" - browserslist "^4.21.3" - lru-cache "^5.1.1" - semver "^6.3.0" - -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz#205b26330258625ef8869672ebca1e0dee5a0f02" - integrity sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-member-expression-to-functions" "^7.21.5" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.21.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/helper-split-export-declaration" "^7.18.6" - semver "^6.3.0" - -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz#a7886f61c2e29e21fd4aaeaf1e473deba6b571dc" - integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.3.1" - semver "^6.3.0" - -"@babel/helper-define-polyfill-provider@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" - integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== - dependencies: - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" - integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== - -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" - integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== - dependencies: - "@babel/template" "^7.20.7" - "@babel/types" "^7.21.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-member-expression-to-functions@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz#3b1a009af932e586af77c1030fba9ee0bde396c0" - integrity sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg== - dependencies: - "@babel/types" "^7.21.5" - -"@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" - integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== - dependencies: - "@babel/types" "^7.21.4" - -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420" - integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw== - dependencies: - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-module-imports" "^7.21.4" - "@babel/helper-simple-access" "^7.21.5" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@babel/helper-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56" - integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg== - -"@babel/helper-remap-async-to-generator@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" - integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-wrap-function" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz#a6ad005ba1c7d9bc2973dfde05a1bba7065dde3c" - integrity sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg== - dependencies: - "@babel/helper-environment-visitor" "^7.21.5" - "@babel/helper-member-expression-to-functions" "^7.21.5" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@babel/helper-simple-access@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee" - integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg== - dependencies: - "@babel/types" "^7.21.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" - integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== - dependencies: - "@babel/types" "^7.20.0" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" - integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== - -"@babel/helper-string-parser@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" - integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== - -"@babel/helper-string-parser@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" - integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-identifier@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" - integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== - -"@babel/helper-validator-identifier@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" - integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== - -"@babel/helper-validator-option@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" - integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== - -"@babel/helper-wrap-function@^7.18.9": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" - integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== - dependencies: - "@babel/helper-function-name" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" - -"@babel/helpers@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08" - integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA== - dependencies: - "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.5" - "@babel/types" "^7.21.5" - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" - integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== - dependencies: - "@babel/helper-validator-identifier" "^7.24.7" - chalk "^2.4.2" - js-tokens "^4.0.0" - picocolors "^1.0.0" - -"@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.21.8", "@babel/parser@^7.7.0": - version "7.21.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8" - integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== - -"@babel/parser@^7.23.5": - version "7.26.2" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11" - integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ== - dependencies: - "@babel/types" "^7.26.0" - -"@babel/parser@^7.25.0", "@babel/parser@^7.25.3": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065" - integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw== - dependencies: - "@babel/types" "^7.25.2" - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" - integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" - integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-proposal-optional-chaining" "^7.20.7" - -"@babel/plugin-proposal-async-generator-functions@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" - integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-remap-async-to-generator" "^7.18.9" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" - integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-class-static-block@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" - integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-dynamic-import@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" - integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" - integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" - integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" - integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" - integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" - integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" - integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== - dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.20.7" - -"@babel/plugin-proposal-optional-catch-binding@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" - integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" - integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" - integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-private-property-in-object@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" - integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" - integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-import-assertions@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" - integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-syntax-import-meta@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-top-level-await@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-arrow-functions@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz#9bb42a53de447936a57ba256fbf537fc312b6929" - integrity sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - -"@babel/plugin-transform-async-to-generator@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" - integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-remap-async-to-generator" "^7.18.9" - -"@babel/plugin-transform-block-scoped-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" - integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-block-scoping@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" - integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-classes@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" - integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-replace-supers" "^7.20.7" - "@babel/helper-split-export-declaration" "^7.18.6" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz#3a2d8bb771cd2ef1cd736435f6552fe502e11b44" - integrity sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - "@babel/template" "^7.20.7" - -"@babel/plugin-transform-destructuring@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" - integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" - integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-duplicate-keys@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" - integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-exponentiation-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" - integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-for-of@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz#e890032b535f5a2e237a18535f56a9fdaa7b83fc" - integrity sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - -"@babel/plugin-transform-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" - integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== - dependencies: - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" - integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-member-expression-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" - integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-modules-amd@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" - integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== - dependencies: - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-modules-commonjs@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz#d69fb947eed51af91de82e4708f676864e5e47bc" - integrity sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ== - dependencies: - "@babel/helper-module-transforms" "^7.21.5" - "@babel/helper-plugin-utils" "^7.21.5" - "@babel/helper-simple-access" "^7.21.5" - -"@babel/plugin-transform-modules-systemjs@^7.20.11": - version "7.20.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" - integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== - dependencies: - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.20.11" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-validator-identifier" "^7.19.1" - -"@babel/plugin-transform-modules-umd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" - integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" - integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.20.5" - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-new-target@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" - integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-object-super@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" - integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.6" - -"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" - integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - -"@babel/plugin-transform-property-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" - integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-regenerator@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz#576c62f9923f94bcb1c855adc53561fd7913724e" - integrity sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - regenerator-transform "^0.15.1" - -"@babel/plugin-transform-reserved-words@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" - integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-runtime@7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa" - integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA== - dependencies: - "@babel/helper-module-imports" "^7.21.4" - "@babel/helper-plugin-utils" "^7.20.2" - babel-plugin-polyfill-corejs2 "^0.3.3" - babel-plugin-polyfill-corejs3 "^0.6.0" - babel-plugin-polyfill-regenerator "^0.4.1" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" - integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-spread@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" - integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - -"@babel/plugin-transform-sticky-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" - integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-template-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" - integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-typeof-symbol@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" - integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-unicode-escapes@^7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz#1e55ed6195259b0e9061d81f5ef45a9b009fb7f2" - integrity sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg== - dependencies: - "@babel/helper-plugin-utils" "^7.21.5" - -"@babel/plugin-transform-unicode-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" - integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/preset-env@7.21.5": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb" - integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg== - dependencies: - "@babel/compat-data" "^7.21.5" - "@babel/helper-compilation-targets" "^7.21.5" - "@babel/helper-plugin-utils" "^7.21.5" - "@babel/helper-validator-option" "^7.21.0" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7" - "@babel/plugin-proposal-async-generator-functions" "^7.20.7" - "@babel/plugin-proposal-class-properties" "^7.18.6" - "@babel/plugin-proposal-class-static-block" "^7.21.0" - "@babel/plugin-proposal-dynamic-import" "^7.18.6" - "@babel/plugin-proposal-export-namespace-from" "^7.18.9" - "@babel/plugin-proposal-json-strings" "^7.18.6" - "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" - "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.20.7" - "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" - "@babel/plugin-proposal-optional-chaining" "^7.21.0" - "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/plugin-proposal-private-property-in-object" "^7.21.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.20.0" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.21.5" - "@babel/plugin-transform-async-to-generator" "^7.20.7" - "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.21.0" - "@babel/plugin-transform-classes" "^7.21.0" - "@babel/plugin-transform-computed-properties" "^7.21.5" - "@babel/plugin-transform-destructuring" "^7.21.3" - "@babel/plugin-transform-dotall-regex" "^7.18.6" - "@babel/plugin-transform-duplicate-keys" "^7.18.9" - "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.21.5" - "@babel/plugin-transform-function-name" "^7.18.9" - "@babel/plugin-transform-literals" "^7.18.9" - "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.20.11" - "@babel/plugin-transform-modules-commonjs" "^7.21.5" - "@babel/plugin-transform-modules-systemjs" "^7.20.11" - "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5" - "@babel/plugin-transform-new-target" "^7.18.6" - "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.21.3" - "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.21.5" - "@babel/plugin-transform-reserved-words" "^7.18.6" - "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.20.7" - "@babel/plugin-transform-sticky-regex" "^7.18.6" - "@babel/plugin-transform-template-literals" "^7.18.9" - "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.21.5" - "@babel/plugin-transform-unicode-regex" "^7.18.6" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.21.5" - babel-plugin-polyfill-corejs2 "^0.3.3" - babel-plugin-polyfill-corejs3 "^0.6.0" - babel-plugin-polyfill-regenerator "^0.4.1" - core-js-compat "^3.25.1" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - -"@babel/regjsgen@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" - integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== - -"@babel/runtime@7.21.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.8.4": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" - integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== - dependencies: - regenerator-runtime "^0.13.11" - -"@babel/runtime@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== - dependencies: - regenerator-runtime "^0.14.0" - -"@babel/template@^7.18.10", "@babel/template@^7.20.7": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" - integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.20.7" - "@babel/types" "^7.20.7" - -"@babel/template@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" - integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q== - dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/parser" "^7.25.0" - "@babel/types" "^7.25.0" - -"@babel/traverse@^7.20.5", "@babel/traverse@^7.21.5", "@babel/traverse@^7.7.0": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490" - integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ== - dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/parser" "^7.25.3" - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.2" - debug "^4.3.1" - globals "^11.1.0" - -"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0": - version "7.21.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" - integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== - dependencies: - "@babel/helper-string-parser" "^7.21.5" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.25.0", "@babel/types@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125" - integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q== - dependencies: - "@babel/helper-string-parser" "^7.24.8" - "@babel/helper-validator-identifier" "^7.24.7" - to-fast-properties "^2.0.0" - -"@babel/types@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" - integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== - dependencies: - "@babel/helper-string-parser" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - -"@braintree/sanitize-url@^7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-7.1.1.tgz#15e19737d946559289b915e5dad3b4c28407735e" - integrity sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw== - -"@codemirror/autocomplete@^6.0.0": - version "6.18.6" - resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz#de26e864a1ec8192a1b241eb86addbb612964ddb" - integrity sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg== - dependencies: - "@codemirror/language" "^6.0.0" - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.17.0" - "@lezer/common" "^1.0.0" - -"@codemirror/commands@^6.0.0": - version "6.8.1" - resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.8.1.tgz#639f5559d2f33f2582a2429c58cb0c1b925c7a30" - integrity sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw== - dependencies: - "@codemirror/language" "^6.0.0" - "@codemirror/state" "^6.4.0" - "@codemirror/view" "^6.27.0" - "@lezer/common" "^1.1.0" - -"@codemirror/lang-css@^6.0.0": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@codemirror/lang-css/-/lang-css-6.3.1.tgz#763ca41aee81bb2431be55e3cfcc7cc8e91421a3" - integrity sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg== - dependencies: - "@codemirror/autocomplete" "^6.0.0" - "@codemirror/language" "^6.0.0" - "@codemirror/state" "^6.0.0" - "@lezer/common" "^1.0.2" - "@lezer/css" "^1.1.7" - -"@codemirror/lang-html@^6.4.9": - version "6.4.9" - resolved "https://registry.yarnpkg.com/@codemirror/lang-html/-/lang-html-6.4.9.tgz#d586f2cc9c341391ae07d1d7c545990dfa069727" - integrity sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q== - dependencies: - "@codemirror/autocomplete" "^6.0.0" - "@codemirror/lang-css" "^6.0.0" - "@codemirror/lang-javascript" "^6.0.0" - "@codemirror/language" "^6.4.0" - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.17.0" - "@lezer/common" "^1.0.0" - "@lezer/css" "^1.1.0" - "@lezer/html" "^1.3.0" - -"@codemirror/lang-javascript@^6.0.0": - version "6.2.4" - resolved "https://registry.yarnpkg.com/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz#eef2227d1892aae762f3a0f212f72bec868a02c5" - integrity sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA== - dependencies: - "@codemirror/autocomplete" "^6.0.0" - "@codemirror/language" "^6.6.0" - "@codemirror/lint" "^6.0.0" - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.17.0" - "@lezer/common" "^1.0.0" - "@lezer/javascript" "^1.0.0" - -"@codemirror/language@^6.0.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0": - version "6.11.2" - resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.11.2.tgz#90d2d094cfbd14263bc5354ebd2445ee4e81bdc3" - integrity sha512-p44TsNArL4IVXDTbapUmEkAlvWs2CFQbcfc0ymDsis1kH2wh0gcY96AS29c/vp2d0y2Tquk1EDSaawpzilUiAw== - dependencies: - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.23.0" - "@lezer/common" "^1.1.0" - "@lezer/highlight" "^1.0.0" - "@lezer/lr" "^1.0.0" - style-mod "^4.0.0" - -"@codemirror/lint@^6.0.0": - version "6.8.5" - resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.8.5.tgz#9edaa808e764e28e07665b015951934c8ec3a418" - integrity sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA== - dependencies: - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.35.0" - crelt "^1.0.5" - -"@codemirror/search@^6.0.0": - version "6.5.11" - resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.5.11.tgz#a324ffee36e032b7f67aa31c4fb9f3e6f9f3ed63" - integrity sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA== - dependencies: - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" - crelt "^1.0.5" - -"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.2.tgz#8eca3a64212a83367dc85475b7d78d5c9b7076c6" - integrity sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA== - dependencies: - "@marijn/find-cluster-break" "^1.0.0" - -"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0": - version "6.38.0" - resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.38.0.tgz#4486062b791a4247793e0953e05ae71a9e172217" - integrity sha512-yvSchUwHOdupXkd7xJ0ob36jdsSR/I+/C+VbY0ffBiL5NiSTEBDfB1ZGWbbIlDd5xgdUkody+lukAdOxYrOBeg== - dependencies: - "@codemirror/state" "^6.5.0" - crelt "^1.0.6" - style-mod "^4.1.0" - w3c-keyname "^2.2.4" - -"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - -"@eid-easy/eideasy-browser-client@2.135.0": - version "2.135.0" - resolved "https://registry.yarnpkg.com/@eid-easy/eideasy-browser-client/-/eideasy-browser-client-2.135.0.tgz#ade3cd72210aba2bdef99ec8ffdabbefdd5e6480" - integrity sha512-QaFMxdZaEzN/MdQ/ZhJBDN2v+6XJL0l9vK3zDgJFDyaUYvMvWcjFpHvtMiQEOivTD3sB4cM7/sJdwzA01APvsw== - dependencies: - axios "1.8.2" - jsencrypt "3.2.1" - lodash "^4.17.21" - serialize-error "^9.1.1" - -"@eid-easy/eideasy-widget@^2.171.0": - version "2.171.0" - resolved "https://registry.yarnpkg.com/@eid-easy/eideasy-widget/-/eideasy-widget-2.171.0.tgz#2072e50a187ef36dd89d0bc5102d5996657ea180" - integrity sha512-zDQgq2JhGR+omomU+4PU9vyWXJbMutklWCzZ74YVXzP1LmV0SD/X9Vy/bqofSZ1iRwgT+A+lCqLSmkoztaPC3A== - dependencies: - "@eid-easy/eideasy-browser-client" "2.135.0" - core-js "^3.8.3" - i18n-iso-countries "^6.7.0" - lodash.defaultsdeep "^4.6.1" - signature_pad "^4.1.4" - vue "^2.6.14" - vue-custom-element "^3.2.14" - vue-i18n "^8.23.0" - vue-select "^3.11.2" - -"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/regexpp@^4.4.0": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" - integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== - -"@eslint/eslintrc@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331" - integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.5.2" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@eslint/js@8.41.0": - version "8.41.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3" - integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA== - -"@github/catalyst@^2.0.0-beta": - version "2.0.0-beta" - resolved "https://registry.yarnpkg.com/@github/catalyst/-/catalyst-2.0.0-beta.tgz#a0aef206cee56902d9354d12ff1e92925b5f9063" - integrity sha512-E2avZZ+rcbm7E3ou7lXrB8SfcaA+3CQs3YwoYzoOyfsLOr+57N6N+KJcU/ESUsZqC4ve1PKvdG5TrOK8Q9MB6w== - -"@hotwired/turbo-rails@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.3.0.tgz#422c21752509f3edcd6c7b2725bbe9e157815f51" - integrity sha512-fvhO64vp/a2UVQ3jue9WTc2JisMv9XilIC7ViZmXAREVwiQ2S4UC7Go8f9A1j4Xu7DBI6SbFdqILk5ImqVoqyA== - dependencies: - "@hotwired/turbo" "^7.3.0" - "@rails/actioncable" "^7.0" - -"@hotwired/turbo@^7.3.0": - version "7.3.0" - resolved "https://github.com/docusealco/turbo#64d286a14b0d11383719a9a09852a775863d621a" - -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== - dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== - -"@isaacs/cliui@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" - integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== - dependencies: - string-width "^5.1.2" - string-width-cjs "npm:string-width@^4.2.0" - strip-ansi "^7.0.1" - strip-ansi-cjs "npm:strip-ansi@^6.0.1" - wrap-ansi "^8.1.0" - wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" - -"@jest/schemas@^29.4.3": - version "29.4.3" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" - integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg== - dependencies: - "@sinclair/typebox" "^0.25.16" - -"@jest/types@^29.5.0": - version "29.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" - integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== - dependencies: - "@jest/schemas" "^29.4.3" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/gen-mapping@^0.3.5": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" - integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== - dependencies: - "@jridgewell/set-array" "^1.2.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.24" - -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/resolve-uri@^3.1.0": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" - integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/set-array@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" - integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== - -"@jridgewell/source-map@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda" - integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/source-map@^0.3.3": - version "0.3.6" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a" - integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ== - dependencies: - "@jridgewell/gen-mapping" "^0.3.5" - "@jridgewell/trace-mapping" "^0.3.25" - -"@jridgewell/sourcemap-codec@1.4.14": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== - -"@jridgewell/sourcemap-codec@^1.4.14": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" - integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== - -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" - integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": - version "0.3.25" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" - integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== - dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" - -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== - -"@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.3.tgz#138fcddab157d83da557554851017c6c1e5667fd" - integrity sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA== - -"@lezer/css@^1.1.0", "@lezer/css@^1.1.7": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@lezer/css/-/css-1.3.0.tgz#296f298814782c2fad42a936f3510042cdcd2034" - integrity sha512-pBL7hup88KbI7hXnZV3PQsn43DHy6TWyzuyk2AO9UyoXcDltvIdqWKE1dLL/45JVZ+YZkHe1WVHqO6wugZZWcw== - dependencies: - "@lezer/common" "^1.2.0" - "@lezer/highlight" "^1.0.0" - "@lezer/lr" "^1.3.0" - -"@lezer/highlight@^1.0.0", "@lezer/highlight@^1.1.3": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.2.1.tgz#596fa8f9aeb58a608be0a563e960c373cbf23f8b" - integrity sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA== - dependencies: - "@lezer/common" "^1.0.0" - -"@lezer/html@^1.3.0": - version "1.3.10" - resolved "https://registry.yarnpkg.com/@lezer/html/-/html-1.3.10.tgz#1be9a029a6fe835c823b20a98a449a630416b2af" - integrity sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w== - dependencies: - "@lezer/common" "^1.2.0" - "@lezer/highlight" "^1.0.0" - "@lezer/lr" "^1.0.0" - -"@lezer/javascript@^1.0.0": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@lezer/javascript/-/javascript-1.5.1.tgz#2a424a6ec29f1d4ef3c34cbccc5447e373618ad8" - integrity sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw== - dependencies: - "@lezer/common" "^1.2.0" - "@lezer/highlight" "^1.1.3" - "@lezer/lr" "^1.3.0" - -"@lezer/lr@^1.0.0", "@lezer/lr@^1.3.0": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.2.tgz#931ea3dea8e9de84e90781001dae30dea9ff1727" - integrity sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA== - dependencies: - "@lezer/common" "^1.0.0" - -"@marijn/find-cluster-break@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz#775374306116d51c0c500b8c4face0f9a04752d8" - integrity sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g== - -"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": - version "5.1.1-v1" - resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" - integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg== - dependencies: - eslint-scope "5.1.1" - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@pkgjs/parseargs@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" - integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== - -"@polka/url@^1.0.0-next.20": - version "1.0.0-next.21" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" - integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== - -"@rails/actioncable@^7.0": - version "7.0.4" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41" - integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ== - -"@sinclair/typebox@^0.25.16": - version "0.25.24" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" - integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== - -"@specious/htmlflow@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@specious/htmlflow/-/htmlflow-1.1.0.tgz#cc8319c2cc6b5e2e309fa213d5a1f54cc093d9eb" - integrity sha512-g41FgN5kfuGkOrWhhmVvFes2BzQ3msU5oR/8KPdXbkBt8UIHtwL+by9maItDIhu+BR7pxshABtaB/FqpESa9Mg== - dependencies: - htmlparser2 "^8.0.1" - -"@tabler/icons-vue@^2.47.0": - version "2.47.0" - resolved "https://registry.yarnpkg.com/@tabler/icons-vue/-/icons-vue-2.47.0.tgz#604608a6df673d035c0e8e33f0565eeffa3adf36" - integrity sha512-huEDak5xouwsRjbTUZlYZny9kC8ez61vdx/KwhR2Uc5HcUpxpFy+7p+IKH/ZZ48IcTHmCbdBJgbFRUI1mePJog== - dependencies: - "@tabler/icons" "2.47.0" - -"@tabler/icons@2.47.0": - version "2.47.0" - resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-2.47.0.tgz#c41c680d1947e3ab2d60af3febc4132287c60596" - integrity sha512-4w5evLh+7FUUiA1GucvGj2ReX2TvOjEr4ejXdwL/bsjoSkof6r1gQmzqI+VHrE2CpJpB3al7bCTulOkFa/RcyA== - -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== - dependencies: - "@types/node" "*" - -"@types/connect-history-api-fallback@^1.3.5": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41" - integrity sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/estree@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== - -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": - version "4.17.35" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" - integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - "@types/send" "*" - -"@types/express@*", "@types/express@^4.17.13": - version "4.17.17" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" - integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.33" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/http-proxy@^1.17.8": - version "1.17.11" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.11.tgz#0ca21949a5588d55ac2b659b69035c84bd5da293" - integrity sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA== - dependencies: - "@types/node" "*" - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" - integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== - -"@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== - -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== - -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - -"@types/node@*": - version "20.2.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.1.tgz#de559d4b33be9a808fd43372ccee822c70f39704" - integrity sha512-DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== - -"@types/send@*": - version "0.17.1" - resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301" - integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== - dependencies: - "@types/express" "*" - -"@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.15.1" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" - integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ== - dependencies: - "@types/mime" "*" - "@types/node" "*" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== - dependencies: - "@types/node" "*" - -"@types/ws@^8.5.1": - version "8.5.4" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" - integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== - dependencies: - "@types/node" "*" - -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.8": - version "17.0.24" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" - integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== - dependencies: - "@types/yargs-parser" "*" - -"@vue/compiler-core@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128" - integrity sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g== - dependencies: - "@babel/parser" "^7.21.3" - "@vue/shared" "3.3.4" - estree-walker "^2.0.2" - source-map-js "^1.0.2" - -"@vue/compiler-dom@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151" - integrity sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w== - dependencies: - "@vue/compiler-core" "3.3.4" - "@vue/shared" "3.3.4" - -"@vue/compiler-sfc@2.7.16": - version "2.7.16" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83" - integrity sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg== - dependencies: - "@babel/parser" "^7.23.5" - postcss "^8.4.14" - source-map "^0.6.1" - optionalDependencies: - prettier "^1.18.2 || ^2.0.0" - -"@vue/compiler-sfc@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df" - integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ== - dependencies: - "@babel/parser" "^7.20.15" - "@vue/compiler-core" "3.3.4" - "@vue/compiler-dom" "3.3.4" - "@vue/compiler-ssr" "3.3.4" - "@vue/reactivity-transform" "3.3.4" - "@vue/shared" "3.3.4" - estree-walker "^2.0.2" - magic-string "^0.30.0" - postcss "^8.1.10" - source-map-js "^1.0.2" - -"@vue/compiler-ssr@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz#9d1379abffa4f2b0cd844174ceec4a9721138777" - integrity sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ== - dependencies: - "@vue/compiler-dom" "3.3.4" - "@vue/shared" "3.3.4" - -"@vue/reactivity-transform@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929" - integrity sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw== - dependencies: - "@babel/parser" "^7.20.15" - "@vue/compiler-core" "3.3.4" - "@vue/shared" "3.3.4" - estree-walker "^2.0.2" - magic-string "^0.30.0" - -"@vue/reactivity@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.4.tgz#a27a29c6cd17faba5a0e99fbb86ee951653e2253" - integrity sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ== - dependencies: - "@vue/shared" "3.3.4" - -"@vue/runtime-core@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.3.4.tgz#4bb33872bbb583721b340f3088888394195967d1" - integrity sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA== - dependencies: - "@vue/reactivity" "3.3.4" - "@vue/shared" "3.3.4" - -"@vue/runtime-dom@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz#992f2579d0ed6ce961f47bbe9bfe4b6791251566" - integrity sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ== - dependencies: - "@vue/runtime-core" "3.3.4" - "@vue/shared" "3.3.4" - csstype "^3.1.1" - -"@vue/server-renderer@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.3.4.tgz#ea46594b795d1536f29bc592dd0f6655f7ea4c4c" - integrity sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ== - dependencies: - "@vue/compiler-ssr" "3.3.4" - "@vue/shared" "3.3.4" - -"@vue/shared@3.3.4": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780" - integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ== - -"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" - integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - -"@webassemblyjs/floating-point-hex-parser@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" - integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== - -"@webassemblyjs/helper-api-error@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" - integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== - -"@webassemblyjs/helper-buffer@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" - integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== - -"@webassemblyjs/helper-numbers@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" - integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" - integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== - -"@webassemblyjs/helper-wasm-section@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" - integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.12.1" - -"@webassemblyjs/ieee754@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" - integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" - integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" - integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== - -"@webassemblyjs/wasm-edit@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" - integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.12.1" - "@webassemblyjs/wasm-gen" "1.12.1" - "@webassemblyjs/wasm-opt" "1.12.1" - "@webassemblyjs/wasm-parser" "1.12.1" - "@webassemblyjs/wast-printer" "1.12.1" - -"@webassemblyjs/wasm-gen@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" - integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wasm-opt@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" - integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/wasm-gen" "1.12.1" - "@webassemblyjs/wasm-parser" "1.12.1" - -"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" - integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-api-error" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wast-printer@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" - integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.0.tgz#b59b33377b1b896a9a7357cfc643b39c1524b1e6" - integrity sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w== - -"@webpack-cli/info@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" - integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== - -"@webpack-cli/serve@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.4.tgz#3982ee6f8b42845437fc4d391e93ac5d9da52f0f" - integrity sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-import-attributes@^1.9.5: - version "1.9.5" - resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" - integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn-walk@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2: - version "8.12.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" - integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv-keywords@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.0, ajv@^8.9.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-regex@^6.0.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1" - integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^6.1.0: - version "6.2.3" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041" - integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg== - -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== - -anymatch@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -arg@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" - integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== - dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== - -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -array-includes@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" - integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - get-intrinsic "^1.1.3" - is-string "^1.0.7" - -array.prototype.flat@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" - integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - -array.prototype.flatmap@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" - integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - -async@~3.2.3: - version "3.2.5" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -autocompleter@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/autocompleter/-/autocompleter-9.1.0.tgz#c7248a8cc0c58376d0969734c40e29626d950f04" - integrity sha512-dwAYJTaLHj1MpzCZXFg8WLmk+tgQ85OEDFfBegGnA+uVUZyzW/PZAdjSXR3fOt0+q8ZeEfMDiHDqw60uoF1NDg== - -autoprefixer@^10.4.14: - version "10.4.14" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" - integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== - dependencies: - browserslist "^4.21.5" - caniuse-lite "^1.0.30001464" - fraction.js "^4.2.0" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - -axios@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979" - integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg== - dependencies: - follow-redirects "^1.15.6" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - -babel-eslint@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" - integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - eslint-visitor-keys "^1.0.0" - resolve "^1.12.0" - -babel-loader@9.1.2: - version "9.1.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c" - integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA== - dependencies: - find-cache-dir "^3.3.2" - schema-utils "^4.0.0" - -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - -babel-plugin-macros@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" - integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg== - dependencies: - "@babel/runtime" "^7.12.5" - cosmiconfig "^7.0.0" - resolve "^1.19.0" - -babel-plugin-polyfill-corejs2@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" - integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.3" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" - integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - core-js-compat "^3.25.1" - -babel-plugin-polyfill-regenerator@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" - integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== - dependencies: - bytes "3.1.2" - content-type "~1.0.5" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.2" - type-is "~1.6.18" - unpipe "1.0.0" - -bonjour-service@^1.0.11: - version "1.1.1" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" - integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== - dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.5" - -boolbase@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7" - integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2, braces@^3.0.3, braces@~3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" - integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== - dependencies: - fill-range "^7.1.1" - -browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: - version "4.23.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== - dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" - node-releases "^2.0.18" - update-browserslist-db "^1.1.0" - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -builtins@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" - integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== - dependencies: - semver "^7.0.0" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase-css@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" - integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== - -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464: - version "1.0.30001488" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz#d19d7b6e913afae3e98f023db97c19e9ddc5e91f" - integrity sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ== - -caniuse-lite@^1.0.30001646: - version "1.0.30001655" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f" - integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg== - -canvas-confetti@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/canvas-confetti/-/canvas-confetti-1.6.0.tgz#193f71aa8f38fc850a5ba94f59091a7afdb43ead" - integrity sha512-ej+w/m8Jzpv9Z7W7uJZer14Ke8P2ogsjg4ZMGIuq4iqUOqY2Jq8BNW42iGmNfRwREaaEfFIczLuZZiEVSYNHAA== - -chalk@^2.0.0, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0, chalk@^4.0.0, chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chokidar@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" - integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -ci-info@^3.2.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -codemirror@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-6.0.2.tgz#4d3fea1ad60b6753f97ca835f2f48c6936a8946e" - integrity sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw== - dependencies: - "@codemirror/autocomplete" "^6.0.0" - "@codemirror/commands" "^6.0.0" - "@codemirror/language" "^6.0.0" - "@codemirror/lint" "^6.0.0" - "@codemirror/search" "^6.0.0" - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colord@^2.9, colord@^2.9.1: - version "2.9.3" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" - integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== - -colorette@^2.0.10, colorette@^2.0.14: - version "2.0.20" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" - integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" - integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== - -complex.js@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.1.1.tgz#0675dac8e464ec431fb2ab7d30f41d889fb25c31" - integrity sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression-webpack-plugin@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-10.0.0.tgz#3496af1b0dc792e13efc474498838dbff915c823" - integrity sha512-wLXLIBwpul/ALcm7Aj+69X0pYT3BYt6DdPn3qrgBIh9YejV9Bju9ShhlAsjujLyWMo6SAweFIWaUoFmXZNuNrg== - dependencies: - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -connect-history-api-fallback@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" - integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== - -console-polyfill@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/console-polyfill/-/console-polyfill-0.3.0.tgz#84900902a18c47a5eba932be75fa44d23e8af861" - integrity sha512-w+JSDZS7XML43Xnwo2x5O5vxB0ID7T5BdqDtyqT6uiCAX2kZAgcWxNaGqT97tZfSHzfOcvrfsDAodKcJ3UvnXQ== - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4, content-type@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - -convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== - -cookie@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== - -core-js-compat@^3.25.1: - version "3.30.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.2.tgz#83f136e375babdb8c80ad3c22d67c69098c1dd8b" - integrity sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA== - dependencies: - browserslist "^4.21.5" - -core-js@^3.8.3: - version "3.39.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83" - integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cosmiconfig@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" - integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -cosmiconfig@^8.1.3: - version "8.1.3" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" - integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== - dependencies: - import-fresh "^3.2.1" - js-yaml "^4.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" - -crelt@^1.0.5, crelt@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72" - integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g== - -cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -cross-spawn@^7.0.6: - version "7.0.6" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" - integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -css-declaration-sorter@^6.3.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" - integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== - -css-loader@^6.7.3: - version "6.7.4" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.4.tgz#a5d8ec28a73f3e0823998cfee2a1f7e564b91f9b" - integrity sha512-0Y5uHtK5BswfaGJ+jrO+4pPg1msFBc0pwPIE1VqfpmVn6YbDfYfXMj8rfd7nt+4goAhJueO+H/I40VWJfcP1mQ== - dependencies: - icss-utils "^5.1.0" - postcss "^8.4.21" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.1" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.8" - -css-minimizer-webpack-plugin@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-5.0.0.tgz#a2c2d1bc5cc37450519e873e13d942bbe4478ef5" - integrity sha512-1wZ/PYvg+ZKwi5FX6YrvbB31jMAdurS+CmRQLwWCVSlfzJC85l/a6RVICqUHFa+jXyhilfnCyjafzJGbmz5tcA== - dependencies: - cssnano "^6.0.0" - jest-worker "^29.4.3" - postcss "^8.4.21" - schema-utils "^4.0.0" - serialize-javascript "^6.0.1" - source-map "^0.6.1" - -css-select@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" - integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== - dependencies: - boolbase "^1.0.0" - css-what "^6.1.0" - domhandler "^5.0.2" - domutils "^3.0.1" - nth-check "^2.0.1" - -css-selector-tokenizer@^0.8: - version "0.8.0" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz#88267ef6238e64f2215ea2764b3e2cf498b845dd" - integrity sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg== - dependencies: - cssesc "^3.0.0" - fastparse "^1.1.2" - -css-tree@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" - integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== - dependencies: - mdn-data "2.0.30" - source-map-js "^1.0.1" - -css-tree@~2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032" - integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA== - dependencies: - mdn-data "2.0.28" - source-map-js "^1.0.1" - -css-what@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" - integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== - -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - -cssnano-preset-default@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz#2a93247140d214ddb9f46bc6a3562fa9177fe301" - integrity sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ== - dependencies: - css-declaration-sorter "^6.3.1" - cssnano-utils "^4.0.0" - postcss-calc "^9.0.0" - postcss-colormin "^6.0.0" - postcss-convert-values "^6.0.0" - postcss-discard-comments "^6.0.0" - postcss-discard-duplicates "^6.0.0" - postcss-discard-empty "^6.0.0" - postcss-discard-overridden "^6.0.0" - postcss-merge-longhand "^6.0.0" - postcss-merge-rules "^6.0.1" - postcss-minify-font-values "^6.0.0" - postcss-minify-gradients "^6.0.0" - postcss-minify-params "^6.0.0" - postcss-minify-selectors "^6.0.0" - postcss-normalize-charset "^6.0.0" - postcss-normalize-display-values "^6.0.0" - postcss-normalize-positions "^6.0.0" - postcss-normalize-repeat-style "^6.0.0" - postcss-normalize-string "^6.0.0" - postcss-normalize-timing-functions "^6.0.0" - postcss-normalize-unicode "^6.0.0" - postcss-normalize-url "^6.0.0" - postcss-normalize-whitespace "^6.0.0" - postcss-ordered-values "^6.0.0" - postcss-reduce-initial "^6.0.0" - postcss-reduce-transforms "^6.0.0" - postcss-svgo "^6.0.0" - postcss-unique-selectors "^6.0.0" - -cssnano-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.0.tgz#d1da885ec04003ab19505ff0e62e029708d36b08" - integrity sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw== - -cssnano@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.1.tgz#87c38c4cd47049c735ab756d7e77ac3ca855c008" - integrity sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg== - dependencies: - cssnano-preset-default "^6.0.1" - lilconfig "^2.1.0" - -csso@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6" - integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ== - dependencies: - css-tree "~2.2.0" - -csstype@^3.1.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" - integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== - -csstype@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" - integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== - -daisyui@^3.9.4: - version "3.9.4" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-3.9.4.tgz#84209bfce115505d7b502f7362b8ced6bb3a6cc5" - integrity sha512-fvi2RGH4YV617/6DntOVGcOugOPym9jTGWW2XySb5ZpvdWO4L7bEG77VHirrnbRUEWvIEVXkBpxUz2KFj0rVnA== - dependencies: - colord "^2.9" - css-selector-tokenizer "^0.8" - postcss "^8" - postcss-js "^4" - tailwindcss "^3.1" - -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^4.3.1: - version "4.3.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" - integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== - dependencies: - ms "2.1.2" - -decache@^3.0.5: - version "3.1.0" - resolved "https://registry.yarnpkg.com/decache/-/decache-3.1.0.tgz#4f5036fbd6581fcc97237ac3954a244b9536c2da" - integrity sha512-p7D6wJ5EJFFq1CcF2lu1XeqKFLBob8jRQGNAvFLTsV3CbSKBl3VtliAVlUIGz2i9H6kEFnI2Amaft5ZopIG2Fw== - dependencies: - find "^0.2.4" - -decimal.js@^10.4.3: - version "10.4.3" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== - -deep-is@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -deepmerge@^4.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" - integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== - dependencies: - execa "^5.0.0" - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - -define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -depd@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -diacritics@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz#3efa87323ebb863e6696cebb0082d48ff3d6f7a1" - integrity sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA== - -didyoumean@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" - integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== - -dlv@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" - integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - -dns-packet@^5.2.2: - version "5.6.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" - integrity sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -dom-serializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" - integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - entities "^4.2.0" - -domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - -domhandler@^5.0.2, domhandler@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - -domutils@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" - integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== - dependencies: - dom-serializer "^2.0.0" - domelementtype "^2.3.0" - domhandler "^5.0.3" - -driver.js@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/driver.js/-/driver.js-1.3.5.tgz#70695fd2b3b15a3db409c8a37d9b3a563a7c176a" - integrity sha512-exkp49hXuujvTOZ3zYgySWRlEAa8/3nA8glYjtuZjmkTdsQITXivBsW1ytyhKQx3WkeYaovlnvVcLbtTaN86kA== - -duplexer@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -eastasianwidth@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" - integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -electron-to-chromium@^1.5.4: - version "1.5.13" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" - integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - -enhanced-resolve@^5.17.1: - version "5.17.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" - integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -entities@^4.2.0, entities@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" - integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -error-stack-parser@^2.0.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" - integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== - dependencies: - stackframe "^1.3.4" - -es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.21.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" - integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== - dependencies: - array-buffer-byte-length "^1.0.0" - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.0" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.10" - is-weakref "^1.0.2" - object-inspect "^1.12.3" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.9" - -es-module-lexer@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527" - integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg== - -es-set-tostringtag@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" - integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== - dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" - has-tostringtag "^1.0.0" - -es-shim-unscopables@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" - integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== - dependencies: - has "^1.0.3" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -escalade@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" - integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - -escape-latex@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/escape-latex/-/escape-latex-1.2.0.tgz#07c03818cf7dac250cce517f4fda1b001ef2bca1" - integrity sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eslint-config-standard@^17.0.0: - version "17.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf" - integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg== - -eslint-import-resolver-node@^0.3.7: - version "0.3.7" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" - integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== - dependencies: - debug "^3.2.7" - is-core-module "^2.11.0" - resolve "^1.22.1" - -eslint-module-utils@^2.7.4: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== - dependencies: - debug "^3.2.7" - -eslint-plugin-es@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9" - integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ== - dependencies: - eslint-utils "^2.0.0" - regexpp "^3.0.0" - -eslint-plugin-import@^2.26.0: - version "2.27.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" - integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== - dependencies: - array-includes "^3.1.6" - array.prototype.flat "^1.3.1" - array.prototype.flatmap "^1.3.1" - debug "^3.2.7" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.7" - eslint-module-utils "^2.7.4" - has "^1.0.3" - is-core-module "^2.11.0" - is-glob "^4.0.3" - minimatch "^3.1.2" - object.values "^1.1.6" - resolve "^1.22.1" - semver "^6.3.0" - tsconfig-paths "^3.14.1" - -eslint-plugin-n@^15.7.0: - version "15.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz#e29221d8f5174f84d18f2eb94765f2eeea033b90" - integrity sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q== - dependencies: - builtins "^5.0.1" - eslint-plugin-es "^4.1.0" - eslint-utils "^3.0.0" - ignore "^5.1.1" - is-core-module "^2.11.0" - minimatch "^3.1.2" - resolve "^1.22.1" - semver "^7.3.8" - -eslint-plugin-promise@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816" - integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== - -eslint-plugin-vue@^9.12.0: - version "9.13.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.13.0.tgz#adb21448e65a7c1502af66103ff5f215632c5319" - integrity sha512-aBz9A8WB4wmpnVv0pYUt86cmH9EkcwWzgEwecBxMoRNhQjTL5i4sqadnwShv/hOdr8Hbl8XANGV7dtX9UQIAyA== - dependencies: - "@eslint-community/eslint-utils" "^4.3.0" - natural-compare "^1.4.0" - nth-check "^2.0.1" - postcss-selector-parser "^6.0.9" - semver "^7.3.5" - vue-eslint-parser "^9.3.0" - xml-name-validator "^4.0.0" - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-scope@^7.1.1, eslint-scope@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" - integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-utils@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - -eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" - integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== - -eslint@^8.40.0: - version "8.41.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c" - integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.3" - "@eslint/js" "8.41.0" - "@humanwhocodes/config-array" "^0.11.8" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.2.0" - eslint-visitor-keys "^3.4.1" - espree "^9.5.2" - esquery "^1.4.2" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - graphemer "^1.4.0" - ignore "^5.2.0" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.1" - strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" - text-table "^0.2.0" - -espree@^9.3.1, espree@^9.5.2: - version "9.5.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" - integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== - dependencies: - acorn "^8.8.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.1" - -esquery@^1.4.0, esquery@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" - integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -estree-walker@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" - integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== - -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -express@^4.17.3: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.2" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.6.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.2.0" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.11.0" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-glob@^3.3.2: - version "3.3.3" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" - integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.8" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fastest-levenshtein@^1.0.12: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - -fastparse@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" - integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== - -fastq@^1.6.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" - integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== - dependencies: - reusify "^1.0.4" - -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -fill-range@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" - integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - -find-cache-dir@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find@^0.2.4: - version "0.2.9" - resolved "https://registry.yarnpkg.com/find/-/find-0.2.9.tgz#4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c" - integrity sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ== - dependencies: - traverse-chain "~0.1.0" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flatted@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== - -follow-redirects@^1.0.0: - version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== - -follow-redirects@^1.15.6: - version "1.15.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" - integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== - -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - -foreground-child@^3.1.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f" - integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw== - dependencies: - cross-spawn "^7.0.6" - signal-exit "^4.0.1" - -form-data@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48" - integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fraction.js@4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.4.tgz#b2bac8249a610c3396106da97c5a71da75b94b1c" - integrity sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q== - -fraction.js@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" - integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== - -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" - -functions-have-names@^1.2.2, functions-have-names@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" - integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-proto "^1.0.1" - has-symbols "^1.0.3" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^10.3.10: - version "10.4.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" - integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== - dependencies: - foreground-child "^3.1.0" - jackspeak "^3.1.2" - minimatch "^9.0.4" - minipass "^7.1.2" - package-json-from-dist "^1.0.0" - path-scurry "^1.11.1" - -glob@^7.1.3: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globals@^13.19.0: - version "13.20.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" - integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== - dependencies: - type-fest "^0.20.2" - -globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - -graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -graphemer@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" - integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== - -gzip-size@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" - integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== - dependencies: - duplexer "^0.1.2" - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== - -has-symbols@^1.0.2, has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hash-sum@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" - integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== - -hasown@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== - dependencies: - function-bind "^1.1.2" - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== - -htmlparser2@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" - integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.3" - domutils "^3.0.1" - entities "^4.4.0" - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== - -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" - integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== - -http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -i18n-iso-countries@^6.7.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/i18n-iso-countries/-/i18n-iso-countries-6.8.0.tgz#eebbc75594c6832aff86176c1bb38daa133d6dfd" - integrity sha512-jJs/+CA6+VUICFxqGcB0vFMERGfhfvyNk+8Vb9EagSZkl7kSpm/kT0VyhvzM/zixDWEV/+oN9L7v/GT9BwzoGg== - dependencies: - diacritics "1.3.0" - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -ignore@^5.1.1, ignore@^5.2.0: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== - -immutable@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" - integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg== - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - -internal-slot@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" - integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== - dependencies: - get-intrinsic "^1.2.0" - has "^1.0.3" - side-channel "^1.0.4" - -interpret@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" - integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== - -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" - integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== - -is-core-module@^2.11.0: - version "2.12.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" - integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== - dependencies: - has "^1.0.3" - -is-core-module@^2.16.0: - version "2.16.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" - integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== - dependencies: - hasown "^2.0.2" - -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typed-array@^1.1.10, is-typed-array@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" - integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== - dependencies: - call-bind "^1.0.2" - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -jackspeak@^3.1.2: - version "3.4.3" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a" - integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - -javascript-natural-sort@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" - integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== - -jest-util@^29.5.0: - version "29.5.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" - integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== - dependencies: - "@jest/types" "^29.5.0" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jest-worker@^29.4.3: - version "29.5.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" - integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA== - dependencies: - "@types/node" "*" - jest-util "^29.5.0" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jiti@^1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" - integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== - -jiti@^1.21.0: - version "1.21.0" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" - integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== - -jiti@^1.21.6: - version "1.21.7" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9" - integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -jsencrypt@3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsencrypt/-/jsencrypt-3.2.1.tgz#09766983cc760088ff26b12fe7e574252af97727" - integrity sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA== - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== - -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -json-stringify-safe@~5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - -json5@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== - dependencies: - minimist "^1.2.0" - -json5@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" - integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -klona@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" - integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== - -launch-editor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" - integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== - dependencies: - picocolors "^1.0.0" - shell-quote "^1.7.3" - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -lilconfig@^2.0.5, lilconfig@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - -lilconfig@^3.0.0, lilconfig@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4" - integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw== - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lockfile@^1.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" - integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA== - dependencies: - signal-exit "^3.0.2" - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== - -lodash.defaultsdeep@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" - integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== - -lodash.get@^4.0: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== - -lodash.has@^4.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" - integrity sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g== - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== - -lodash@^4.17.20, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -lru-cache@^10.2.0: - version "10.4.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" - integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lru-cache@~2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" - integrity sha512-Q5pAgXs+WEAfoEdw2qKQhNFFhMoFMTYqRVKKUMnzuiR7oKFHS7fWo848cPcTKw+4j/IdN17NyzdhVKgabFV0EA== - -magic-string@^0.30.0: - version "0.30.0" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529" - integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ== - dependencies: - "@jridgewell/sourcemap-codec" "^1.4.13" - -make-dir@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -mathjs@^12.4.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-12.4.0.tgz#875c2ec19e5be69885b29769f78bbb37220322b6" - integrity sha512-4Moy0RNjwMSajEkGGxNUyMMC/CZAcl87WBopvNsJWB4E4EFebpTedr+0/rhqmnOSTH3Wu/3WfiWiw6mqiaHxVw== - dependencies: - "@babel/runtime" "^7.23.9" - complex.js "^2.1.1" - decimal.js "^10.4.3" - escape-latex "^1.2.0" - fraction.js "4.3.4" - javascript-natural-sort "^0.7.1" - seedrandom "^3.0.5" - tiny-emitter "^2.1.0" - typed-function "^4.1.1" - -mdn-data@2.0.28: - version "2.0.28" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba" - integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g== - -mdn-data@2.0.30: - version "2.0.30" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" - integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - -memfs@^3.4.3: - version "3.5.1" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.5.1.tgz#f0cd1e2bfaef58f6fe09bfb9c2288f07fea099ec" - integrity sha512-UWbFJKvj5k+nETdteFndTpYxdeTMox/ULeqX5k/dpaQJCCFmj5EeKv3dBcyO2xmkRAx2vppRu5dVG7SOtsGOzA== - dependencies: - fs-monkey "^1.0.3" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== - -micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -micromatch@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" - integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== - dependencies: - braces "^3.0.3" - picomatch "^2.3.1" - -mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mini-css-extract-plugin@^2.7.5: - version "2.7.6" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d" - integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw== - dependencies: - schema-utils "^4.0.0" - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^9.0.4: - version "9.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" - integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== - dependencies: - brace-expansion "^2.0.1" - -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" - integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== - -mrmime@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" - integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multicast-dns@^7.2.5: - version "7.2.5" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" - integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== - dependencies: - dns-packet "^5.2.2" - thunky "^1.0.2" - -mz@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" - -nanoid@^3.3.11: - version "3.3.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" - integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== - -nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== - -nanoid@^3.3.7: - version "3.3.8" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" - integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -node-forge@^1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - -node-releases@^2.0.18: - version "2.0.18" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" - integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -nth-check@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" - integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== - dependencies: - boolbase "^1.0.0" - -object-assign@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-hash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" - integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== - -object-inspect@^1.12.3, object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== - -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.0, object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - has-symbols "^1.0.3" - object-keys "^1.1.1" - -object.values@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" - integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -open@^8.0.9: - version "8.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" - integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -opener@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" - integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -package-json-from-dist@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505" - integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-complete-extname@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz#f889985dc91000c815515c0bfed06c5acda0752b" - integrity sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-scurry@^1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" - integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== - dependencies: - lru-cache "^10.2.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== - -picocolors@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" - integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== - -pirates@^4.0.1: - version "4.0.5" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" - integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== - -pkg-dir@^4.1.0, pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -postcss-calc@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6" - integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ== - dependencies: - postcss-selector-parser "^6.0.11" - postcss-value-parser "^4.2.0" - -postcss-colormin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.0.tgz#d4250652e952e1c0aca70c66942da93d3cdeaafe" - integrity sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - colord "^2.9.1" - postcss-value-parser "^4.2.0" - -postcss-convert-values@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz#ec94a954957e5c3f78f0e8f65dfcda95280b8996" - integrity sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-discard-comments@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz#9ca335e8b68919f301b24ba47dde226a42e535fe" - integrity sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw== - -postcss-discard-duplicates@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz#c26177a6c33070922e67e9a92c0fd23d443d1355" - integrity sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA== - -postcss-discard-empty@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz#06c1c4fce09e22d2a99e667c8550eb8a3a1b9aee" - integrity sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ== - -postcss-discard-overridden@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz#49c5262db14e975e349692d9024442de7cd8e234" - integrity sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw== - -postcss-import@^15.1.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70" - integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew== - dependencies: - postcss-value-parser "^4.0.0" - read-cache "^1.0.0" - resolve "^1.1.7" - -postcss-js@^4, postcss-js@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2" - integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw== - dependencies: - camelcase-css "^2.0.1" - -postcss-load-config@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd" - integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA== - dependencies: - lilconfig "^2.0.5" - yaml "^2.1.1" - -postcss-load-config@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3" - integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ== - dependencies: - lilconfig "^3.0.0" - yaml "^2.3.4" - -postcss-loader@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.0.tgz#05991c1e490d8ff86ef18358d87db3b5b2dcb5f5" - integrity sha512-qLAFjvR2BFNz1H930P7mj1iuWJFjGey/nVhimfOAAQ1ZyPpcClAxP8+A55Sl8mBvM+K2a9Pjgdj10KpANWrNfw== - dependencies: - cosmiconfig "^8.1.3" - jiti "^1.18.2" - klona "^2.0.6" - semver "^7.3.8" - -postcss-merge-longhand@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz#6f627b27db939bce316eaa97e22400267e798d69" - integrity sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg== - dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^6.0.0" - -postcss-merge-rules@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz#39f165746404e646c0f5c510222ccde4824a86aa" - integrity sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - cssnano-utils "^4.0.0" - postcss-selector-parser "^6.0.5" - -postcss-minify-font-values@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz#68d4a028f9fa5f61701974724b2cc9445d8e6070" - integrity sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-minify-gradients@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz#22b5c88cc63091dadbad34e31ff958404d51d679" - integrity sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA== - dependencies: - colord "^2.9.1" - cssnano-utils "^4.0.0" - postcss-value-parser "^4.2.0" - -postcss-minify-params@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz#2b3a85a9e3b990d7a16866f430f5fd1d5961b539" - integrity sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ== - dependencies: - browserslist "^4.21.4" - cssnano-utils "^4.0.0" - postcss-value-parser "^4.2.0" - -postcss-minify-selectors@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz#5046c5e8680a586e5a0cad52cc9aa36d6be5bda2" - integrity sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.1.tgz#7beae6bb99ee5bfe1d8273b0d47a3463209e5cef" - integrity sha512-Zr/dB+IlXaEqdoslLHhhqecwj73vc3rDmOpsBNBEVk7P2aqAlz+Ijy0fFbU5Ie9PtreDOIgGa9MsLWakVGl+fA== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-nested@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" - integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== - dependencies: - postcss-selector-parser "^6.0.11" - -postcss-nested@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131" - integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ== - dependencies: - postcss-selector-parser "^6.1.1" - -postcss-normalize-charset@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz#36cc12457259064969fb96f84df491652a4b0975" - integrity sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ== - -postcss-normalize-display-values@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz#8d2961415078644d8c6bbbdaf9a2fdd60f546cd4" - integrity sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-positions@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz#25b96df99a69f8925f730eaee0be74416865e301" - integrity sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-repeat-style@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz#ddf30ad8762feb5b1eb97f39f251acd7b8353299" - integrity sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-string@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz#948282647a51e409d69dde7910f0ac2ff97cb5d8" - integrity sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-timing-functions@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz#5f13e650b8c43351989fc5de694525cc2539841c" - integrity sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-unicode@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz#741b3310f874616bdcf07764f5503695d3604730" - integrity sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg== - dependencies: - browserslist "^4.21.4" - postcss-value-parser "^4.2.0" - -postcss-normalize-url@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz#d0a31e962a16401fb7deb7754b397a323fb650b4" - integrity sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-normalize-whitespace@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz#accb961caa42e25ca4179b60855b79b1f7129d4d" - integrity sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-ordered-values@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz#374704cdff25560d44061d17ba3c6308837a3218" - integrity sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg== - dependencies: - cssnano-utils "^4.0.0" - postcss-value-parser "^4.2.0" - -postcss-reduce-initial@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz#7d16e83e60e27e2fa42f56ec0b426f1da332eca7" - integrity sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA== - dependencies: - browserslist "^4.21.4" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz#28ff2601a6d9b96a2f039b3501526e1f4d584a46" - integrity sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w== - dependencies: - postcss-value-parser "^4.2.0" - -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: - version "6.0.13" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" - integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de" - integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-svgo@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.0.tgz#7b18742d38d4505a0455bbe70d52b49f00eaf69d" - integrity sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw== - dependencies: - postcss-value-parser "^4.2.0" - svgo "^3.0.2" - -postcss-unique-selectors@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz#c94e9b0f7bffb1203894e42294b5a1b3fb34fbe1" - integrity sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw== - dependencies: - postcss-selector-parser "^6.0.5" - -postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== - -postcss@^8, postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.31: - version "8.4.31" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" - integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== - dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postcss@^8.4.14: - version "8.4.49" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" - integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA== - dependencies: - nanoid "^3.3.7" - picocolors "^1.1.1" - source-map-js "^1.2.1" - -postcss@^8.4.47: - version "8.5.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c" - integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg== - dependencies: - nanoid "^3.3.11" - picocolors "^1.1.1" - source-map-js "^1.2.1" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -"prettier@^1.18.2 || ^2.0.0": - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - -punycode@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== - -qr-creator@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/qr-creator/-/qr-creator-1.0.0.tgz#f350a8f0b5be02bd1fc1ef133a038a06ef8bc5ef" - integrity sha512-C0cqfbS1P5hfqN4NhsYsUXePlk9BO+a45bAQ3xLYjBL3bOIFzoVEjs79Fado9u9BPBD3buHi3+vY+C8tHh4qMQ== - -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" - integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== - dependencies: - pify "^2.3.0" - -readable-stream@^2.0.1: - version "2.3.8" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" - integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.6: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -rechoir@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" - integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== - dependencies: - resolve "^1.20.0" - -regenerate-unicode-properties@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" - integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== - dependencies: - regenerate "^1.4.2" - -regenerate@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - -regenerator-runtime@^0.14.0: - version "0.14.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" - integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== - -regenerator-transform@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" - integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== - dependencies: - "@babel/runtime" "^7.8.4" - -regexp.prototype.flags@^1.4.3: - version "1.5.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" - integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - functions-have-names "^1.2.3" - -regexpp@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -regexpu-core@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" - integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== - dependencies: - "@babel/regjsgen" "^0.8.0" - regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsparser "^0.9.1" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.1.0" - -regjsparser@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" - integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== - dependencies: - jsesc "~0.5.0" - -request-ip@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-3.3.0.tgz#863451e8fec03847d44f223e30a5d63e369fa611" - integrity sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.2: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== - dependencies: - is-core-module "^2.11.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.22.8: - version "1.22.10" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" - integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== - dependencies: - is-core-module "^2.16.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rollbar@^2.26.4: - version "2.26.4" - resolved "https://registry.yarnpkg.com/rollbar/-/rollbar-2.26.4.tgz#05e47d3b1f52ab6da9f88710ec66371a76cdc3c9" - integrity sha512-JKmrj6riYm9ZPJisgxljgH4uCsvjMHDHXrinDF7aAFaP+eoF51HomVPtLcDTYLsrJ568aKVNLUhedFajONBwSg== - dependencies: - async "~3.2.3" - console-polyfill "0.3.0" - error-stack-parser "^2.0.4" - json-stringify-safe "~5.0.0" - lru-cache "~2.2.1" - request-ip "~3.3.0" - source-map "^0.5.7" - optionalDependencies: - decache "^3.0.5" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - is-regex "^1.1.4" - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sass-loader@^13.2.2: - version "13.2.2" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.2.tgz#f97e803993b24012c10d7ba9676548bf7a6b18b9" - integrity sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA== - dependencies: - klona "^2.0.6" - neo-async "^2.6.2" - -sass@^1.62.1: - version "1.62.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029" - integrity sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - -schema-utils@^3.0, schema-utils@^3.1.1, schema-utils@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" - integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.1.tgz#eb2d042df8b01f4b5c276a2dfd41ba0faab72e8d" - integrity sha512-lELhBAAly9NowEsX0yZBlw9ahZG+sK/1RJ21EpzdYHKEs13Vku3LJ+MIPhh4sMs0oCCeufZQEQbMekiA4vuVIQ== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.9.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.1.0" - -seedrandom@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" - integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== - -selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== - dependencies: - node-forge "^1" - -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8: - version "7.5.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" - integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== - dependencies: - lru-cache "^6.0.0" - -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -serialize-error@^9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-9.1.1.tgz#b66744b6287b538996a153103e67af7179d0831a" - integrity sha512-6uZQLGyUkNA4N+Zii9fYukmNu9PEA1F5rqcwXzN/3LtBjwl2dFBbVZ1Zyn08/CGkB4H440PIemdOQBt1Wvjbrg== - dependencies: - type-fest "^2.5.3" - -serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.18.0" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shakapacker@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-8.0.0.tgz#f29537c19078af7318758c92e7a1bca4cee96bdd" - integrity sha512-HCdpITzIKXzGEyUWQhKzPbpwwOsgTamaPH+0kXdhM59VQxZ3NWnT5cL3DlJdAT3sGsWCJskEl3eMkQlnh9DjhA== - dependencies: - js-yaml "^4.1.0" - path-complete-extname "^1.0.0" - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shell-quote@^1.7.3: - version "1.8.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" - integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -signal-exit@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" - integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== - -signature_pad@^4.1.4: - version "4.2.0" - resolved "https://registry.yarnpkg.com/signature_pad/-/signature_pad-4.2.0.tgz#7513cee8cb8afd6594d871c61cf4d61420601422" - integrity sha512-YLWysmaUBaC5wosAKkgbX7XI+LBv2w5L0QUcI6Jc4moHYzv9BUBJtAyNLpWzHjtjKTeWOH6bfP4a4pzf0UinfQ== - -signature_pad@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/signature_pad/-/signature_pad-4.1.5.tgz#d2ff3e9b21b479f46ae145e98e973b7928f9a22d" - integrity sha512-VOE846UbQMeLBbcR08KwjwE1wNLgp3gqC7yr/AELkgSMs/BdRpxIZna6K5XyZJpA7IWq9GiInw1C8PLm57VO6Q== - -sirv@^1.0.7: - version "1.0.19" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" - integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== - dependencies: - "@polka/url" "^1.0.0-next.20" - mrmime "^1.0.0" - totalist "^1.0.0" - -snarkdown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/snarkdown/-/snarkdown-2.0.0.tgz#b1feb4db91b9f94a8ebbd7a50f3e99aee18b1e03" - integrity sha512-MgL/7k/AZdXCTJiNgrO7chgDqaB9FGM/1Tvlcenenb7div6obaDATzs16JhFyHHBGodHT3B7RzRc5qk8pFhg3A== - -sockjs@^0.3.24: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-js@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" - integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== - -source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - -source-map@^0.6.0, source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -stackframe@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" - integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== - -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^5.0.1, string-width@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== - dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" - -string.prototype.trim@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string.prototype.trimstart@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" - integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^7.0.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba" - integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA== - dependencies: - ansi-regex "^6.0.1" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -style-mod@^4.0.0, style-mod@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67" - integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw== - -stylehacks@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.0.tgz#9fdd7c217660dae0f62e14d51c89f6c01b3cb738" - integrity sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw== - dependencies: - browserslist "^4.21.4" - postcss-selector-parser "^6.0.4" - -sucrase@^3.32.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.32.0.tgz#c4a95e0f1e18b6847127258a75cf360bc568d4a7" - integrity sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ== - dependencies: - "@jridgewell/gen-mapping" "^0.3.2" - commander "^4.0.0" - glob "7.1.6" - lines-and-columns "^1.1.6" - mz "^2.7.0" - pirates "^4.0.1" - ts-interface-checker "^0.1.9" - -sucrase@^3.35.0: - version "3.35.0" - resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263" - integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA== - dependencies: - "@jridgewell/gen-mapping" "^0.3.2" - commander "^4.0.0" - glob "^10.3.10" - lines-and-columns "^1.1.6" - mz "^2.7.0" - pirates "^4.0.1" - ts-interface-checker "^0.1.9" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -svgo@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a" - integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^5.1.0" - css-tree "^2.2.1" - csso "^5.0.5" - picocolors "^1.0.0" - -tailwindcss@^3.1: - version "3.4.3" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519" - integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A== - dependencies: - "@alloc/quick-lru" "^5.2.0" - arg "^5.0.2" - chokidar "^3.5.3" - didyoumean "^1.2.2" - dlv "^1.1.3" - fast-glob "^3.3.0" - glob-parent "^6.0.2" - is-glob "^4.0.3" - jiti "^1.21.0" - lilconfig "^2.1.0" - micromatch "^4.0.5" - normalize-path "^3.0.0" - object-hash "^3.0.0" - picocolors "^1.0.0" - postcss "^8.4.23" - postcss-import "^15.1.0" - postcss-js "^4.0.1" - postcss-load-config "^4.0.1" - postcss-nested "^6.0.1" - postcss-selector-parser "^6.0.11" - resolve "^1.22.2" - sucrase "^3.32.0" - -tailwindcss@^3.4.17: - version "3.4.17" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.17.tgz#ae8406c0f96696a631c790768ff319d46d5e5a63" - integrity sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og== - dependencies: - "@alloc/quick-lru" "^5.2.0" - arg "^5.0.2" - chokidar "^3.6.0" - didyoumean "^1.2.2" - dlv "^1.1.3" - fast-glob "^3.3.2" - glob-parent "^6.0.2" - is-glob "^4.0.3" - jiti "^1.21.6" - lilconfig "^3.1.3" - micromatch "^4.0.8" - normalize-path "^3.0.0" - object-hash "^3.0.0" - picocolors "^1.1.1" - postcss "^8.4.47" - postcss-import "^15.1.0" - postcss-js "^4.0.1" - postcss-load-config "^4.0.2" - postcss-nested "^6.2.0" - postcss-selector-parser "^6.1.2" - resolve "^1.22.8" - sucrase "^3.35.0" - -tapable@^2.0, tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -terser-webpack-plugin@5.3.8: - version "5.3.8" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.8.tgz#415e03d2508f7de63d59eca85c5d102838f06610" - integrity sha512-WiHL3ElchZMsK27P8uIUh4604IgJyAW47LVXGbEoB21DbQcZ+OuMpGjVYnEUaqcWM6dO8uS2qUbA7LSCWqvsbg== - dependencies: - "@jridgewell/trace-mapping" "^0.3.17" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.16.8" - -terser-webpack-plugin@^5.3.10: - version "5.3.10" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" - integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== - dependencies: - "@jridgewell/trace-mapping" "^0.3.20" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.26.0" - -terser@^5.16.8: - version "5.17.4" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.4.tgz#b0c2d94897dfeba43213ed5f90ed117270a2c696" - integrity sha512-jcEKZw6UPrgugz/0Tuk/PVyLAPfMBJf5clnGueo45wTweoV8yh7Q7PEkhkJ5uuUbC7zAxEcG3tqNr1bstkQ8nw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -terser@^5.26.0: - version "5.31.6" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1" - integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg== - dependencies: - "@jridgewell/source-map" "^0.3.3" - acorn "^8.8.2" - commander "^2.20.0" - source-map-support "~0.5.20" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.1" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" - integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== - dependencies: - any-promise "^1.0.0" - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -tiny-emitter@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - -totalist@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" - integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== - -traverse-chain@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/traverse-chain/-/traverse-chain-0.1.0.tgz#61dbc2d53b69ff6091a12a168fd7d433107e40f1" - integrity sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg== - -ts-interface-checker@^0.1.9: - version "0.1.13" - resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" - integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== - -tsconfig-paths@^3.14.1: - version "3.14.2" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" - integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.2" - minimist "^1.2.6" - strip-bom "^3.0.0" - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^2.5.3: - version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" - integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== - -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - is-typed-array "^1.1.9" - -typed-function@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-4.1.1.tgz#38ce3cae31f4f513bcb263563fdad27b2afa73e8" - integrity sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ== - -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" - -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== - -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== - dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" - -unicode-match-property-value-ecmascript@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" - integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== - -unicode-property-aliases-ecmascript@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" - integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - -update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== - dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -uuid@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" - integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - -vue-custom-element@^3.2.14: - version "3.3.0" - resolved "https://registry.yarnpkg.com/vue-custom-element/-/vue-custom-element-3.3.0.tgz#c20bb6108a16d1f7df3c550125551bf53d0e5a75" - integrity sha512-ePuy1EDDJd9/piwXLwsCyMQ964HsdhXPzypM9OX0r4JBa20EVN28U7RXeTWwXkoFKim/b3sP7xT2NEM0Di6tUQ== - -vue-eslint-parser@^9.3.0: - version "9.3.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.3.0.tgz#775a974a0603c9a73d85fed8958ed9e814a4a816" - integrity sha512-48IxT9d0+wArT1+3wNIy0tascRoywqSUe2E1YalIC1L8jsUGe5aJQItWfRok7DVFGz3UYvzEI7n5wiTXsCMAcQ== - dependencies: - debug "^4.3.4" - eslint-scope "^7.1.1" - eslint-visitor-keys "^3.3.0" - espree "^9.3.1" - esquery "^1.4.0" - lodash "^4.17.21" - semver "^7.3.6" - -vue-i18n@^8.23.0: - version "8.28.2" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840" - integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA== - -vue-loader@^17.1.1: - version "17.1.1" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-17.1.1.tgz#546c85eb844f98653921c02e8b0b060ebea19bfb" - integrity sha512-qpqEVkKdrAsgyIBMHaiXurDeCuBWqRyKqg2GI4aG3NbggEls+BLqTZdqahbJJh7fm83sz+iz3gg6eDWdbNlG7Q== - dependencies: - chalk "^4.1.0" - hash-sum "^2.0.0" - watchpack "^2.4.0" - -vue-select@^3.11.2: - version "3.20.3" - resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.20.3.tgz#559b0ba2780171e4eeda455ebce5f3ce708380eb" - integrity sha512-aDaq4rPBrDavh7NDLgAP8e0G8UNElh6vO3itGWjhf1y9KaGRWtFw21cUkSRHGgj0V5FlCG4EaRb1xdE/C9J+eg== - -vue@^2.6.14: - version "2.7.16" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9" - integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw== - dependencies: - "@vue/compiler-sfc" "2.7.16" - csstype "^3.1.0" - -vue@^3.3.2: - version "3.3.4" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6" - integrity sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw== - dependencies: - "@vue/compiler-dom" "3.3.4" - "@vue/compiler-sfc" "3.3.4" - "@vue/runtime-dom" "3.3.4" - "@vue/server-renderer" "3.3.4" - "@vue/shared" "3.3.4" - -w3c-keyname@^2.2.4: - version "2.2.8" - resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5" - integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ== - -watchpack@^2.4.0, watchpack@^2.4.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" - integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - dependencies: - minimalistic-assert "^1.0.0" - -webpack-assets-manifest@5: - version "5.1.0" - resolved "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-5.1.0.tgz#5af328f6c8fa760cb9a62af631a83da2b478b791" - integrity sha512-kPuTMEjBrqZQVJ5M6yXNBCEdFbQQn7p+loNXt8NOeDFaAbsNFWqqwR0YL1mfG5LbwhK5FLXWXpuK3GuIIZ46rg== - dependencies: - chalk "^4.0" - deepmerge "^4.0" - lockfile "^1.0" - lodash.get "^4.0" - lodash.has "^4.0" - schema-utils "^3.0" - tapable "^2.0" - -webpack-bundle-analyzer@^4.7.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04" - integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg== - dependencies: - "@discoveryjs/json-ext" "0.5.7" - acorn "^8.0.4" - acorn-walk "^8.0.0" - chalk "^4.1.0" - commander "^7.2.0" - gzip-size "^6.0.0" - lodash "^4.17.20" - opener "^1.5.2" - sirv "^1.0.7" - ws "^7.3.1" - -webpack-cli@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.1.tgz#c211ac6d911e77c512978f7132f0d735d4a97ace" - integrity sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.1.0" - "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.4" - colorette "^2.0.14" - commander "^10.0.1" - cross-spawn "^7.0.3" - envinfo "^7.7.3" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^3.1.1" - rechoir "^0.8.0" - webpack-merge "^5.7.3" - -webpack-dev-middleware@^5.3.1: - version "5.3.4" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" - integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== - dependencies: - colorette "^2.0.10" - memfs "^3.4.3" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -webpack-dev-server@^4.15.0: - version "4.15.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21" - integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - launch-editor "^2.6.0" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.13.0" - -webpack-merge@5, webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@5.94.0: - version "5.94.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" - integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== - dependencies: - "@types/estree" "^1.0.5" - "@webassemblyjs/ast" "^1.12.1" - "@webassemblyjs/wasm-edit" "^1.12.1" - "@webassemblyjs/wasm-parser" "^1.12.1" - acorn "^8.7.1" - acorn-import-attributes "^1.9.5" - browserslist "^4.21.10" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.1" - es-module-lexer "^1.2.1" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.11" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.2.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.3.10" - watchpack "^2.4.1" - webpack-sources "^3.2.3" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" - integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.10" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wildcard@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" - integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== - -word-wrap@^1.2.3: - version "1.2.5" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" - integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== - -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" - integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== - dependencies: - ansi-styles "^6.1.0" - string-width "^5.0.1" - strip-ansi "^7.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -ws@^7.3.1: - version "7.5.9" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" - integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== - -ws@^8.13.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== - -xml-name-validator@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" - integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== - -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yaml@^2.1.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" - integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== - -yaml@^2.3.4: - version "2.8.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz#1870aa02b631f7e8328b93f8bc574fac5d6c4d79" - integrity sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw== - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From d553ed920c8a7a65ab2a70e35e48cc5e9423247d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 00:23:13 +0000 Subject: [PATCH 2074/2279] monocle: 0.9.0 -> 0.9.1 --- pkgs/by-name/mo/monocle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/monocle/package.nix b/pkgs/by-name/mo/monocle/package.nix index aeee1e46833b..4225988bd176 100644 --- a/pkgs/by-name/mo/monocle/package.nix +++ b/pkgs/by-name/mo/monocle/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "monocle"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bgpkit"; repo = "monocle"; tag = "v${finalAttrs.version}"; - hash = "sha256-7p7asmCHKFAHElYuRKs6BPG7Al3J36sJEss+hDEVQRI="; + hash = "sha256-64oa3rmPR1PFmtGti1LVubO+2lY4VIkdMBKP6/IeyFk="; }; - cargoHash = "sha256-nGeAHIn076WkVnab7lUn4K1/TQ01Bgk/huxm12pzzkQ="; + cargoHash = "sha256-rSvq+aHI5u0W1RG3JQooljeDmxTHE9ywdPguHdV3T+c="; # require internet access checkFlags = [ From 9ae26d37780695759f0fe50db68c9279733a6905 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 7 Nov 2025 02:02:44 +0100 Subject: [PATCH 2075/2279] python3Packages.pyhanko: 0.25.3 -> 0.31.0 See https://docs.pyhanko.eu/en/latest/changelog.html#pyhanko for changelog, the passthru.testData is needed for the tests of both pyhanko itself and pyhanko-cli. --- .../python-modules/pyhanko/default.nix | 73 ++++++++++++++----- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index e1b626c7863e..5d91680adc2b 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -9,17 +9,14 @@ # dependencies asn1crypto, - click, cryptography, + lxml, pyhanko-certvalidator, pyyaml, - qrcode, requests, tzlocal, # optional-dependencies - oscrypto, - defusedxml, fonttools, uharfbuzz, pillow, @@ -27,6 +24,7 @@ python-pkcs11, aiohttp, xsdata, + qrcode, # tests certomancer, @@ -35,40 +33,44 @@ pytestCheckHook, python-pae, requests-mock, + signxml, }: buildPythonPackage rec { pname = "pyhanko"; - version = "0.25.3"; + version = "0.31.0"; pyproject = true; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; tag = "v${version}"; - hash = "sha256-HJkCQ5YDVr17gtY4PW89ep7GwFdP21/ruBEKm7j3+Qo="; + hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE="; }; + sourceRoot = "${src.name}/pkgs/pyhanko"; + + postPatch = '' + substituteInPlace src/pyhanko/version/__init__.py \ + --replace-fail "0.0.0.dev1" "${version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0.dev1" "${version}" + ''; + build-system = [ setuptools ]; - pythonRelaxDeps = [ - "cryptography" - ]; - dependencies = [ asn1crypto - click cryptography pyhanko-certvalidator pyyaml - qrcode requests tzlocal + lxml ]; optional-dependencies = { - extra-pubkey-algs = [ oscrypto ]; - xmp = [ defusedxml ]; opentype = [ fonttools uharfbuzz @@ -79,7 +81,11 @@ buildPythonPackage rec { ]; pkcs11 = [ python-pkcs11 ]; async-http = [ aiohttp ]; - etsi = [ xsdata ]; + etsi = [ + xsdata + signxml + ]; + qr = [ qrcode ]; }; nativeCheckInputs = [ @@ -90,16 +96,18 @@ buildPythonPackage rec { pytestCheckHook python-pae requests-mock + passthru.testData + signxml ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # ModuleNotFoundError: No module named 'csc_dummy' - "pyhanko_tests/test_csc.py" + "tests/test_csc.py" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: One or more parameters passed to a function were not valid. - "pyhanko_tests/cli_tests" + "tests/cli_tests" ]; disabledTests = [ @@ -126,6 +134,10 @@ buildPythonPackage rec { "test_ocsp_embed" "test_ts_fetch_aiohttp" "test_ts_fetch_requests" + + # https://github.com/MatthiasValvekens/pyHanko/pull/595 + "test_simple_text_stamp_on_page_with_leaky_graphics_state" + "test_simple_text_stamp_on_page_with_leaky_graphics_state_without_coord_correction" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # OSError: One or more parameters passed to a function were not valid. @@ -139,12 +151,33 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhanko" ]; + passthru = { + testData = buildPythonPackage { + pname = "common-test-utils"; + inherit version pyproject src; + + sourceRoot = "${src.name}/internal/common-test-utils"; + # Include the test pdf/xml files etc. in the build output + postPatch = '' + echo "graft src/test_data" > MANIFEST.in + ''; + + build-system = [ setuptools ]; + + dependencies = [ + certomancer + pyhanko-certvalidator + ]; + + pythonRemoveDeps = [ "pyhanko" ]; + }; + }; + meta = { description = "Sign and stamp PDF files"; - mainProgram = "pyhanko"; homepage = "https://github.com/MatthiasValvekens/pyHanko"; - changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/${src.tag}/docs/changelog.rst#pyhanko"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.antonmosich ]; }; } From 1833e4b2091c995154d6efd84c3705220403afd0 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 7 Nov 2025 02:03:26 +0100 Subject: [PATCH 2076/2279] pyhanko-cli: init at 0.2.0 --- pkgs/by-name/py/pyhanko-cli/package.nix | 66 +++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/py/pyhanko-cli/package.nix diff --git a/pkgs/by-name/py/pyhanko-cli/package.nix b/pkgs/by-name/py/pyhanko-cli/package.nix new file mode 100644 index 000000000000..93c275e08ea0 --- /dev/null +++ b/pkgs/by-name/py/pyhanko-cli/package.nix @@ -0,0 +1,66 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + nix-update-script, +}: +python3Packages.buildPythonApplication rec { + pname = "pyhanko-cli"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MatthiasValvekens"; + repo = "pyhanko"; + tag = "pyhanko-cli/v${version}"; + hash = "sha256-ZDHAcI2yoiVifYt05V85lz8mJmoyi10g4XoLQ+LhLHE="; + }; + + sourceRoot = "${src.name}/pkgs/pyhanko-cli"; + + postPatch = '' + substituteInPlace src/pyhanko/cli/version.py \ + --replace-fail "0.0.0.dev1" "${version}" \ + --replace-fail "(0, 0, 0, 'dev1')" "tuple(\"${version}\".split(\".\"))" + substituteInPlace pyproject.toml \ + --replace-fail "0.0.0.dev1" "${version}" + ''; + + build-system = [ python3Packages.setuptools ]; + + dependencies = + with python3Packages; + [ + asn1crypto + tzlocal + pyhanko + pyhanko-certvalidator + click + platformdirs + ] + ++ lib.flatten (lib.attrValues pyhanko.optional-dependencies); + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pyhanko.testData + requests-mock + freezegun + certomancer + aiohttp + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex=pyhanko-cli/v(.*)" + ]; + }; + + meta = { + description = "Sign and stamp PDF files"; + mainProgram = "pyhanko"; + homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-cli"; + changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/pyhanko-cli/${src.tag}/docs/changelog.rst#pyhanko-cli"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.antonmosich ]; + }; +} From a3ef176cfc0694b9be52540dd044f93a1a139405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 00:51:22 +0000 Subject: [PATCH 2077/2279] ripgrep-all: 0.10.9 -> 0.10.10 --- pkgs/by-name/ri/ripgrep-all/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix index 336cefef565e..0aacb8e47b23 100644 --- a/pkgs/by-name/ri/ripgrep-all/package.nix +++ b/pkgs/by-name/ri/ripgrep-all/package.nix @@ -23,16 +23,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "phiresky"; repo = "ripgrep-all"; rev = "v${version}"; - hash = "sha256-r/+u76Qxat6U0Hb3Xh31K/F0dNSPzteFzoE69NNCerI="; + hash = "sha256-fDSetB2UGzth+3KkCKsXUHj3y08RSfQ2nCKDa8OurW4="; }; - cargoHash = "sha256-nTCqqTFt87snzOXkjablaX9ZMGu/s88ZnUVr5uYrzPs="; + cargoHash = "sha256-v+lLCI2ti/xL8hcGkm/xDDN9qk0G9MgtijE8xYnhC68="; # override debug=true set in Cargo.toml upstream RUSTFLAGS = "-C debuginfo=none"; From a4d1255756e1826b8ed2b4bcdb4e855023442b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 01:00:21 +0000 Subject: [PATCH 2078/2279] kustomize: 5.7.1 -> 5.8.0 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index d401c7f9f833..8aef962affae 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "kustomize"; - version = "5.7.1"; + version = "5.8.0"; ldflags = let @@ -26,13 +26,13 @@ buildGoModule (finalAttrs: { owner = "kubernetes-sigs"; repo = "kustomize"; rev = "kustomize/v${finalAttrs.version}"; - hash = "sha256-eLj9OQlHZph/rI3om6S5/0sYxjgYloUWag2mS0hEpCE="; + hash = "sha256-BOM0m/bigELUf6xHjLbI8wzSscF0lhwCjIxa87xBbWM="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-OodR5WXEEn4ZlVRTsH2uSmuJuP+6PYRLvTEZCenx4XU="; + vendorHash = "sha256-kwvfxHXL189PSK7+PnOr+1TSjuX3uHkV4VnG3gSW5v0="; nativeBuildInputs = [ installShellFiles ]; From 4c5e61bcbea76850c99c9c5b2d0d851a5551b34b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 01:06:42 +0000 Subject: [PATCH 2079/2279] nvidia-modprobe: 580.95.05 -> 580.105.08 --- pkgs/by-name/nv/nvidia-modprobe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix index f259ba6e9fd4..f2e906297473 100644 --- a/pkgs/by-name/nv/nvidia-modprobe/package.nix +++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "nvidia-modprobe"; - version = "580.95.05"; + version = "580.105.08"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = version; - hash = "sha256-2guTV77XY8yV9TmwbM17zQGYygv7kgzkX4cyGWqSuV4="; + hash = "sha256-orOFwL9mrmqPqMorUOZlBTMEraAqYCf+2XTD9DuMeSk="; }; nativeBuildInputs = [ gnum4 ]; From d0e1ce24fef97b526cf2fbf191cb26b9fa76bace Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 01:21:55 +0000 Subject: [PATCH 2080/2279] home-assistant-custom-lovelace-modules.advanced-camera-card: 7.19.1 -> 7.19.2 --- .../custom-lovelace-modules/advanced-camera-card/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index d1e1c6fb5641..65edcab81875 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.19.1"; + version = "7.19.2"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-NkVgzmWnh+rB5joBA4RcGnrdLCZJ0n5aeDwv0rDsfYI="; + hash = "sha256-BimTVYWUWlEKOitEtKPECHyIXsM7Xknix1c03u07yr8="; }; # TODO: build from source once yarn berry support lands in nixpkgs From fed10ff0e853724bbeaa09df2ba9b17cf1ba7715 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 01:51:40 +0000 Subject: [PATCH 2081/2279] lsh: 1.5.0 -> 1.5.3 --- pkgs/by-name/ls/lsh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix index 93d435ecd272..00aafe8060ec 100644 --- a/pkgs/by-name/ls/lsh/package.nix +++ b/pkgs/by-name/ls/lsh/package.nix @@ -5,12 +5,12 @@ }: buildGoModule rec { pname = "lsh"; - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "latitudesh"; repo = "lsh"; rev = "v${version}"; - sha256 = "sha256-VsOahtc2KFTBjkbE1Raq1ho/fMifALBHVhoJyY85MJ8="; + sha256 = "sha256-W+0yuBfDjHNMEaf+T0FSVMzRyZgkeXrFwsY47ksDD5U="; }; vendorHash = "sha256-kOGHLrnpVQe8gy827CeP+1f2fy4WpUfWDfaNq/JmXpU="; subPackages = [ "." ]; From e32e658a0a9688eaf4e08824c7dd6b3ecf05b4ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:04:33 +0000 Subject: [PATCH 2082/2279] procfd: 1.2.0 -> 1.3.0 --- pkgs/by-name/pr/procfd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix index 16aa478eacdb..538741ab28a6 100644 --- a/pkgs/by-name/pr/procfd/package.nix +++ b/pkgs/by-name/pr/procfd/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "procfd"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "deshaw"; repo = "procfd"; tag = "v${finalAttrs.version}"; - hash = "sha256-KhnSHtPT9H9CWotwQIA9gFvwgm0PKsmDjQS817PxMw0="; + hash = "sha256-Z18DUXT26ZRFbD25pCKqPlEnxboQKhyhKysXeOsebcE="; }; - cargoHash = "sha256-srFXs+h+ZMXeWRwGQUAqMACJG4ZUgztWr2ff6sRfkU8="; + cargoHash = "sha256-QsdHNZnh86qQTE6ZtycrzqU+L72EBmRlRNqJ2CRU4MI="; nativeInstallCheckInputs = [ versionCheckHook From 4f1549db210827997e9d4f8e282c509c4162e6eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:06:43 +0000 Subject: [PATCH 2083/2279] rime-moegirl: 20251009 -> 20251109 --- pkgs/by-name/ri/rime-moegirl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index 10597a8092e8..fad1bab6948d 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20251009"; + version = "20251109"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-8WmfnkfTg8zdMKvn3I+Ag5KYjdbUpeWhgeSEEc/WUss="; + hash = "sha256-GBevsjo6KRd6Uicy2LpMwgZJkluN5n2ID/DAiaKJV74="; }; dontUnpack = true; From ccf9d4127e02506b972cc78fe7ecf89392e9cfab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:24:41 +0000 Subject: [PATCH 2084/2279] python3Packages.whirlpool-sixth-sense: 1.0.2 -> 1.0.3 --- .../python-modules/whirlpool-sixth-sense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 41501959d4fa..bb2b1cf0041c 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = "whirlpool-sixth-sense"; tag = version; - hash = "sha256-Xgz9SqH++pWZb7r1qxOrEEfC7I80qhrqcI0Zlduxlq4="; + hash = "sha256-SXa5Ccnng1McWgSWy85xCEr7odtBSJtJhjZoC/JfI/A="; }; build-system = [ setuptools ]; From ced3c3fda934afc01a4ee8b6826d48ef561b23a4 Mon Sep 17 00:00:00 2001 From: Nikita Wootten Date: Sun, 9 Nov 2025 21:26:04 -0500 Subject: [PATCH 2085/2279] poutine: 0.15.2 -> 1.0.4 --- pkgs/by-name/po/poutine/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index b41951ad7671..d6de3256a338 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -8,22 +8,25 @@ buildGoModule rec { pname = "poutine"; - version = "0.15.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "boostsecurityio"; repo = "poutine"; tag = "v${version}"; - hash = "sha256-YBoGsexYT2/lAWEajMVa/xNRBv1R1i0hB6pTAlk43E0="; + hash = "sha256-Rk4Fd/h83NKIVlz/QXOSLnCKfxfKFXUfvUF5FSjomQY="; }; - vendorHash = "sha256-CZLzIGu6jj4JXmKJaWmyeRvcRNjBYecblW47kcsg5Nw="; + vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE="; ldflags = [ "-s" "-w" ]; + # "dagger" directory contains its own go module, which should be excluded from the build + excludedPackages = [ "dagger" ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -40,6 +43,5 @@ buildGoModule rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "poutine"; - broken = stdenv.hostPlatform.isDarwin; }; } From f4ad101c13b209a5abdbc9826bf62e7ab1a44c13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:29:41 +0000 Subject: [PATCH 2086/2279] vscode-extensions.illixion.vscode-vibrancy-continued: 1.1.61 -> 1.1.62 --- 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 d18f1fc16498..c2fcc97e5617 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2285,8 +2285,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.61"; - hash = "sha256-1LjAIMjk7JjLTf49QvDaLeGGDD5SUCLC3/41RfVVhEM="; + version = "1.1.62"; + hash = "sha256-Urfa4XligTfFk6+GIuGabm5EFeQe+gRhdtb8IoXz+Ak="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; From ac4f04f65ab4eb30934b9863ece2526bc8debc63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:37:49 +0000 Subject: [PATCH 2087/2279] uutils-coreutils-noprefix: 0.3.0 -> 0.4.0 --- pkgs/by-name/uu/uutils-coreutils/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 1b1c2bf067df..686fc1404f02 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -21,19 +21,19 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux; stdenv.mkDerivation (finalAttrs: { pname = "uutils-coreutils"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; tag = finalAttrs.version; - hash = "sha256-qvHNV3oy89CVR4LtrxFQJpev3yhHXy2Fh5PTik7Eo8g="; + hash = "sha256-4C4i3oHw9WHwuq9DOufRvc/tOdwqHmYF/gUr2VkRmwM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "uutils-coreutils-${finalAttrs.version}"; - hash = "sha256-yJHp8FCk7W6EDhO/MLrhui50RHW4GOwPQnQmfkdkWd8="; + hash = "sha256-Xei7FIcJr5lr8+uC6veE2hnLPr1UjC/ooZxW6TWKsT8="; }; patches = [ From 309cafb4f85fc90c6460566afba51bc71f55a2be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 02:53:32 +0000 Subject: [PATCH 2088/2279] terraform-providers.nutanix_nutanix: 2.3.1 -> 2.3.3 --- .../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 2c413730cf25..4dd5ae766085 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -985,13 +985,13 @@ "vendorHash": null }, "nutanix_nutanix": { - "hash": "sha256-nk5wdbAzgBJ6gyYSXZAiNdjx/XQ6XldAMsjb8yv+y7w=", + "hash": "sha256-NhVgZCscSyM6O/d4BYokGz9FQ2fSuN2/kw8iZhzzBQY=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v2.3.1", + "rev": "v2.3.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY=" + "vendorHash": "sha256-CZo/GLUwmq/TxRDQr2h49rqENB24Zt4M7k5t7epXHuE=" }, "oboukili_argocd": { "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=", From e5786986937da41d780c4b52bedeb145e53ab2ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 03:00:08 +0000 Subject: [PATCH 2089/2279] moor: 2.8.1 -> 2.8.2 --- pkgs/by-name/mo/moor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index b366352cd223..22c08f08fb3b 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-VipHPRxSre6U3VXNtP+NrlaVfgUkzIDLvg4UsZucAdY="; + hash = "sha256-c2ypM5xglQbvgvU2Eq7sgMpNHSAsKEBDwQZC/Sf4GPU="; }; vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw="; From ee574550024c2e4c1f21fa9afbff51ae67ac60ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 03:16:14 +0000 Subject: [PATCH 2090/2279] xenia-canary: 0-unstable-2025-11-01 -> 0-unstable-2025-11-10 --- pkgs/by-name/xe/xenia-canary/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index b830d9fb3b78..379a0dd06ce8 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2025-11-01"; + version = "0-unstable-2025-11-10"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "b800011265bf47ea6b3f4f2b234d25249823a9be"; - hash = "sha256-XufXayBfpq8PUReAiNxAbt4gUhH+aYxMN10ZU7HVhJs="; + rev = "68b3490c8bdb2a819e80b113457aa16c6634118e"; + hash = "sha256-pUvOUAwF4FdDrQkXKH2zyQmlZ5/lM+7syROWVWhJcX8="; }; dontConfigure = true; From 337a3a360649e1e05d363e6cf401bcf08695e8ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 03:29:52 +0000 Subject: [PATCH 2091/2279] tigerbeetle: 0.16.62 -> 0.16.63 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index ec13d6d2b992..2fee191844a5 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-4lpJxXRwngBUdImBrIeuLVU6GJr6n6g/71bueuZTFj8="; - "x86_64-linux" = "sha256-5rJHyFRrU5N5wYIohISBRuwH7WfrSDUyHHmCppSvcfM="; - "aarch64-linux" = "sha256-CSB6PGr/EGV/ZdxfWMwY/R9/pObQRSASYE3Cp4cm1/E="; + "universal-macos" = "sha256-OkI7V3cGQv++jb9Y7mGSYZsTq/kzZ/bhM88Ol9XrqJ8="; + "x86_64-linux" = "sha256-3BxKah022TRJZ8QstUq+sgykTA+wJ6HfyzS6x2+IF+U="; + "aarch64-linux" = "sha256-sbnWYIMJZTKDwIT+mpnjiGyX1GnyQbYMckKklMtLfDc="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.62"; + version = "0.16.63"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From f186ff8e50afab79930db090b40c78fa4f9a8f0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 03:32:44 +0000 Subject: [PATCH 2092/2279] oci-cli: 3.69.0 -> 3.70.0 --- pkgs/by-name/oc/oci-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index ce3535b5a0ed..4472a612da3d 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.69.0"; + version = "3.70.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-mGwe3I8LobdoIQQrWLUDz0ARD8/WVIoNt80TatdtDKo="; + hash = "sha256-RB6NTxLFHnDunDEPTVg9fWoIKiWCAzUgzhlydFshmaI="; }; nativeBuildInputs = [ installShellFiles ]; From 8ecfc77f475c488de6e09648e2ff2e30f1158d1e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 10 Nov 2025 13:19:39 +1000 Subject: [PATCH 2093/2279] terraform-providers.1password_onepassword: 2.1.2 -> 2.2.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 2c413730cf25..96a922deadf0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,12 +1,12 @@ { "1password_onepassword": { - "hash": "sha256-u2nSzEKD0o/e0AzeHdKQj3+h7mAt6r5cxaKsPn6nRGo=", + "hash": "sha256-4wEKPTBt9F8N9jPk/PUu+ewrCJ8IztU9CblfJxA7h1k=", "homepage": "https://registry.terraform.io/providers/1Password/onepassword", "owner": "1Password", "repo": "terraform-provider-onepassword", - "rev": "v2.1.2", + "rev": "v2.2.0", "spdx": "MIT", - "vendorHash": null + "vendorHash": "sha256-n01cHzyG9FvxCb92sFccKY1h7Pa0zmi+CUxSYHM5Elc=" }, "a10networks_thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", From 26b071f0f44fc06da6d903df22e5417d9deb6de0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 04:21:54 +0000 Subject: [PATCH 2094/2279] ranger: 1.9.3-unstable-2025-11-01 -> 1.9.3-unstable-2025-11-05 --- pkgs/by-name/ra/ranger/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 5091f2e8bdd3..5ef7341efa3d 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication { pname = "ranger"; - version = "1.9.3-unstable-2025-11-01"; + version = "1.9.3-unstable-2025-11-05"; format = "setuptools"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; - rev = "6b646df44604fac6b7843119833a696789d6f3f3"; - hash = "sha256-6zypE/i+lANPP8z7ILgPWgwCFXXhxi2s+RLgctsId5Q="; + rev = "f28690ef42778eb7982e2b309a2cc8d99f682eb4"; + hash = "sha256-ZmUHHFth1jvMsyJ8XWRbLjoJnowRPZivFTim1VLh8hc="; }; LC_ALL = "en_US.UTF-8"; From 96c81e02585dc1693e849a311432935b63c2bd74 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Nov 2025 05:50:05 +0100 Subject: [PATCH 2095/2279] ocamlPackages.facile: unbreak --- .../ocaml-modules/facile/default.nix | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index d2ebf8b8805f..da56409b46c4 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -1,30 +1,34 @@ { lib, fetchurl, + fetchpatch, buildDunePackage, - ocaml, + stdlib-shims, + }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "facile is not available for OCaml ≥ 5.0" +buildDunePackage (finalAttrs: { + pname = "facile"; + version = "1.1.4"; - buildDunePackage - rec { - pname = "facile"; - version = "1.1.4"; + src = fetchurl { + url = "https://github.com/Emmanuel-PLF/facile/releases/download/${finalAttrs.version}/facile-${finalAttrs.version}.tbz"; + sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; + }; - src = fetchurl { - url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; - sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; - }; + patches = fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/Emmanuel-PLF/facile/pull/4.patch"; + excludes = [ "Makefile" ]; + hash = "sha256-syZO3lzuHxE2Y4yUaS+XgAQUFtLrENy2MwyWzPygfdg="; + }; - doCheck = true; + propagatedBuildInputs = [ stdlib-shims ]; - duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1"; - postPatch = lib.optionalString (duneVersion != "1") "dune upgrade"; + doCheck = true; - meta = { - homepage = "http://opti.recherche.enac.fr/facile/"; - license = lib.licenses.lgpl21Plus; - description = "Functional Constraint Library"; - }; - } + meta = { + homepage = "http://opti.recherche.enac.fr/facile/"; + license = lib.licenses.lgpl21Plus; + description = "Functional Constraint Library"; + }; +}) From 57716c35060497d50b440c3978e08fd925f44e39 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 9 Nov 2025 21:03:50 -0800 Subject: [PATCH 2096/2279] llvmPackages_git: 22.0.0-unstable-2025-11-02 -> 22.0.0-unstable-2025-11-09 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c8cd6d4f48ac..350554481e95 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -27,9 +27,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY="; "22.0.0-git".gitRelease = { - rev = "492f82fa46065b3afcfed1a4dca9a029d7c5acf1"; - rev-version = "22.0.0-unstable-2025-11-02"; - sha256 = "sha256-N0OJrXy9vtEFrr6pxoEdPIdOUju6sIjKX1s6wtYZ/7c="; + rev = "f734cebc396bfb0a3523d205071764f689432ab4"; + rev-version = "22.0.0-unstable-2025-11-09"; + sha256 = "sha256-YMLjygfO/r5wP/pI+XBfIGgpGo6c7HOl0IV8uJbDSFI="; }; } // llvmVersions; From f102dc554a13050fa66bdb4a2fdd7c381f5c32b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 05:07:14 +0000 Subject: [PATCH 2097/2279] cnspec: 12.7.1 -> 12.8.0 --- pkgs/by-name/cn/cnspec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 5210397c707c..927d9904b7de 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.7.1"; + version = "12.8.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-IriF6vr2Kw7h44zFd7hMhybseqtlYepjfQl+Z54fdbQ="; + hash = "sha256-9vGqElva4sS0uV2Be1WV9dW2bLYNOFZRB3wF3rSassM="; }; proxyVendor = true; - vendorHash = "sha256-P0spAsBp3jv0Nn4gVYTd+5WbWQgGZ83fyzxT3i0ncHs="; + vendorHash = "sha256-aEiHnYEJGg+kTUN2k9GKUtSaNpdQio5OsEJ8EnbxPLk="; subPackages = [ "apps/cnspec" ]; From 270dc15730b4123f742473c6fa834c2fc8cb246a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 05:11:33 +0000 Subject: [PATCH 2098/2279] mdfried: 0.13.0 -> 0.14.4 --- pkgs/by-name/md/mdfried/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index 33c4019dabdf..625c4b439577 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdfried"; - version = "0.13.0"; + version = "0.14.4"; src = fetchFromGitHub { owner = "benjajaja"; repo = "mdfried"; tag = "v${finalAttrs.version}"; - hash = "sha256-BMBV01VF0oubtFP6WHBiZqUAkxkhsxggPZ0255pONoA="; + hash = "sha256-MvyLJyCfZw4pCJOHwqcxtgKVrUE7dHFzoVyQwwfA69k="; }; - cargoHash = "sha256-FJFdGhoV7Y9sy24DmqLiuwgOryodLjacobeT9jamEfk="; + cargoHash = "sha256-FFKtJI3mBkRQARm6urcgbUNnBEyZA3BI4epsRVb1dwc="; doCheck = true; From 180f8273404ab86401151b88024509a14378a575 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 05:44:30 +0000 Subject: [PATCH 2099/2279] python3Packages.libuuu: 1.5.233 -> 1.5.239 --- pkgs/development/python-modules/libuuu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libuuu/default.nix b/pkgs/development/python-modules/libuuu/default.nix index 45f14805c02e..8e236742c9c5 100644 --- a/pkgs/development/python-modules/libuuu/default.nix +++ b/pkgs/development/python-modules/libuuu/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libuuu"; - version = "1.5.233"; + version = "1.5.239"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SbnQs+khNT1DwrctwHi0rsuO1WR/KgA7TUFARw9AHAU="; + hash = "sha256-fknRdLwdB3JCnd6OJzU4jiOWvKgsQJdYkvBgONddaCY="; }; build-system = [ From 14059021c5b6c312f73eb187a7246e6293af0548 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:42:34 +0200 Subject: [PATCH 2100/2279] ddccontrol: no with lib; in meta --- pkgs/by-name/dd/ddccontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 864381aa4d47..b3805617058e 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { intltoolize --force ''; - meta = with lib; { + meta = { description = "Program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pakhfn ]; }; } From 18cdb6a885bed141244f8621acb055b4f6abc870 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:42:58 +0200 Subject: [PATCH 2101/2279] ddccontrol: use tag in src --- pkgs/by-name/dd/ddccontrol/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index b3805617058e..8906257a387c 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = version; + tag = version; sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c="; }; From 5755f113347636187168c6b6bf625c2ae9d0a81c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:45:23 +0200 Subject: [PATCH 2102/2279] ddccontrol: use finalAttrs pattern --- pkgs/by-name/dd/ddccontrol/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 8906257a387c..0dcea84a1b50 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -11,14 +11,14 @@ ddccontrol-db, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol"; version = "1.0.3"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - tag = version; + tag = finalAttrs.version; sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pakhfn ]; }; -} +}) From 9b8dcfdf7a6292c6e2695ea6acff00d72aaa726e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:45:51 +0200 Subject: [PATCH 2103/2279] ddccontrol: add doronbehar as co-maintainer --- pkgs/by-name/dd/ddccontrol/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 0dcea84a1b50..57b148c4ce92 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ddccontrol/ddccontrol"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pakhfn ]; + maintainers = with lib.maintainers; [ + pakhfn + doronbehar + ]; }; }) From 3808a3dc89cdd374227af3406af1b4e7186f3164 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:48:11 +0200 Subject: [PATCH 2104/2279] ddccontrol-db: no with lib; in meta --- pkgs/by-name/dd/ddccontrol-db/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index b2fae63dc569..6316b06fd79c 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with lib; { + meta = { description = "Monitor database for DDCcontrol"; homepage = "https://github.com/ddccontrol/ddccontrol-db"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ lib.maintainers.pakhfn ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + pakhfn + ]; }; } From 9f24bb44dc4af34c7ffe26c48598596fcf7f2d70 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:48:23 +0200 Subject: [PATCH 2105/2279] ddccontrol-db: add doronbehar as co-maintainer --- pkgs/by-name/dd/ddccontrol-db/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 6316b06fd79c..37bd26fe3814 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pakhfn + doronbehar ]; }; } From 6c554d57dba80435bc7e41dc67cd971690ce5e35 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:48:52 +0200 Subject: [PATCH 2106/2279] ddccontrol-db: use finalAttrs pattern --- pkgs/by-name/dd/ddccontrol-db/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 37bd26fe3814..245302522809 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -8,14 +8,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol-db"; version = "20251102"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { doronbehar ]; }; -} +}) From ccc159849627f7670306ee69c8d1e81e395a181a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 29 Oct 2025 14:49:06 +0200 Subject: [PATCH 2107/2279] ddccontrol-db: use tag in src --- pkgs/by-name/dd/ddccontrol-db/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 245302522809..b966947c04e0 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = finalAttrs.version; + tag = finalAttrs.version; sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU="; }; From ae1d9b08d005b98e3bf670095da4e1508549bf2b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 18:06:33 +0200 Subject: [PATCH 2108/2279] nixos/ddccontrol: enable hardware.i2c and mention its group --- doc/release-notes/rl-2511.section.md | 2 ++ nixos/modules/services/hardware/ddccontrol.nix | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 75336f597b3a..a4ba427be9b5 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -96,6 +96,8 @@ - `spidermonkey_91` has been removed, as it has been EOL since September 2022. +- `ddccontrol` service now enables `hardware.i2c` by default, and adds `ddcci_backlight` to the kernel modules, based on [experiences reported on discourse](https://discourse.nixos.org/t/brightness-control-of-external-monitors-with-ddcci-backlight/8639/). + - The license of duckstation has changed from `gpl3Only` to `cc-by-nc-nd-40` making it unfree in newer releases. The `duckstation` package has been overhauled to support the new releases and `duckstation-bin` has been aliased to `duckstation` to support darwin binary builds. - `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues. diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index b9ad851333a4..6c1f0e8875a1 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -14,15 +14,25 @@ in options = { services.ddccontrol = { - enable = lib.mkEnableOption "ddccontrol for controlling displays"; + enable = lib.mkEnableOption '' + ddccontrol for controlling displays. + + This [enables `hardware.i2c`](#opt-hardware.i2c.enable), so note to add + yourself to [`hardware.i2c.group`](#opt-hardware.i2c.group). + ''; }; }; ###### implementation config = lib.mkIf cfg.enable { + boot.kernelModules = [ + "ddcci_backlight" + ]; # Load the i2c-dev module - boot.kernelModules = [ "i2c_dev" ]; + hardware.i2c = { + enable = true; + }; # Give users access to the "gddccontrol" tool environment.systemPackages = [ From 63edc4f2021084c666505eacbc6186c6bbe621b7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 18:13:41 +0200 Subject: [PATCH 2109/2279] nixos/ddccontrol: Add doronbehar as maintainer --- nixos/modules/services/hardware/ddccontrol.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 6c1f0e8875a1..6f6f30a82ada 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -10,6 +10,8 @@ let in { + meta.maintainers = with lib.maintainers; [ doronbehar ]; + ###### interface options = { From 44abfc6fbf78df3ba959e2fc1771f41c70dd8e63 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 2 Nov 2025 01:02:57 +0200 Subject: [PATCH 2110/2279] ddcutil-service: init at 1.0.14 https://github.com/digitaltrails/ddcutil-service --- pkgs/by-name/dd/ddcutil-service/package.nix | 46 +++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/dd/ddcutil-service/package.nix diff --git a/pkgs/by-name/dd/ddcutil-service/package.nix b/pkgs/by-name/dd/ddcutil-service/package.nix new file mode 100644 index 000000000000..497ddc511397 --- /dev/null +++ b/pkgs/by-name/dd/ddcutil-service/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + + # buildInputs + glib, + ddcutil, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ddcutil-service"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "digitaltrails"; + repo = "ddcutil-service"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IZ6s9z0zxMZT7qd+yuQJGLnKc1WISIvhJlIGsM/Dw3w="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + ddcutil + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = { + description = "A Dbus ddcutil server for control of DDC Monitors/VDUs"; + homepage = "https://github.com/digitaltrails/ddcutil-service"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "ddcutil-service"; + platforms = lib.platforms.linux; + }; +}) From 4bf4bd3621f01e574d06e8d672272f02866891af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:02:51 +0000 Subject: [PATCH 2111/2279] terraform-providers.kislerdm_neon: 0.11.0 -> 0.12.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 2c413730cf25..990a84c99708 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -805,11 +805,11 @@ "vendorHash": "sha256-OZG8EA8xtskbLZgHzWm865wjnhRCsWdNepNMHfdtkyw=" }, "kislerdm_neon": { - "hash": "sha256-O7VYLD1qyH5oXv02OxrhQW+J1VysiHwbwW+Fzq4VKkE=", + "hash": "sha256-4icz/nGHIP2nzGbP4iGuPVbn8OC+u13qBSwYbyFLCto=", "homepage": "https://registry.terraform.io/providers/kislerdm/neon", "owner": "kislerdm", "repo": "terraform-provider-neon", - "rev": "v0.11.0", + "rev": "v0.12.0", "spdx": "MPL-2.0", "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU=" }, From f703ac2ab7d96acbcd5b3f0ea771d75980140767 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:08:51 +0000 Subject: [PATCH 2112/2279] lunatask: 2.1.13 -> 2.1.15 --- pkgs/by-name/lu/lunatask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index c48b157b5f9d..49c8a52c8c30 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.1.13"; + version = "2.1.15"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-OxkhXBaoXaq7NvlZerQV9AwX85nMS/HBgH6KpugJeMU="; + hash = "sha256-kb3t8fQmJogzyJ/LkqOGWhdWMFgPbfzjD6m5jDWk4Rg="; }; appimageContents = appimageTools.extract { From b6bf6a8ff36b280e3bbc35db047b3f3e0ebff3c2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Oct 2025 18:30:46 +0200 Subject: [PATCH 2113/2279] nixos/ddccontrol: add package option --- nixos/modules/services/hardware/ddccontrol.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 6f6f30a82ada..51761ea4e0ae 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -22,6 +22,13 @@ in This [enables `hardware.i2c`](#opt-hardware.i2c.enable), so note to add yourself to [`hardware.i2c.group`](#opt-hardware.i2c.group). ''; + package = + lib.mkPackageOption pkgs + "package with which to control brightness; added also to [services.dbus.packages](#opt-services.dbus.packages)." + { + default = [ "ddccontrol" ]; + example = [ "ddcutil-service" ]; + }; }; }; @@ -36,17 +43,16 @@ in enable = true; }; - # Give users access to the "gddccontrol" tool environment.systemPackages = [ - pkgs.ddccontrol + cfg.package ]; services.dbus.packages = [ - pkgs.ddccontrol + cfg.package ]; systemd.packages = [ - pkgs.ddccontrol + cfg.package ]; }; } From 787aa8b71fda9c4a0c854a182db3a523366e50c5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 2 Nov 2025 11:43:00 +0200 Subject: [PATCH 2114/2279] vdu_controls: init at 2.4.3 https://github.com/digitaltrails/vdu_controls --- pkgs/by-name/vd/vdu_controls/package.nix | 79 ++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/vd/vdu_controls/package.nix diff --git a/pkgs/by-name/vd/vdu_controls/package.nix b/pkgs/by-name/vd/vdu_controls/package.nix new file mode 100644 index 000000000000..83b407c3d59b --- /dev/null +++ b/pkgs/by-name/vd/vdu_controls/package.nix @@ -0,0 +1,79 @@ +{ + lib, + python3, + fetchFromGitHub, + fetchpatch, + qt6, + copyDesktopItems, + installShellFiles, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "vdu_controls"; + version = "2.4.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "digitaltrails"; + repo = "vdu_controls"; + rev = "v${version}"; + hash = "sha256-aapODSWPB98I/ieUTXIO7nrd11VY9SmFpsVR1ketsZU="; + }; + + patches = [ + # Standardize installation with pypa/build. See: + # https://github.com/digitaltrails/vdu_controls/pull/120 + (fetchpatch { + url = "https://github.com/digitaltrails/vdu_controls/commit/ef2ed07398fc88ccc18a11da3cf5ea1500a03cb6.patch"; + hash = "sha256-W0Iv3RXQFnHAzaXHh6ZvGARN4ShsNgOhg9FTpbvnfLo="; + }) + ]; + + build-system = [ + python3.pkgs.setuptools + python3.pkgs.sphinx + ]; + # Replace FHS paths with out paths. Unfortunately it will be pretty hard to + # change this behavior upstream, as they barely use any packaging system + # whatsoever. + preBuild = '' + substituteInPlace vdu_controls.py \ + --replace-fail /usr/share/vdu_controls $out/share/vdu_controls + ''; + + nativeBuildInputs = [ + qt6.wrapQtAppsHook + copyDesktopItems + installShellFiles + ]; + desktopItems = "vdu_controls.desktop"; + postInstall = '' + install -Dm066 vdu_controls.png $out/share/icons/hicolor/256x256/apps/vdu_controls.png + make -C docs man + installManPage docs/_build/man/vdu_controls.1 + mkdir -p $out/share/vdu_controls + cp -r icons $out/share/vdu_controls + cp -r sample-scripts $out/share/vdu_controls + cp -r translations $out/share/vdu_controls + ''; + + dependencies = [ + python3.pkgs.pyqt6 + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = { + description = "VDU controls - a control panel for monitor brightness/contrast"; + homepage = "https://github.com/digitaltrails/vdu_controls"; + license = lib.licenses.gpl3Only; + mainProgram = "vdu_controls"; + }; +} From 05c5182fefe9dfda6188074472db3cb05a85904f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:16:51 +0000 Subject: [PATCH 2115/2279] python3Packages.galois: 0.4.6 -> 0.4.7 --- pkgs/development/python-modules/galois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 00167c4102df..dcc383b04188 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; tag = "v${version}"; - hash = "sha256-KMCShC3oZCPk87rxCYuwdSNXy0i20IQ1gzL9nFqgn0Q="; + hash = "sha256-YVAmjmkAhU518x+eCCgA6RY99XPQ5s+xvonkaoc5t8A="; }; pythonRelaxDeps = [ From eeee5ffdd05b9d711865ddf2fd3df10917b74dde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:21:54 +0000 Subject: [PATCH 2116/2279] apko: 0.30.20 -> 0.30.21 --- pkgs/by-name/ap/apko/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 30c3b94bbda8..c461b335b4e2 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.20"; + version = "0.30.21"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZmvEBWCtJ2GQO8sqjeSYMclMkVxjSiLBdrRf8N9zXiQ="; + hash = "sha256-YDEu1fn1EHeMulvno6KeHIr4bAJ5RwPXWomqzGFUfrQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 906e1ce6c25361be1248dc53481f016c80af95b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 06:35:18 +0000 Subject: [PATCH 2117/2279] chafa: 1.16.2 -> 1.18.0 --- pkgs/by-name/ch/chafa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/chafa/package.nix b/pkgs/by-name/ch/chafa/package.nix index 702a89362d38..db38014956f5 100644 --- a/pkgs/by-name/ch/chafa/package.nix +++ b/pkgs/by-name/ch/chafa/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.16.2"; + version = "1.18.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; tag = finalAttrs.version; - hash = "sha256-bIFPnbciaog9piqBMSpe9zLwH7irp5CW1WG5frAMqpI="; + hash = "sha256-SKwrc0bOaSdxENUWMtErSCug7of9s/ZGLeKhTtUCbWY="; }; outputs = [ From 57ccbdb32d794d9f90f5aa4b7f7536172b63047f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 07:19:48 +0000 Subject: [PATCH 2118/2279] qlementine: 1.3.0 -> 1.4.0 --- pkgs/by-name/ql/qlementine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ql/qlementine/package.nix b/pkgs/by-name/ql/qlementine/package.nix index f6981e33731c..836be3972496 100644 --- a/pkgs/by-name/ql/qlementine/package.nix +++ b/pkgs/by-name/ql/qlementine/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qlementine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "oclero"; repo = "qlementine"; tag = "v${finalAttrs.version}"; - hash = "sha256-emP/ln69xdmoRDTKfSCTuv/H7HE4H6Mp7HPjvxjpphw="; + hash = "sha256-sQp6geH0PqthSVbC+AmQfKRVykZZoAfDMjhIviYJ4RI="; }; nativeBuildInputs = [ cmake ]; From 0708d0c2779bc22cc42555975c8ffffe2bba833b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 07:19:51 +0000 Subject: [PATCH 2119/2279] terraform-providers.equinix_equinix: 4.7.0 -> 4.10.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 2c413730cf25..8403c2a30b9d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0=" }, "equinix_equinix": { - "hash": "sha256-WjJxZzrsyHHjsVK4pZf3ByTcFBXbIlw7JiMp9uMv19I=", + "hash": "sha256-qF3v9sol5/pdK+WCsz69eT/xAwsSfjnCjKTa+AXuBUI=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v4.7.0", + "rev": "v4.10.0", "spdx": "MIT", "vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4=" }, From 34870c39740f17701b294157dc36a2b6b15917ac Mon Sep 17 00:00:00 2001 From: Hannes <33062605+HannesGitH@users.noreply.github.com> Date: Mon, 10 Nov 2025 08:28:29 +0100 Subject: [PATCH 2120/2279] nixos/oink: update service options to pass secrets via file --- doc/release-notes/rl-2511.section.md | 2 ++ nixos/modules/services/networking/oink.nix | 37 ++++++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index a4ba427be9b5..c36007dad49f 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -225,6 +225,8 @@ - `rocmPackages.triton` has been removed in favor of `python3Packages.triton`. +- `oink` service no longer accepts `settings.apiKey` and `settings.secretApiKey` options as these have been replaced by `apiKeyFile` and `secretApiKeyFile`. + - `linpinyin`, which is used for Chinese character input, has migrated from the unmaintained BDB database format to the newer KyotoCabinet database format. If you want to migrate your user input statistics you can consider using [bdbtokyotodb](https://codeberg.org/raboof/bdbtokyotodb). - `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with its [upstream support lifecycle](https://vektra.github.io/mockery/) diff --git a/nixos/modules/services/networking/oink.nix b/nixos/modules/services/networking/oink.nix index 5c76a7de5036..9b3ae51f32ee 100644 --- a/nixos/modules/services/networking/oink.nix +++ b/nixos/modules/services/networking/oink.nix @@ -20,15 +20,17 @@ in options.services.oink = { enable = lib.mkEnableOption "Oink, a dynamic DNS client for Porkbun"; package = lib.mkPackageOption pkgs "oink" { }; + apiKeyFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/oink-api-key"; + description = "Path to a file containing the API key to use when modifying DNS records."; + }; + secretApiKeyFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/oink-secret-api-key"; + description = "Path to a file containing the secret API key to use when modifying DNS records."; + }; settings = { - apiKey = lib.mkOption { - type = lib.types.str; - description = "API key to use when modifying DNS records."; - }; - secretApiKey = lib.mkOption { - type = lib.types.str; - description = "Secret API key to use when modifying DNS records."; - }; interval = lib.mkOption { # https://github.com/rlado/oink/blob/v1.1.1/src/main.go#L364 type = lib.types.ints.between 60 172800; # 48 hours @@ -79,12 +81,29 @@ in }; }; + imports = [ + (lib.mkRemovedOptionModule [ "services" "oink" "settings" "apiKey" ] '' + This option has been removed because it would make the API key world-readable. + Use {option}`apiKeyFile` instead. + If you insist on keeping the API key world-readable, you can use `oink.apiKeyFile = pkgs.writeText "api-key" "secret";`. + '') + (lib.mkRemovedOptionModule [ "services" "oink" "settings" "secretApiKey" ] '' + This option has been removed because it would make the API key world-readable. + Use {option}`secretApiKeyFile` instead. + If you insist on keeping the API key world-readable, you can use `oink.secretApiKeyFile = pkgs.writeText "secret-api-key" "secret";`. + '') + ]; config = lib.mkIf cfg.enable { systemd.services.oink = { description = "Dynamic DNS client for Porkbun"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${cfg.package}/bin/oink -c ${oinkConfig}"; + script = + lib.optionalString (cfg.apiKeyFile != null) "OINK_OVERRIDE_APIKEY=\"$(cat ${cfg.apiKeyFile})\" " + + lib.optionalString ( + cfg.secretApiKeyFile != null + ) "OINK_OVERRIDE_SECRETAPIKEY=\"$(cat ${cfg.secretApiKeyFile})\" " + + "${cfg.package}/bin/oink -c ${oinkConfig}"; serviceConfig = { Restart = "on-failure"; RestartSec = "10"; From 179c5fff05aea1f3976524de71b8f726c6c2aa9e Mon Sep 17 00:00:00 2001 From: Letgamer Date: Sun, 9 Nov 2025 16:43:18 +0100 Subject: [PATCH 2121/2279] pygpoabuse: init at 0-unstable-2025-11-09 --- pkgs/by-name/py/pygpoabuse/package.nix | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/py/pygpoabuse/package.nix diff --git a/pkgs/by-name/py/pygpoabuse/package.nix b/pkgs/by-name/py/pygpoabuse/package.nix new file mode 100644 index 000000000000..33c0d8ea353c --- /dev/null +++ b/pkgs/by-name/py/pygpoabuse/package.nix @@ -0,0 +1,40 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication { + pname = "pygpoabuse"; + version = "0-unstable-2025-11-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Hackndo"; + repo = "pyGPOAbuse"; + rev = "324a3c3075a7a6a5364b3cb8b3d2e0b755be9c76"; + hash = "sha256-DNdKKxE8UACZ5oEZ2iKuNvFrmpz+RCTYI0O5pCa5jIU="; + }; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + impacket + msldap + ]; + + postInstall = '' + mv $out/bin/pygpoabuse{.py,} + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; }; + + meta = { + description = "Partial python implementation of SharpGPOAbuse"; + homepage = "https://github.com/Hackndo/pyGPOAbuse"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ letgamer ]; + mainProgram = "pygpoabuse"; + }; +} From b4ad772a1a984fb918839834dc5f0565386aed86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 07:41:17 +0000 Subject: [PATCH 2122/2279] ludusavi: 0.29.1 -> 0.30.0 --- pkgs/by-name/lu/ludusavi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index b1d4711ff5f0..86cc44a3359e 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -33,16 +33,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ludusavi"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; tag = "v${finalAttrs.version}"; - hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0="; + hash = "sha256-tN0z9kSiSnbto8SyZE3y3pGBJObBksoRxAIKC5OBAxc="; }; - cargoHash = "sha256-ixxUz+XJPzPu51sxHpXs92Tis2gj9SElqYtNiN+n2EY="; + cargoHash = "sha256-1zoG0UymnEMHMnVaboSDqYMZsObuuzxtwsjCfjeZaa0="; dontWrapGApps = true; From 5bcd383f0c80fdc1ff4f1a119004dd5cf38175dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 08:01:00 +0000 Subject: [PATCH 2123/2279] terraform-providers.rancher_rancher2: 8.2.1 -> 8.3.1 --- .../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 2c413730cf25..1338516aef05 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1120,11 +1120,11 @@ "vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc=" }, "rancher_rancher2": { - "hash": "sha256-E1E7xrQUOGbGV1xNpZFrIql6zgfzr3jmCbIFREbJdwE=", + "hash": "sha256-vFsnbB35rL8U/4b/53SeuDXr+3GT/aVphKRB5H1B/Z8=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v8.2.1", + "rev": "v8.3.1", "spdx": "MPL-2.0", "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8=" }, From a9f5e663a906ca3ee79965d4159b36b3245901d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 08:16:00 +0000 Subject: [PATCH 2124/2279] python3Packages.locust-cloud: 1.27.9 -> 1.28.1 --- pkgs/development/python-modules/locust-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix index 726c20a852c2..cfd063ebe375 100644 --- a/pkgs/development/python-modules/locust-cloud/default.nix +++ b/pkgs/development/python-modules/locust-cloud/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "locust-cloud"; - version = "1.27.9"; + version = "1.28.1"; pyproject = true; src = fetchFromGitHub { owner = "locustcloud"; repo = "locust-cloud"; tag = version; - hash = "sha256-7k1IZNBVkz+E5WW/wZWpB+yl/W7ONuHlUM8wOKvu0ow="; + hash = "sha256-QGcALoJhUCATkO3hB255y4GOtXN8yVNtOSwV0Mo+p6o="; }; build-system = [ From f94794412382742461516c126a9e4163c8d01bfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 08:25:57 +0000 Subject: [PATCH 2125/2279] stgit: 2.5.4 -> 2.5.5 --- pkgs/by-name/st/stgit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix index 8fe5211f4653..695788549d8d 100644 --- a/pkgs/by-name/st/stgit/package.nix +++ b/pkgs/by-name/st/stgit/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-Tsh2VKnJUwxsrsSOKxJwcFIY8UZ9F7Ebi9lwe03fJZs="; + hash = "sha256-zl3xy4t15QwdHeo0cjtorOcmD6oerprUswoMubpVLGU="; }; - cargoHash = "sha256-RiPLBK7CiotCduaYYbS3vkb9ezNwfbbx+QC4DGd3diU="; + cargoHash = "sha256-HPwKKh2QAG690u5pVIIp6Mu6ejaXmIuSuzMLt2tvwhw="; nativeBuildInputs = [ pkg-config From 2dc75801fbcf59bdeb7211eca34499b6b284461b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 08:32:21 +0000 Subject: [PATCH 2126/2279] terraform-providers.hashicorp_google: 7.9.0 -> 7.10.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 2c413730cf25..ab42ebe90546 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -561,13 +561,13 @@ "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU=" }, "hashicorp_google": { - "hash": "sha256-sGdKvVyQkYVM2zZ6fVgUr2ANgQVwJjvlcbSUAUagsqU=", + "hash": "sha256-PoPYcCr66g+3S94q0SprdQokgVkFM1p3oYSBEMOdSWY=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.9.0", + "rev": "v7.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84=" + "vendorHash": "sha256-BghusRVsU7HrX6hWpbanGJ93UdHSq8nWmcEGnyyVOTs=" }, "hashicorp_google-beta": { "hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=", From 75f2358f899df267cf82b1bb71f4892389a637f1 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Mon, 10 Nov 2025 08:48:30 +0100 Subject: [PATCH 2127/2279] hyprland: 0.52.0 -> 0.52.1 --- pkgs/by-name/hy/hyprland/info.json | 10 +++++----- pkgs/by-name/hy/hyprland/package.nix | 19 ++----------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 4b6bf834beda..e95c789633a6 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "main", - "commit_hash": "f56ec180d3a03a5aa978391249ff8f40f949fb73", - "commit_message": "version: bump to 0.52.0", - "date": "2025-11-07", - "tag": "v0.52.0" + "branch": "v0.52.1-b", + "commit_hash": "967c3c7404d4fa00234e29c70df3e263386d2597", + "commit_message": "version: bump to 0.52.1", + "date": "2025-11-09", + "tag": "v0.52.1" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 902d2877d877..ea7641639e2d 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -3,7 +3,6 @@ stdenv, stdenvAdapters, fetchFromGitHub, - fetchpatch, pkg-config, makeWrapper, cmake, @@ -92,30 +91,16 @@ assert assertMsg ( customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.52.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-5jYD01l95U/HTfZMAccAvhSnrWgHIRWEjLi9R4wPIVI="; + hash = "sha256-Lr8kwriXtUxjYsi1sGRMIR2LZilgrxYQA1TTmbpSJ+g="; }; - patches = [ - # NOTE: this is required to make plugins compile. should be removed with the next release. - (fetchpatch { - url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch"; - hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s="; - }) - - # NOTE: fixes regression for layer-shell-qt. should be removed with the next release. - (fetchpatch { - url = "https://github.com/hyprwm/Hyprland/commit/0bd11d5eb941b8038f0723135768d84aa5512b4a.patch"; - hash = "sha256-yY5OsihAzm5cVLg8smGc4i/RIimUDwuZ1RUGqOlfV+Q="; - }) - ]; - postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp From 92147c20e2e79340af8d0da37965a97c402fad60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 10 Nov 2025 08:38:35 +0000 Subject: [PATCH 2128/2279] codex: 0.56.0 -> 0.57.0 --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 0a2afc4c8aab..72a1bbd8d717 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-CIKoOfqZwCCCDFXnRdU7haxfiyvrgGD3vSwXZpE9DUU="; + hash = "sha256-Mjn2SesclOTBLiE7hQRtdyI/TpIM5lw2uswYyCMhyGY="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-FN20afqRVdGl17+fbzNoXqF8BY+dPtGi1lvwB6w+ieE="; + cargoHash = "sha256-ijXcYBMP63VzeHqVTEebJ83cYQtQgHU62kWklA1NHEA="; nativeBuildInputs = [ installShellFiles From 9ddf5e6f3d01d699a6808e1bd711e569a87fd48a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 9 Nov 2025 23:08:44 +0000 Subject: [PATCH 2129/2279] uutils-coreutils: fix for aarch64-linux --- pkgs/by-name/uu/uutils-coreutils/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 686fc1404f02..d7a865719001 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4C4i3oHw9WHwuq9DOufRvc/tOdwqHmYF/gUr2VkRmwM="; }; + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config.toml + ''; + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "uutils-coreutils-${finalAttrs.version}"; From 22db7a73e4b4145220408222869031df11c5b768 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Mon, 10 Nov 2025 09:55:48 +0100 Subject: [PATCH 2130/2279] SDL_compat: revert breaking upstream change Fixes several of the build failures that were caused by , e.g.: * https://hydra.nixos.org/build/311791969 * https://hydra.nixos.org/build/311791578 * https://hydra.nixos.org/build/311802072 Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/SDL_compat/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index 737170945a9f..c47b15a164ab 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -4,6 +4,7 @@ cmake, darwin, fetchFromGitHub, + fetchpatch2, libGLU, libiconv, libX11, @@ -84,10 +85,18 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/lib/pkgconfig/sdl12_compat.pc $out/lib/pkgconfig/sdl.pc ''; - # The setup hook scans paths of buildInputs to find SDL related packages and - # adds their include and library paths to environment variables. The sdl-config - # is patched to use these variables to produce correct flags for compiler. - patches = [ ./find-headers.patch ]; + patches = [ + # The setup hook scans paths of buildInputs to find SDL related packages and + # adds their include and library paths to environment variables. The sdl-config + # is patched to use these variables to produce correct flags for compiler. + ./find-headers.patch + + # https://github.com/libsdl-org/sdl12-compat/issues/382 + (fetchpatch2 { + url = "https://github.com/libsdl-org/sdl12-compat/commit/bef8f7412dd44edc4f7e14dc35d3b20399e25496.patch?full_index=1"; + hash = "sha256-5kJawjmA8C3uH3OIXHmqQjnIRtoTJtXmm3iLxG3e1qc="; + }) + ]; setupHook = ./setup-hook.sh; passthru.tests = { From a9352160f133ce9b7410da232fc82308d3d71c5c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 12:12:18 +0200 Subject: [PATCH 2131/2279] python3Packages.pytest-lsp: 0.4.3 -> 1.0.0 Changelog: https://github.com/swyddfa/lsp-devtools/blob/develop/lib/pytest-lsp/CHANGES.md --- pkgs/development/python-modules/pytest-lsp/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-lsp/default.nix b/pkgs/development/python-modules/pytest-lsp/default.nix index 4fa32e477d79..d1758b118cf6 100644 --- a/pkgs/development/python-modules/pytest-lsp/default.nix +++ b/pkgs/development/python-modules/pytest-lsp/default.nix @@ -3,20 +3,21 @@ fetchPypi, buildPythonPackage, hatchling, - pygls, + pygls_2, pytestCheckHook, pytest-asyncio, + packaging, }: buildPythonPackage rec { pname = "pytest-lsp"; - version = "0.4.3"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit version; pname = "pytest_lsp"; - hash = "sha256-ND9r2i+qMg7V/Ld8lCDScDzlZdHRRP6CfjGYp9wpkRw="; + hash = "sha256-uoyVstl1o2Akn/pXaOHm9E2H0Q73dUBw07MhECckovE="; }; build-system = [ @@ -24,8 +25,9 @@ buildPythonPackage rec { ]; dependencies = [ - pygls + pygls_2 pytest-asyncio + packaging ]; nativeCheckInputs = [ From 32836b97f5947950f8d4db06f40150f6d18d2b16 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 12:15:19 +0200 Subject: [PATCH 2132/2279] python3Packages.jedi-language-server: 0.45.1 -> 0.46.0 Diff: https://github.com/pappasam/jedi-language-server/compare/v0.45.1...v0.46.0 Changelog: https://github.com/pappasam/jedi-language-server/blob/v0.46.0/CHANGELOG.md --- .../jedi-language-server/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 39156bb4aaf4..9d468fcd8cc0 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -11,9 +11,9 @@ # dependencies docstring-to-markdown, jedi, - lsprotocol, - pydantic, - pygls, + lsprotocol_2025, + cattrs, + pygls_2, # tests pytestCheckHook, @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.45.1"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pappasam"; repo = "jedi-language-server"; tag = "v${version}"; - hash = "sha256-uO7+ui9FEeMF4sC/jI91px5wEWecvfJApogFMfwpPEs="; + hash = "sha256-8B/FYktdWtZvB8Us6zQ3gvx1MxJTzP2xyj1VhnM+Viw="; }; build-system = [ @@ -42,9 +42,9 @@ buildPythonPackage rec { dependencies = [ docstring-to-markdown jedi - lsprotocol - pydantic - pygls + lsprotocol_2025 + cattrs + pygls_2 ]; nativeCheckInputs = [ From 94f72323f416445ca2fa47651d30d0c33a57ab3a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 12:15:43 +0200 Subject: [PATCH 2133/2279] python3Packages.ufmt: 2.8.0 -> 2.9.0 Diff: https://github.com/omnilib/ufmt/compare/v2.8.0...v2.9.0 Changelog: https://github.com/omnilib/ufmt/blob/2.9.0/CHANGELOG.md --- .../python-modules/ufmt/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index 7537b44f8d60..8215f457ab54 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system flit-core, @@ -18,7 +17,7 @@ usort, # optional-dependencies - pygls, + pygls_2, ruff-api, # tests @@ -28,27 +27,16 @@ buildPythonPackage rec { pname = "ufmt"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; src = fetchFromGitHub { owner = "omnilib"; repo = "ufmt"; tag = "v${version}"; - hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw="; + hash = "sha256-/5sfawsBmsStCCdu4lIq2iL0zywrWAN+qW/t3h2UIu0="; }; - patches = [ - # Fix click 8.2.x incompatibility - # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr' - # https://github.com/omnilib/ufmt/pull/260 - (fetchpatch2 { - name = "fix-click-incompatibility.patch"; - url = "https://github.com/omnilib/ufmt/pull/260/commits/7980d7cd0a29fbd287e10d939248ef7c9d38a660.patch"; - hash = "sha256-97/jQVGCC+PXk8uxyF/M7XlLuVqJ5SgQZd/MXkaiO70="; - }) - ]; - build-system = [ flit-core ]; dependencies = [ @@ -63,7 +51,7 @@ buildPythonPackage rec { ]; optional-dependencies = { - lsp = [ pygls ]; + lsp = [ pygls_2 ]; ruff = [ ruff-api ]; }; From 4f26e36f399d62490722f2eaa9c4561c80be5aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Nov 2025 02:28:26 +0000 Subject: [PATCH 2134/2279] python3Packages.lsp-tree-sitter: 0.0.18 -> 0.1.1 --- .../python-modules/lsp-tree-sitter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index 37395c94091e..262b4155713a 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -7,21 +7,21 @@ colorama, jinja2, jsonschema, - pygls, + pygls_2, tree-sitter, pytestCheckHook, }: buildPythonPackage rec { pname = "lsp-tree-sitter"; - version = "0.0.18"; + version = "0.1.1"; pyproject = true; src = fetchFromGitHub { owner = "neomutt"; repo = "lsp-tree-sitter"; tag = version; - hash = "sha256-Hjl3EASaOWmLZpBxmyelSUTy7jJEIEo77IIQh5DHIbg="; + hash = "sha256-H5yb33ZsqRtqm1zlnOI0WUfcM2VDKn+qyezmFNtdLGA="; }; build-system = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { colorama jinja2 jsonschema - pygls + pygls_2 tree-sitter ]; nativeCheckInputs = [ pytestCheckHook ]; From 5e99c199d0de7d4f31ddc5e7ac967937b50a7b79 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 11:58:39 +0200 Subject: [PATCH 2135/2279] autotools-language-server: 0.0.22 -> 0.0.23 Diff: https://github.com/Freed-Wu/autotools-language-server/compare/0.0.22...0.0.23 --- pkgs/by-name/au/autotools-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix index 020a5d04f58d..b1fbff0a93d7 100644 --- a/pkgs/by-name/au/autotools-language-server/package.nix +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "autotools-language-server"; - version = "0.0.22"; + version = "0.0.23"; pyproject = true; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "autotools-language-server"; tag = version; - hash = "sha256-PvaEcdvUE8QpxKuW65RL8SgDl/RM/C3HTEK3v+YA73c="; + hash = "sha256-cehiqxst3iGpR2UnkpN7wVAxd924n0ZNek3aiwEW+ZA="; }; build-system = [ From 26bc2dc444fb8424e1661a017a164e631086125e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 18:59:53 +0200 Subject: [PATCH 2136/2279] python3.pkgs.jedi-language-server: use writableTmpDirAsHomeHook --- .../python-modules/jedi-language-server/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 9d468fcd8cc0..bc163b53b462 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -19,6 +19,7 @@ pytestCheckHook, pyhamcrest, python-lsp-jsonrpc, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -51,12 +52,9 @@ buildPythonPackage rec { pytestCheckHook pyhamcrest python-lsp-jsonrpc + writableTmpDirAsHomeHook ]; - preCheck = '' - HOME="$(mktemp -d)" - ''; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/pappasam/jedi-language-server/issues/313 "test_publish_diagnostics_on_change" From 11e6cfbb33a890770430abbd5d6ec3df42f55c7d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 9 Nov 2025 19:43:15 +0200 Subject: [PATCH 2137/2279] ycmd: remove pybind11, as it is bundled with src --- pkgs/by-name/yc/ycmd/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index 3b2b06cbefaa..33ddbdcad837 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation { ++ [ jedi jedi-language-server - pybind11 ]; buildPhase = '' From 791f5a8fc984a2527dffc262f71a6f369bdc93fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 10:19:48 +0100 Subject: [PATCH 2138/2279] python313Packages.aioshelly: 13.15.0 -> 13.17.0 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/13.17.0 --- pkgs/development/python-modules/aioshelly/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index cc3dd6553951..ee3c3e91f459 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -2,6 +2,7 @@ lib, aiohttp, aioresponses, + bleak-retry-connector, bluetooth-data-tools, buildPythonPackage, fetchFromGitHub, @@ -9,33 +10,33 @@ orjson, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, yarl, + zeroconf, }: buildPythonPackage rec { pname = "aioshelly"; - version = "13.15.0"; + version = "13.17.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-1LiBWoZNSvhTAYf5VDo4gmfTz1oiKgrkAseDOm1kYYI="; + hash = "sha256-+qGbg95rHzddlnNrW8XfdWjzyC8ARqz1GUxqCn0KgsA="; }; build-system = [ setuptools ]; dependencies = [ aiohttp + bleak-retry-connector bluetooth-data-tools habluetooth orjson yarl + zeroconf ]; nativeCheckInputs = [ From 280502f64bdd24cbaffc1a64f59f0c41bef2abaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 10:30:41 +0100 Subject: [PATCH 2139/2279] python313Packages.mitogen: remove disabled --- pkgs/development/python-modules/mitogen/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 08115a3690df..880c87fb03b8 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "0.3.31"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "mitogen-hq"; repo = "mitogen"; From 8e852c1f297b41c58d32074d393ea23185221aa5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 10:35:12 +0100 Subject: [PATCH 2140/2279] python313Packages.whirlpool-sixth-sense: modernize --- .../python-modules/whirlpool-sixth-sense/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index bb2b1cf0041c..d71e045a5470 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -9,7 +9,6 @@ pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, setuptools, websockets, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "1.0.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "abmantis"; repo = "whirlpool-sixth-sense"; @@ -49,7 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Whirlpool 6th Sense appliances"; homepage = "https://github.com/abmantis/whirlpool-sixth-sense/"; - license = with licenses; [ mit ]; + changelog = "https://github.com/abmantis/whirlpool-sixth-sense/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From bf3503cef77b0246085a0c9919a8e7b0c3f647be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 10:35:25 +0100 Subject: [PATCH 2141/2279] python313Packages.model-checker: remove disabled --- pkgs/development/python-modules/model-checker/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index d5b978ee95eb..cc95fd51bb96 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, networkx, - pythonOlder, setuptools, tqdm, z3-solver, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.2.12"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { pname = "model_checker"; inherit version; From 1a4852787b7ab2c5abd61bebf2e5017b01725762 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 10:38:03 +0100 Subject: [PATCH 2142/2279] python313Packages.pylacus: remove disabled --- pkgs/development/python-modules/pylacus/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 51384b2aa280..5d1d564584d7 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonOlder, requests, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.19.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "ail-project"; repo = "PyLacus"; From 3de5d06c54636db133ec3fec951e994454b84b46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 11:19:34 +0100 Subject: [PATCH 2143/2279] python313Packages.cerberus: remove disabled --- pkgs/development/python-modules/cerberus/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index eaf0c4e08a64..0524a11daba2 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pythonOlder, setuptools, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "1.3.8"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "pyeve"; repo = "cerberus"; From d8ac6488e46477a8c44dbb1b5efe07bfb41ba559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 10:29:52 +0000 Subject: [PATCH 2144/2279] jx: 3.16.26 -> 3.16.28 --- pkgs/by-name/jx/jx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index c60e7927c2da..a24a02df899e 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "jx"; - version = "3.16.26"; + version = "3.16.28"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-KydLlc2FaOVdnz3ZP6obR7KbdWK0I5WXTziKAH3/UtY="; + sha256 = "sha256-BcT0zb4/TQPr3iwr3E72hPYbh0Oy+QZFD9zcX5ipNMA="; }; vendorHash = "sha256-YUFpTL4BXm1iZJAQcbJSXEUKT99IulxT6qz4mrbBDN0="; From 86b995fe4204cc13c9b5bf765396b87be03334a0 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 10 Nov 2025 11:41:56 +0100 Subject: [PATCH 2145/2279] eid-mw: 5.1.25 -> 5.1.26 --- pkgs/by-name/ei/eid-mw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix index 0dd756c2ece0..b73099781e7a 100644 --- a/pkgs/by-name/ei/eid-mw/package.nix +++ b/pkgs/by-name/ei/eid-mw/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.25"; + version = "5.1.26"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; tag = "v${finalAttrs.version}"; - hash = "sha256-LdOfwgRGyNK+a4SByClPgH9SrDeCdnhI9sLO7agsNsA="; + hash = "sha256-1dswXwXNTN3006KHnqlVntg6uHMxNe7NQ4BdKAB2FXM="; }; postPatch = '' From a9b9343a8d9d9266f425d65bb003c7546e7d1aec Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:19:07 +0100 Subject: [PATCH 2146/2279] electron-source.electron_37: 37.7.1 -> 37.9.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.9.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.7.1...v37.9.0 --- pkgs/development/tools/electron/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index e14995245470..c27bdd8d5a1a 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-gq7gu3ZhV2W02oQUtRFSAJfcCchB8zflqexllmg9GCU=", + "hash": "sha256-k+YDahI53rwe8o4EjrFfSWTbplUMJemN52+O4ICtz8M=", "owner": "electron", "repo": "electron", - "tag": "v37.7.1" + "tag": "v37.9.0" }, "fetcher": "fetchFromGitHub" }, @@ -393,10 +393,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=", + "hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=", "owner": "nodejs", "repo": "node", - "tag": "v22.20.0" + "tag": "v22.21.1" }, "fetcher": "fetchFromGitHub" }, @@ -1328,8 +1328,8 @@ }, "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk", "modules": "136", - "node": "22.20.0", - "version": "37.7.1" + "node": "22.21.1", + "version": "37.9.0" }, "38": { "chrome": "140.0.7339.240", From ba3b5135830839808da6e4852fcab261840ab123 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:27:03 +0100 Subject: [PATCH 2147/2279] electron-source.electron_38: 38.4.0 -> 38.6.0 - Changelog: https://github.com/electron/electron/releases/tag/v38.6.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v38.4.0...v38.6.0 --- pkgs/development/tools/electron/info.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index c27bdd8d5a1a..fe6ea75c3acd 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1332,7 +1332,7 @@ "version": "37.9.0" }, "38": { - "chrome": "140.0.7339.240", + "chrome": "140.0.7339.249", "chromium": { "deps": { "gn": { @@ -1341,15 +1341,15 @@ "version": "0-unstable-2025-07-29" } }, - "version": "140.0.7339.240" + "version": "140.0.7339.249" }, "chromium_npm_hash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=", "deps": { "src": { "args": { - "hash": "sha256-lO84baZNQgchjmLnSUQ4y2Yi1MEH8d0omB612F4vCxM=", + "hash": "sha256-ny2ZfcFpdt53+UbjZExBPpxZ/SJts/3DfxgFqbz4QfI=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "140.0.7339.240", + "tag": "140.0.7339.249", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -1388,10 +1388,10 @@ }, "src/electron": { "args": { - "hash": "sha256-HKUJyRtN5I/xOKyTfP3bHTwZ6AmpbWVzfT4BR3t9SOQ=", + "hash": "sha256-zrShSv6a2TCaMR90dfsN//PWsthHtz8m5awwNFur6hM=", "owner": "electron", "repo": "electron", - "tag": "v38.4.0" + "tag": "v38.6.0" }, "fetcher": "fetchFromGitHub" }, @@ -1725,10 +1725,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=", + "hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=", "owner": "nodejs", "repo": "node", - "tag": "v22.20.0" + "tag": "v22.21.1" }, "fetcher": "fetchFromGitHub" }, @@ -2652,8 +2652,8 @@ }, "electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z", "modules": "139", - "node": "22.20.0", - "version": "38.4.0" + "node": "22.21.1", + "version": "38.6.0" }, "39": { "chrome": "142.0.7444.52", From 6236808dd4afde2b99d8ff0424e661d1ed1cfe8f Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:33:49 +0100 Subject: [PATCH 2148/2279] electron-source.electron_39: 39.0.0 -> 39.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v39.1.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.0.0...v39.1.1 --- pkgs/development/tools/electron/info.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index fe6ea75c3acd..7f4ce45c6dab 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2656,7 +2656,7 @@ "version": "38.6.0" }, "39": { - "chrome": "142.0.7444.52", + "chrome": "142.0.7444.59", "chromium": { "deps": { "gn": { @@ -2665,15 +2665,15 @@ "version": "0-unstable-2025-09-18" } }, - "version": "142.0.7444.52" + "version": "142.0.7444.59" }, "chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=", "deps": { "src": { "args": { - "hash": "sha256-/gjznJOMyWs7kaUquYf4c1peCi3P6LQXnHUGdLROtz4=", - "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "142.0.7444.52", + "hash": "sha256-E2nxJzxjFu3pBeBptqBHNnguiBeI4tg76uLNOzitM+U=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "tag": "142.0.7444.59", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2712,10 +2712,10 @@ }, "src/electron": { "args": { - "hash": "sha256-yAV/co8euqwTeUg43nnKwYF0/NQIm2WVh7CWOeP8vyE=", + "hash": "sha256-1unNLuIek76p05+Jz/oKmc4/rUtAU6W37I7SnTV3UnE=", "owner": "electron", "repo": "electron", - "tag": "v39.0.0" + "tag": "v39.1.1" }, "fetcher": "fetchFromGitHub" }, @@ -3049,10 +3049,10 @@ }, "src/third_party/electron_node": { "args": { - "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=", + "hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=", "owner": "nodejs", "repo": "node", - "tag": "v22.20.0" + "tag": "v22.21.1" }, "fetcher": "fetchFromGitHub" }, @@ -4000,7 +4000,7 @@ }, "electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f", "modules": "140", - "node": "22.20.0", - "version": "39.0.0" + "node": "22.21.1", + "version": "39.1.1" } } From 970bc06c618fb9a38dba9648ee5724edd9104a47 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:33:56 +0100 Subject: [PATCH 2149/2279] electron_37-bin: 37.7.1 -> 37.9.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.9.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.7.1...v37.9.0 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 3a8bb1719453..d44a6769734e 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -12,14 +12,14 @@ }, "37": { "hashes": { - "aarch64-darwin": "20cf3973cfab6cde93904209845d620d3221fd49bbf39918ed28fb140d0a8e6a", - "aarch64-linux": "15e237fb17f7d6bfefabee229d1585204db0d7e230c118a3d5ce8fd49af7405d", - "armv7l-linux": "14278dd5061358521133addd0e025e466f8012640e390753df2fa92f13eae451", - "headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w", - "x86_64-darwin": "ca911295a582114438f9977e4aef18a42782da0b1fd5627cc1bf7744b2548a88", - "x86_64-linux": "aebb0b0d7c1cb7673753766219cd828cbf6c2e86e8b29a9571284d0f7cbc963d" + "aarch64-darwin": "5d953398aeb0a578f724d18755f693c8cd32125812c3e6a6f3c9ec90bdfa414a", + "aarch64-linux": "35e969cc0a4e779011f314311db07244235f5b2a8db9284bf0061ece7084f6dd", + "armv7l-linux": "015c9caf6bb919b73b5118a56f260746ec4ca1ae8c5008e3591d562a6f4c5aee", + "headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5", + "x86_64-darwin": "44b845bc1cac455d800cec2df1be3e72af0a3a4c54e933c803f30ab12600ffea", + "x86_64-linux": "e5b45933bca6acbf24a52452c976a30f5ac2614d0f08b00b7202b90efba1bc96" }, - "version": "37.7.1" + "version": "37.9.0" }, "38": { "hashes": { From cb0c3e390269aa9d5369641da052207ebdf93e82 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:33:58 +0100 Subject: [PATCH 2150/2279] electron-chromedriver_37: 37.7.1 -> 37.9.0 - Changelog: https://github.com/electron/electron/releases/tag/v37.9.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v37.7.1...v37.9.0 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 35116c365d38..8dfb6fefe0d2 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,14 +23,14 @@ }, "37": { "hashes": { - "aarch64-darwin": "fba6e9342f6414f08bb49466a8cb7028b44042342a64b55a212565af3b674bfb", - "aarch64-linux": "c4ee6ff8d3a3a96217557360bda4271fb49ab2383b8962f458fa0b6dc77ff8e2", - "armv7l-linux": "1c9d6799f14c14699fee37af08af515777f4da436b9998ba74a69613e7e957da", - "headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w", - "x86_64-darwin": "066d453bd62f02ecb1ddf10cfb064e6200c2af1842bd5963546f37c03eebd426", - "x86_64-linux": "2ce28af3e7481126d5dd9dcacdeeed39778a28892e5c594b10c0cfba06400ddb" + "aarch64-darwin": "1e2b6822ec49e253f765b34e5078f8261df0fcb086c7a8bfbbebdd35bdb8801e", + "aarch64-linux": "66877c9863c967dc435fa18e5177673b9f9e139bd73981c5945d92546d71a5ea", + "armv7l-linux": "deedf5b7f387721b4bcb9cea274ceaf7625852f88f3217eabd2104f42259f8be", + "headers": "0lwcdw882hjb2vhj9vvngkwq5l6nrh7d2hr9adpqdm1any4rssl5", + "x86_64-darwin": "e367440fdc5c915cd137c49ddd2912bda893996da6d14f1d678f02bcb726b135", + "x86_64-linux": "62ae1633d05f165d4ee42c2d6675f46db8cb55714433fddb5cb082dc9e40bffb" }, - "version": "37.7.1" + "version": "37.9.0" }, "38": { "hashes": { From 95d4ec4b47986f7851424a873ea1f78f550aea62 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:34:01 +0100 Subject: [PATCH 2151/2279] electron_38-bin: 38.4.0 -> 38.6.0 - Changelog: https://github.com/electron/electron/releases/tag/v38.6.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v38.4.0...v38.6.0 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index d44a6769734e..a64f8c3930f3 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -23,14 +23,14 @@ }, "38": { "hashes": { - "aarch64-darwin": "0895d02b29b26f33fc984aa0fc06005093f6128343ecce42da89855c14c22aac", - "aarch64-linux": "e4567921b645c8c396835b5ba2144bd104d04a7be1582bb937c53fed21170a0d", - "armv7l-linux": "c485210cb616057d04ee8537308c2aec76581554e793d4f5e8da0e04a1b6105c", - "headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95", - "x86_64-darwin": "483b6185c9a0e24eed8a8d5dfcc6fdfb22790f21dc84434083fd75f998f361f3", - "x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2" + "aarch64-darwin": "2add03400a735823e827b5671c52d877338b08fd4733dba210b35f99d6346f24", + "aarch64-linux": "99fe2c76ef1571da036d4610a6f49de1aa16ea4735b0b20da1d026668d70d629", + "armv7l-linux": "25cbecb533ff355e85c6760729dfd822fd27c6d50a36cab800d3d07af603295a", + "headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m", + "x86_64-darwin": "6a36e577156907ea15ca1cd393c90f0a60bebf01ca9c3414b7e76f4bb8b2d6f4", + "x86_64-linux": "b48627d5ce7b533170363e750d7292ecc489bce61ec2b933b9d4705c53166545" }, - "version": "38.4.0" + "version": "38.6.0" }, "39": { "hashes": { From 9f5a72b47ed72e3a3b96490fd4384f21adb00426 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:34:03 +0100 Subject: [PATCH 2152/2279] electron-chromedriver_38: 38.4.0 -> 38.6.0 - Changelog: https://github.com/electron/electron/releases/tag/v38.6.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v38.4.0...v38.6.0 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 8dfb6fefe0d2..6d7b2ed20b82 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "38": { "hashes": { - "aarch64-darwin": "7249795788e05d625944f0c0234928eb8176ff0ac03177628d06606975bcfbbe", - "aarch64-linux": "f47d45fb8c153fee979564bca8491e2588f0848f03087bb38573ebfbe62e63aa", - "armv7l-linux": "36c65512c5eec0ab9741a06e91b38a503de00c1e39cf177db676f5c665f357f4", - "headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95", - "x86_64-darwin": "e3a3dfc38b5f45ad884d2ac8eb165331247c5dbed030f925508fc8ff95a53f1e", - "x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892" + "aarch64-darwin": "b625e3ca3e66a79a63a35c7ca2e199172237387d4739e107620485f83c8dff46", + "aarch64-linux": "118b35d04d28f63a10dd3f80f809648e0507f381f889130e9a9cc8e1d1d8dec4", + "armv7l-linux": "f5cab868e2da285d60595c7df7cc29595070c4078993516a5f55d674b4b16b7c", + "headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m", + "x86_64-darwin": "a05015b38f4b6b25d874a5e2bd82c04813e27c34e3611fab8919af772c0e8a55", + "x86_64-linux": "1e087810c35b86e077a14464eaead73a8ec64eaa0e1107ac81828a985455aa70" }, - "version": "38.4.0" + "version": "38.6.0" }, "39": { "hashes": { From a1ca1cebe87ae339ed87e3b44f3f2a8d60e83cd4 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:34:05 +0100 Subject: [PATCH 2153/2279] electron_39-bin: 39.0.0 -> 39.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v39.1.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.0.0...v39.1.1 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index a64f8c3930f3..91245b576e14 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,13 +34,13 @@ }, "39": { "hashes": { - "aarch64-darwin": "678e51190e5b29af4eb5842d4724db35409efb706ce17b1a40faf823720a9c70", - "aarch64-linux": "8985a9b2055c17f2bdae4418af140d6accd12b28f929319f5a918ca79b0a3d43", - "armv7l-linux": "54ea84c5e3b7139a24cae32ee4bb5b73eccb517174430a02da1a91aa5335759e", - "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59", - "x86_64-darwin": "49f6cfe1d35b8f363f62bce73925dae3b8ff44b0201d9f7095592e7275e920d5", - "x86_64-linux": "4520cbd92eeed370d7cfd2b1c60135647c02b8f634d6179d8a9a3f64b64baf2f" + "aarch64-darwin": "90bfac2ec51c73a2f82d3b6f72ef69acb4b260cfe09106c1c0cc84389438ba27", + "aarch64-linux": "67c257ada60b8ee5107d4c3c3912ece8d8c1383321a00fda114ade06860e4b3f", + "armv7l-linux": "45305e3f1927fa87593802906d620057c093ce56d970dcf3e698a7ae672e0dcc", + "headers": "1dkmd89c4z9v0aqnf7sb3zpxdjqsi43h77dawniqlcglwv6vqh8v", + "x86_64-darwin": "3da533366600e21bd882512285d3583fe7a58457897c7a2dc49634f76056714d", + "x86_64-linux": "d4e492de3e0dd240746bcc54c2abf2b941f1657e06f07b87937bee516cf6fa59" }, - "version": "39.0.0" + "version": "39.1.1" } } From 524a027e88f82d90ef3177612ced9fcb19e90f0f Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 7 Nov 2025 12:34:07 +0100 Subject: [PATCH 2154/2279] electron-chromedriver_39: 39.0.0 -> 39.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v39.1.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v39.0.0...v39.1.1 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 6d7b2ed20b82..ed4ec782f19a 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,13 +45,13 @@ }, "39": { "hashes": { - "aarch64-darwin": "86718e1f93188928d9daf239e55ad07d08b3601bbe603a87a9524fa70fc5414c", - "aarch64-linux": "e42b6a850426d1f74305543caf688a71f41f9e4c7dcdec9d3a4522a059f2af36", - "armv7l-linux": "64295d9b93c4c67386b8de714d124046e311ed87828394c897592afa51285f74", - "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59", - "x86_64-darwin": "46467a2331a8da420e3e23d46d2a3f968d12fed2e863f1029dd4f94e35198943", - "x86_64-linux": "904052986ae1e1b42f92b2b29cf15dbd642eaf4ed4a0dcd1d4ff7cf609b8a3de" + "aarch64-darwin": "555c0c1456b3cfed09b79569fc1e6d9644cb1c1ee2c6d176ed3ee9380cca963e", + "aarch64-linux": "5a45ad3b6d62db31f94e16ea323d559a5380b92730032e106cf602f9258b8d0b", + "armv7l-linux": "478fe206d431297acbff3a4cfd95df7e864ab29971a883c9518b1a4b476a14fb", + "headers": "1dkmd89c4z9v0aqnf7sb3zpxdjqsi43h77dawniqlcglwv6vqh8v", + "x86_64-darwin": "af7656f7a1d29568ea820ae50f6b32c6db12b49382037a705524986c389d25cf", + "x86_64-linux": "23122cda6e264f716483fe00d9c085d2faad7fe2acd1cfbc6a301f54e80c44ac" }, - "version": "39.0.0" + "version": "39.1.1" } } From 1aaea419cd3c730d19fbeacd26fc21805a17aa3d Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 10 Nov 2025 11:41:46 +0100 Subject: [PATCH 2155/2279] vcv-rack: update apple-sdk to 14 to fix eval --- pkgs/by-name/vc/vcv-rack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index 337995abe01e..692c88ab0e3a 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -1,6 +1,6 @@ { alsa-lib, - apple-sdk_13, + apple-sdk_14, cmake, copyDesktopItems, curl, @@ -123,7 +123,7 @@ let libjack2 libpulseaudio ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + ++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_14 ]; cmakeFlags = [ (lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux) @@ -277,7 +277,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio zenity ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_14 ]; enableParallelBuilding = true; From d1e6e821901e2a8d0320964c8b3d4c35ce4fc005 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Nov 2025 10:19:30 +0000 Subject: [PATCH 2156/2279] python3Packages.triton: 3.4.0 -> 3.5.0 Diff: https://github.com/triton-lang/triton/compare/v3.4.0...v3.5.0 Co-authored-by: "Else, Someone" --- pkgs/by-name/tr/triton-llvm/package.nix | 10 ++- .../0001-_build-allow-extra-cc-flags.patch | 5 +- ...driver-short-circuit-before-ldconfig.patch | 6 +- .../0003-nvidia-cudart-a-systempath.patch | 16 ++--- .../0004-nvidia-allow-static-ptxas-path.patch | 14 ++--- .../triton/0005-amd-search-env-paths.patch | 60 ------------------ .../python-modules/triton/default.nix | 61 +++++++++++-------- 7 files changed, 63 insertions(+), 109 deletions(-) delete mode 100644 pkgs/development/python-modules/triton/0005-amd-search-env-paths.patch diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix index bbe124f2c371..833609e70713 100644 --- a/pkgs/by-name/tr/triton-llvm/package.nix +++ b/pkgs/by-name/tr/triton-llvm/package.nix @@ -25,6 +25,10 @@ buildTests ? true, llvmTargetsToBuild ? [ "NATIVE" ], # "NATIVE" resolves into x86 or aarch64 depending on stdenv llvmProjectsToBuild ? [ + # Required for building triton>=3.5.0 + # https://github.com/triton-lang/triton/blob/c3c476f357f1e9768ea4e45aa5c17528449ab9ef/third_party/amd/CMakeLists.txt#L6 + "lld" + "llvm" "mlir" ], @@ -64,7 +68,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "triton-llvm"; - version = "21.0.0-unstable-2025-06-10"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake + version = "22.0.0-unstable-2025-07-15"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake outputs = [ "out" @@ -80,8 +84,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; - rev = "8957e64a20fc7f4277565c6cfe3e555c119783ce"; - hash = "sha256-ljdwHPLGZv72RBPBg5rs7pZczsB+WJhdCeHJxoi4gJQ="; + rev = "7d5de3033187c8a3bb4d2e322f5462cdaf49808f"; + hash = "sha256-ayW6sOZGvP3SBjfmpXvYQJrPOAElY0MEHPFvj2fq+bM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch index 7b97c7f87b0d..79952183f556 100644 --- a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch +++ b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch @@ -1,8 +1,8 @@ diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py -index 1b76548d4..2756dccdb 100644 +index 7614fe2ae..203db996b 100644 --- a/python/triton/runtime/build.py +++ b/python/triton/runtime/build.py -@@ -33,5 +33,13 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries): +@@ -47,6 +47,14 @@ def _build(name: str, src: str, srcdir: str, library_dirs: list[str], include_di cc_cmd += [f'-l{lib}' for lib in libraries] cc_cmd += [f"-L{dir}" for dir in library_dirs] cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None] @@ -14,5 +14,6 @@ index 1b76548d4..2756dccdb 100644 + import shlex + cc_cmd.extend(shlex.split(cc_cmd_extra_flags)) + + cc_cmd.extend(ccflags) subprocess.check_call(cc_cmd, stdout=subprocess.DEVNULL) return so diff --git a/pkgs/development/python-modules/triton/0002-nvidia-driver-short-circuit-before-ldconfig.patch b/pkgs/development/python-modules/triton/0002-nvidia-driver-short-circuit-before-ldconfig.patch index 13077545d7ef..c8d08eeff93d 100644 --- a/pkgs/development/python-modules/triton/0002-nvidia-driver-short-circuit-before-ldconfig.patch +++ b/pkgs/development/python-modules/triton/0002-nvidia-driver-short-circuit-before-ldconfig.patch @@ -1,14 +1,14 @@ diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py -index d088ec092..625de2db8 100644 +index e6fd6a968..2b39fea29 100644 --- a/third_party/nvidia/backend/driver.py +++ b/third_party/nvidia/backend/driver.py @@ -23,6 +23,9 @@ def libcuda_dirs(): - if env_libcuda_path: + if env_libcuda_path := knobs.nvidia.libcuda_path: return [env_libcuda_path] + if os.path.exists("@libcudaStubsDir@"): + return ["@libcudaStubsDir@"] + - libs = subprocess.check_output(["/sbin/ldconfig", "-p"]).decode() + libs = subprocess.check_output(["/sbin/ldconfig", "-p"]).decode(errors="ignore") # each line looks like the following: # libcuda.so.1 (libc6,x86-64) => /lib/x86_64-linux-gnu/libcuda.so.1 diff --git a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch index 66a757c77466..da5ff0c9de7c 100644 --- a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch +++ b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch @@ -1,5 +1,5 @@ diff --git a/third_party/nvidia/backend/driver.c b/third_party/nvidia/backend/driver.c -index ab24f7657..46dbaceb0 100644 +index bff09d8c1..a5c341711 100644 --- a/third_party/nvidia/backend/driver.c +++ b/third_party/nvidia/backend/driver.c @@ -1,4 +1,4 @@ @@ -7,9 +7,9 @@ index ab24f7657..46dbaceb0 100644 +#include #include #include - #define PY_SSIZE_T_CLEAN + #include diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py -index 47544bd8e..d57c6a70f 100644 +index 2b39fea29..3346eb954 100644 --- a/third_party/nvidia/backend/driver.py +++ b/third_party/nvidia/backend/driver.py @@ -12,7 +12,8 @@ from triton.backends.compiler import GPUTarget @@ -21,13 +21,13 @@ index 47544bd8e..d57c6a70f 100644 +include_dirs = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")] libdevice_dir = os.path.join(dirname, "lib") libraries = ['cuda'] - -@@ -256,7 +257,7 @@ def make_launcher(constants, signature, tensordesc_meta): - params = [f"&arg{i}" for i, ty in signature.items() if ty != "constexpr"] + PyCUtensorMap = None +@@ -265,7 +266,7 @@ def make_launcher(constants, signature, tensordesc_meta): params.append("&global_scratch") + params.append("&profile_scratch") src = f""" -#include \"cuda.h\" +#include - #include - #include #include + #include + #include diff --git a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch index 47c1380af85a..17f13dae2139 100644 --- a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch +++ b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch @@ -1,13 +1,13 @@ diff --git a/python/triton/knobs.py b/python/triton/knobs.py -index 30804b170..c6a3a737d 100644 +index 161f739bd..047b19d69 100644 --- a/python/triton/knobs.py +++ b/python/triton/knobs.py -@@ -203,6 +203,8 @@ class env_nvidia_tool(env_base[str, NvidiaTool]): - # accessible. - self.default(), - ] +@@ -208,6 +208,8 @@ class env_nvidia_tool(env_base[str, NvidiaTool]): + else: + paths = [self.default_path] + + import shlex + paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@")) for path in paths: - if not path or not os.access(path, os.X_OK): - continue + if tool := NvidiaTool.from_path(path): + return tool diff --git a/pkgs/development/python-modules/triton/0005-amd-search-env-paths.patch b/pkgs/development/python-modules/triton/0005-amd-search-env-paths.patch deleted file mode 100644 index 8f46c826c2fd..000000000000 --- a/pkgs/development/python-modules/triton/0005-amd-search-env-paths.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 9e4e58b647c17c5fa098c8a74e221f88d3cb1a43 Mon Sep 17 00:00:00 2001 -From: Luna Nova -Date: Sun, 24 Aug 2025 07:41:30 -0700 -Subject: [PATCH] [AMD] Search HIP_PATH, hipconfig, and ROCM_PATH for - libamdhip64 - -Search for libamdhip64 from HIP_PATH env var, hipconfig --path output, -and ROCM_PATH before looking in system-wide ldconfig or /opt/rocm. - -The system-wide ROCm path isn't guaranteed to be where the ROCm -install we're building against is located, so follow typical ROCm -lib behavior and look under env paths first. - -This is especially important for non-FHS distros like NixOS -where /opt/rocm never exists, but may be useful in more -typical distros if multiple ROCm installs are present -to ensure the right libamdhip64.so is picked up. ---- - third_party/amd/backend/driver.py | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/third_party/amd/backend/driver.py b/third_party/amd/backend/driver.py -index af8e1a5c8097..57b0f7388c60 100644 ---- a/third_party/amd/backend/driver.py -+++ b/third_party/amd/backend/driver.py -@@ -110,6 +110,34 @@ def _get_path_to_hip_runtime_dylib(): - return f - paths.append(f) - -+ # HIP_PATH should point to HIP SDK root if set -+ env_hip_path = os.getenv("HIP_PATH") -+ if env_hip_path: -+ hip_lib_path = os.path.join(env_hip_path, "lib", lib_name) -+ if os.path.exists(hip_lib_path): -+ return hip_lib_path -+ paths.append(hip_lib_path) -+ -+ # if available, `hipconfig --path` prints the HIP SDK root -+ try: -+ hip_root = subprocess.check_output(["hipconfig", "--path"]).decode().strip() -+ if hip_root: -+ hip_lib_path = os.path.join(hip_root, "lib", lib_name) -+ if os.path.exists(hip_lib_path): -+ return hip_lib_path -+ paths.append(hip_lib_path) -+ except (subprocess.CalledProcessError, FileNotFoundError): -+ # hipconfig may not be available -+ pass -+ -+ # ROCm lib dir based on env var -+ env_rocm_path = os.getenv("ROCM_PATH") -+ if env_rocm_path: -+ rocm_lib_path = os.path.join(env_rocm_path, "lib", lib_name) -+ if os.path.exists(rocm_lib_path): -+ return rocm_lib_path -+ paths.append(rocm_lib_path) -+ - # Afterwards try to search the loader dynamic library resolution paths. - libs = subprocess.check_output(["/sbin/ldconfig", "-p"]).decode(errors="ignore") - # each line looks like the following: diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index a8bb1aab043d..aa207c24b23a 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -1,36 +1,49 @@ { lib, - addDriverRunpath, - buildPythonPackage, - cmake, + stdenv, config, - cudaPackages, + buildPythonPackage, fetchFromGitHub, - filelock, - gtest, - libxml2, + + # patches + replaceVars, + addDriverRunpath, + cudaPackages, + + # build-system + setuptools, + + # nativeBuildInputs + cmake, + ninja, lit, llvm, + writableTmpDirAsHomeHook, + + # buildInputs + gtest, + libxml2, ncurses, - ninja, pybind11, + zlib, + + # dependencies + filelock, + + # passthru python, pytestCheckHook, - writableTmpDirAsHomeHook, - stdenv, - replaceVars, - setuptools, torchWithRocm, - zlib, - cudaSupport ? config.cudaSupport, runCommand, - rocmPackages, triton, + rocmPackages, + + cudaSupport ? config.cudaSupport, }: buildPythonPackage rec { pname = "triton"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; # Remember to bump triton-llvm as well! @@ -38,7 +51,7 @@ buildPythonPackage rec { owner = "triton-lang"; repo = "triton"; tag = "v${version}"; - hash = "sha256-78s9ke6UV7Tnx3yCr0QZcVDqQELR4XoGgJY7olNJmjk="; + hash = "sha256-F6T0n37Lbs+B7UHNYzoIQHjNNv3TcMtoXjNrT8ZUlxY="; }; patches = [ @@ -49,8 +62,6 @@ buildPythonPackage rec { libcudaStubsDir = if cudaSupport then "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" else null; }) - # Upstream PR: https://github.com/triton-lang/triton/pull/7959 - ./0005-amd-search-env-paths.patch ] ++ lib.optionals cudaSupport [ (replaceVars ./0003-nvidia-cudart-a-systempath.patch { @@ -88,13 +99,6 @@ buildPythonPackage rec { substituteInPlace cmake/AddTritonUnitTest.cmake \ --replace-fail "include(\''${PROJECT_SOURCE_DIR}/unittest/googletest.cmake)" ""\ --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)" - '' - # Don't use FHS path for ROCm LLD - # Remove this after `[AMD] Use lld library API #7548` makes it into a release - + '' - substituteInPlace third_party/amd/backend/compiler.py \ - --replace-fail 'lld = Path("/opt/rocm/llvm/bin/ld.lld")' \ - "import os;lld = Path(os.getenv('HIP_PATH', '/opt/rocm/')"' + "/llvm/bin/ld.lld")' ''; build-system = [ setuptools ]; @@ -116,6 +120,11 @@ buildPythonPackage rec { cmakeFlags = [ (lib.cmakeFeature "LLVM_SYSPATH" "${llvm}") + + # `find_package` is called with `NO_DEFAULT_PATH` + # https://cmake.org/cmake/help/latest/command/find_package.html + # https://github.com/triton-lang/triton/blob/c3c476f357f1e9768ea4e45aa5c17528449ab9ef/third_party/amd/CMakeLists.txt#L6 + (lib.cmakeFeature "LLD_DIR" "${lib.getLib llvm}") ]; buildInputs = [ From 3a4956750d3ab8fae6e6ea8626d67d2e86ab9431 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Nov 2025 10:23:38 +0000 Subject: [PATCH 2157/2279] python3Packages.triton: cosmetic change of passthru --- .../python-modules/triton/default.nix | 209 ++++++++---------- 1 file changed, 95 insertions(+), 114 deletions(-) diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix index aa207c24b23a..1ce10a4dcafd 100644 --- a/pkgs/development/python-modules/triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -194,135 +194,116 @@ buildPythonPackage rec { "triton.language" ]; - passthru.gpuCheck = stdenv.mkDerivation { - pname = "triton-pytest"; - inherit (triton) version src; + passthru = { + gpuCheck = stdenv.mkDerivation { + pname = "triton-pytest"; + inherit (triton) version src; - requiredSystemFeatures = [ "cuda" ]; + requiredSystemFeatures = [ "cuda" ]; - nativeBuildInputs = [ - (python.withPackages (ps: [ - ps.scipy - ps.torchWithCuda - ps.triton-cuda - ])) - ]; + nativeBuildInputs = [ + (python.withPackages (ps: [ + ps.scipy + ps.torchWithCuda + ps.triton-cuda + ])) + ]; - dontBuild = true; - nativeCheckInputs = [ - pytestCheckHook - writableTmpDirAsHomeHook - ]; + dontBuild = true; + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; - doCheck = true; + doCheck = true; - preCheck = '' - cd python/test/unit - ''; - checkPhase = "pytestCheckPhase"; + preCheck = '' + cd python/test/unit + ''; + checkPhase = "pytestCheckPhase"; - installPhase = "touch $out"; - }; + installPhase = "touch $out"; + }; - passthru.tests = { - # Ultimately, torch is our test suite: - inherit torchWithRocm; + tests = { + # Ultimately, torch is our test suite: + inherit torchWithRocm; - # Test that _get_path_to_hip_runtime_dylib works when ROCm is available at runtime - rocm-libamdhip64-path = - runCommand "triton-rocm-libamdhip64-path-test" - { - buildInputs = [ - triton - python - rocmPackages.clr - ]; - } - '' - python -c " - import os - import triton - path = triton.backends.amd.driver._get_path_to_hip_runtime_dylib() - print(f'libamdhip64 path: {path}') - assert os.path.exists(path) - " && touch $out - ''; + # Test that _get_path_to_hip_runtime_dylib works when ROCm is available at runtime + rocm-libamdhip64-path = + runCommand "triton-rocm-libamdhip64-path-test" + { + buildInputs = [ + triton + python + rocmPackages.clr + ]; + } + '' + python -c " + import os + import triton + path = triton.backends.amd.driver._get_path_to_hip_runtime_dylib() + print(f'libamdhip64 path: {path}') + assert os.path.exists(path) + " && touch $out + ''; - # Test that path_to_rocm_lld works when ROCm is available at runtime - # Remove this after `[AMD] Use lld library API #7548` makes it into a release - rocm-lld-path = - runCommand "triton-rocm-lld-test" - { - buildInputs = [ - triton - python - rocmPackages.clr - ]; - } - '' - python -c " - import os - import triton - path = triton.backends.backends['amd'].compiler.path_to_rocm_lld() - print(f'ROCm LLD path: {path}') - assert os.path.exists(path) - " && touch $out - ''; + # Test as `nix run -f "" python3Packages.triton.tests.axpy-cuda` + # or, using `programs.nix-required-mounts`, as `nix build -f "" python3Packages.triton.tests.axpy-cuda.gpuCheck` + axpy-cuda = + cudaPackages.writeGpuTestPython + { + libraries = ps: [ + ps.triton + ps.torch-no-triton + ]; + } + '' + # Adopted from Philippe Tillet https://triton-lang.org/main/getting-started/tutorials/01-vector-add.html - # Test as `nix run -f "" python3Packages.triton.tests.axpy-cuda` - # or, using `programs.nix-required-mounts`, as `nix build -f "" python3Packages.triton.tests.axpy-cuda.gpuCheck` - axpy-cuda = - cudaPackages.writeGpuTestPython - { - libraries = ps: [ - ps.triton - ps.torch-no-triton - ]; - } - '' - # Adopted from Philippe Tillet https://triton-lang.org/main/getting-started/tutorials/01-vector-add.html + import triton + import triton.language as tl + import torch + import os - import triton - import triton.language as tl - import torch - import os + @triton.jit + def axpy_kernel(n, a: tl.constexpr, x_ptr, y_ptr, out, BLOCK_SIZE: tl.constexpr): + pid = tl.program_id(axis=0) + block_start = pid * BLOCK_SIZE + offsets = block_start + tl.arange(0, BLOCK_SIZE) + mask = offsets < n + x = tl.load(x_ptr + offsets, mask=mask) + y = tl.load(y_ptr + offsets, mask=mask) + output = a * x + y + tl.store(out + offsets, output, mask=mask) - @triton.jit - def axpy_kernel(n, a: tl.constexpr, x_ptr, y_ptr, out, BLOCK_SIZE: tl.constexpr): - pid = tl.program_id(axis=0) - block_start = pid * BLOCK_SIZE - offsets = block_start + tl.arange(0, BLOCK_SIZE) - mask = offsets < n - x = tl.load(x_ptr + offsets, mask=mask) - y = tl.load(y_ptr + offsets, mask=mask) - output = a * x + y - tl.store(out + offsets, output, mask=mask) + def axpy(a, x, y): + output = torch.empty_like(x) + assert x.is_cuda and y.is_cuda and output.is_cuda + n_elements = output.numel() - def axpy(a, x, y): - output = torch.empty_like(x) - assert x.is_cuda and y.is_cuda and output.is_cuda - n_elements = output.numel() + def grid(meta): + return (triton.cdiv(n_elements, meta['BLOCK_SIZE']), ) - def grid(meta): - return (triton.cdiv(n_elements, meta['BLOCK_SIZE']), ) + axpy_kernel[grid](n_elements, a, x, y, output, BLOCK_SIZE=1024) + return output - axpy_kernel[grid](n_elements, a, x, y, output, BLOCK_SIZE=1024) - return output - - if __name__ == "__main__": - if os.environ.get("HOME", None) == "/homeless-shelter": - os.environ["HOME"] = os.environ.get("TMPDIR", "/tmp") - if "CC" not in os.environ: - os.environ["CC"] = "${lib.getExe' cudaPackages.backendStdenv.cc "cc"}" - torch.manual_seed(0) - size = 12345 - x = torch.rand(size, device='cuda') - y = torch.rand(size, device='cuda') - output_torch = 3.14 * x + y - output_triton = axpy(3.14, x, y) - assert output_torch.sub(output_triton).abs().max().item() < 1e-6 - print("Triton axpy: OK") - ''; + if __name__ == "__main__": + if os.environ.get("HOME", None) == "/homeless-shelter": + os.environ["HOME"] = os.environ.get("TMPDIR", "/tmp") + if "CC" not in os.environ: + os.environ["CC"] = "${lib.getExe' cudaPackages.backendStdenv.cc "cc"}" + torch.manual_seed(0) + size = 12345 + x = torch.rand(size, device='cuda') + y = torch.rand(size, device='cuda') + output_torch = 3.14 * x + y + output_triton = axpy(3.14, x, y) + assert output_torch.sub(output_triton).abs().max().item() < 1e-6 + print("Triton axpy: OK") + ''; + }; }; meta = { From 145de628ecd09febbb749ea0cd3087642ea2cf7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 10:56:58 +0000 Subject: [PATCH 2158/2279] namespace-cli: 0.0.447 -> 0.0.448 --- pkgs/by-name/na/namespace-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 4cc28e2f5bae..356c366272b6 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.447"; + version = "0.0.448"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-edof/vP/v1IpqMHT6iw75KLucti6vMbE6VH6HI0KJFE="; + hash = "sha256-7M5rs0SZwEI4g/E1P/A46trA/iaxrb4g68xCFwoee+s="; }; vendorHash = "sha256-bUKtHQcD8wq1VH5plbP8KXt+HXb/FoFKeqw6Ud15ZNw="; From a66eda860aa43e6d0da37ef3ddde91134adaf281 Mon Sep 17 00:00:00 2001 From: Albert Larsan Date: Mon, 10 Nov 2025 11:05:57 +0100 Subject: [PATCH 2159/2279] sdl3: Allow building without windowing protocols It is an explicit choice to disable both x11 and wayland here, so this is not an error. --- pkgs/by-name/sd/sdl3/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 8488b5345258..17a3d9c06860 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -178,7 +178,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDL_TESTS" true) (lib.cmakeBool "SDL_INSTALL_TESTS" true) (lib.cmakeBool "SDL_DEPS_SHARED" false) - ]; + ] + ++ + lib.optionals + ( + stdenv.hostPlatform.isUnix + && !(stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAndroid) + && !(x11Support || waylandSupport) + ) + [ + (lib.cmakeBool "SDL_UNIX_CONSOLE_BUILD" true) + ]; doCheck = true; From 1074781d345dd31d1096121681a897f28edc62e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 11:16:52 +0000 Subject: [PATCH 2160/2279] z3: 4.15.3 -> 4.15.4 --- pkgs/by-name/z3/z3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix index 4d56cbb93755..0ca299fbd846 100644 --- a/pkgs/by-name/z3/z3/package.nix +++ b/pkgs/by-name/z3/z3/package.nix @@ -28,13 +28,13 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "z3"; - version = "4.15.3"; + version = "4.15.4"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; rev = "z3-${finalAttrs.version}"; - hash = "sha256-Lw037Z0t0ySxkgMXkbjNW5CB4QQLRrrSEBsLJqiomZ4="; + hash = "sha256-eyF3ELv81xEgh9Km0Ehwos87e4VJ82cfsp53RCAtuTo="; }; patches = lib.optionals useCmakeBuild [ From 34b571b0f3ea922bb222f54550d196ede2ae87f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 11:23:20 +0000 Subject: [PATCH 2161/2279] renode-dts2repl: 0-unstable-2025-10-31 -> 0-unstable-2025-11-06 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 5c32d6d8d4a1..f893c36b051f 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-10-31"; + version = "0-unstable-2025-11-06"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "fc98e35232d4698f4947037c5b17a6bb9966a43c"; - hash = "sha256-4Mbm+Oc3qkdUXPbqPmnKzuSBS0BtRk3Yw56lDTCZeik="; + rev = "868d264f2cdfc42cf553ac4c2b7bf9729294758c"; + hash = "sha256-7vHZZqn+uy+iZlSnG/CZiBup0KvcfMeBX3CgQJuF4hI="; }; nativeBuildInputs = [ From 2c0052d3a55ff62a58f4c5ca4315e78c90eb9849 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Mon, 10 Nov 2025 15:42:12 +0330 Subject: [PATCH 2162/2279] lms: 3.69.0 -> 3.71.0 --- pkgs/by-name/lm/lms/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 4e7396556007..a72749076183 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -18,17 +18,18 @@ stb, openssl, xxHash, + pugixml, }: stdenv.mkDerivation rec { pname = "lms"; - version = "3.69.0"; + version = "3.71.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-fdsKNicBcdUoxFLYg8Lq1KFZub1P3pt2rOKQ/1V2VtU="; + hash = "sha256-Bla4GmVbBJl/wjaD/CLnlvR/xMrTRwAlVODyMBkxzhw="; }; strictDeps = true; @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { stb openssl xxHash + pugixml ]; postPatch = '' From 3f5a60fbb9b5219a9e4be6fde0ac00f8da217b91 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Nov 2025 09:19:59 +0000 Subject: [PATCH 2163/2279] ucx: fix with cudaSupport --- pkgs/by-name/uc/ucx/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix index aecefb06fd48..570ea4737645 100644 --- a/pkgs/by-name/uc/ucx/package.nix +++ b/pkgs/by-name/uc/ucx/package.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-n3xJmbvUXZzfhotOBJRyH2OEL4NFZIKyB808HwEQSYo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-n3xJmbvUXZzfhotOBJRyH2OEL4NFZIKyB808HwEQSYo="; }; outputs = [ @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart + cudaPackages.cuda_nvcc cudaPackages.cuda_nvml_dev ] @@ -102,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-verbs=${lib.getDev rdma-core}" ] ++ lib.optionals enableCuda [ "--with-cuda=${cudaPackages.cuda_cudart}" ] - ++ lib.optional enableRocm "--with-rocm=${rocm}"; + ++ lib.optionals enableRocm [ "--with-rocm=${rocm}" ]; postInstall = '' find $out/lib/ -name "*.la" -exec rm -f \{} \; From 40ac150b3048c0a59ccb286cb91c7cf541e0fc36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 12:31:04 +0000 Subject: [PATCH 2164/2279] fcitx5-pinyin-moegirl: 20251009 -> 20251109 --- pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 1f1677e9910c..c127ad6d1e88 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20251009"; + version = "20251109"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-s8i1eZrupWSSmgi52uhHLggtn5ZtoDFwMtJeZDw/znI="; + hash = "sha256-BqioFALa1ZjMVCWgT9PdTHK0/YqipOFiNhn+Pn+TQc4="; }; dontUnpack = true; From 0c401e4717cd4ffd58bc1df607d8a1dd7e7720a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 12:35:22 +0000 Subject: [PATCH 2165/2279] whisper-ctranslate2: 0.5.4 -> 0.5.5 --- pkgs/by-name/wh/whisper-ctranslate2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix index fe0f5e135728..7f03d7727831 100644 --- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix +++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix @@ -8,7 +8,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.5.4"; + version = "0.5.5"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; tag = version; - hash = "sha256-FunrxIZaKecn2g2ZZ9aBN8IMqwfJG2oEQyH8lv7Tjzo="; + hash = "sha256-YK7PoZwu7kB2rxA14iTeWyy+Ya5/eoxq0c8DKb4UCT4="; }; build-system = [ python3Packages.setuptools ]; From 034ceb0c782c3dd06d133f31de6230709a6931d0 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 10 Nov 2025 11:21:38 +0100 Subject: [PATCH 2166/2279] electron-chromedriver_35: remove --- .../development/tools/electron/chromedriver/info.json | 11 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 35116c365d38..22b0fec00ad2 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -1,15 +1,4 @@ { - "35": { - "hashes": { - "aarch64-darwin": "9559c7dd0f59b4f9949ce982d589079123b6a1f0677fd7c2260473120e73d487", - "aarch64-linux": "ab98b00e04b7f86e9f7ea8d79ab00cb317e4e3f75501e7257702510979443dbc", - "armv7l-linux": "0fe5eb017c99d8b7727797595957907a9050a773ff1dc6aa1a7184a603235bfc", - "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59", - "x86_64-darwin": "19911b618f920d21244d8ea3c5ea33aea94ac6155ba88952f2846fb366798997", - "x86_64-linux": "f6a0a3850fc1b63ded8d5bf1ec70308c6ee99f3bc8133d628167bb1ae6afe990" - }, - "version": "35.7.5" - }, "36": { "hashes": { "aarch64-darwin": "ad47b3386cf39ed2dfc830d4806850b784a4939a9ca132055a5b1a11f8a88835", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 930bcec70e97..388b8e9d8751 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -521,6 +521,7 @@ mapAliases { edid-decode = v4l-utils; # Added 2025-06-20 eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28 eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27 + electron-chromedriver_35 = throw "electron-chromedriver_35 has been removed in favor of newer versions"; # added 2025-11-10 electron_35 = throw "electron_35 has been removed in favor of newer versions"; # added 2025-11-06 electron_35-bin = throw "electron_35-bin has been removed in favor of newer versions"; # added 2025-11-06 elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 595f98e9eb3d..949198d461ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6091,7 +6091,6 @@ with pkgs; ; inherit (callPackages ../development/tools/electron/chromedriver { }) - electron-chromedriver_35 electron-chromedriver_36 electron-chromedriver_37 electron-chromedriver_38 From 1974ddaa3b251de56832923bc90dc456e4a5918e Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Fri, 7 Nov 2025 16:20:05 -0400 Subject: [PATCH 2167/2279] pds: init at 6.55 --- pkgs/by-name/oc/ocaml-pds/package.nix | 69 +++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/oc/ocaml-pds/package.nix diff --git a/pkgs/by-name/oc/ocaml-pds/package.nix b/pkgs/by-name/oc/ocaml-pds/package.nix new file mode 100644 index 000000000000..94044e2d261b --- /dev/null +++ b/pkgs/by-name/oc/ocaml-pds/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchhg, + ocaml, + ocaml-crunch, + ocamlPackages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ocaml-pds"; + version = "6.55"; + + src = fetchhg { + url = "https://hg.sr.ht/~mmatalka/pds"; + rev = finalAttrs.version; + sha256 = "sha256-a6sMFzAwqLsLOq75JTyFxZiXuQvmOZG0bPzPehzLcws="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + ocaml + ocaml-crunch + ocamlPackages.findlib + ]; + + buildInputs = with ocamlPackages; [ + cmdliner + containers + crunch + fmt + logs + ppx_deriving + process + sedlex + toml + ocaml_sqlite3 + ]; + + buildFlags = [ "all" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/pds --help + runHook postInstallCheck + ''; + + meta = with lib; { + description = "A tool to build Makefiles for OCaml projects"; + longDescription = '' + pds is a build system for Ocaml that is meant to make it easy to build a project that follows a particular layout by generating a makefile for the project. The input to pds is a config file, pds.conf, and a directory structure, which is always the current working directory, and the output is the build description. + ''; + homepage = "https://hg.sr.ht/~mmatalka/pds"; + changelog = "https://hg.sr.ht/~mmatalka/pds#changelog"; + license = licenses.bsd3; + maintainers = with maintainers; [ mtrsk ]; + platforms = ocaml.meta.platforms; + }; +}) From 9434ccf3ca9e0897a54944e7f8aaa26bf48d8a33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 13:01:11 +0000 Subject: [PATCH 2168/2279] tanka: 0.35.0 -> 0.36.0 --- pkgs/by-name/ta/tanka/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 9a1bb8c44f53..739aef740e99 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tanka"; rev = "v${version}"; - sha256 = "sha256-Jghw2KfHNl2VoGQYE/kadvcgXMIVP9SOsvT2ltWrQSs="; + sha256 = "sha256-UsmeVLCgZeNRoqOYwbwIzWCFtLDgXyojNzA63VvBTc8="; }; - vendorHash = "sha256-rms/aUchtcjsjeS51SB2eKPOTRoYOLDGbrmhRld6gUo="; + vendorHash = "sha256-jXIDECIW9xnct8bAxsvoMGpdwZuKCLCuCbuTM2dgXik="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK From 14754a36373c98181f165e9670a4b092f8dba4fb Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Mon, 10 Nov 2025 14:08:35 +0100 Subject: [PATCH 2169/2279] maintainers: update jolars Update the e-mail address for maintainer jolars. --- 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 a472f1c904eb..fc64b4ff8165 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12577,7 +12577,7 @@ name = "Ioannis Koutras"; }; jolars = { - email = "jolars@posteo.com"; + email = "johan@jolars.co"; matrix = "@jola:mozilla.org"; github = "jolars"; githubId = 13087841; From c671fd8ccb7a514c9c520859421357cab4b50573 Mon Sep 17 00:00:00 2001 From: Alexandru Tocar Date: Mon, 10 Nov 2025 14:23:09 +0100 Subject: [PATCH 2170/2279] maintainers: update alexandrutocar --- maintainers/maintainer-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ef067bbd57e..9d595ea0a4a5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1156,10 +1156,11 @@ name = "Alexandru Nechita"; }; alexandrutocar = { - email = "at@myquiet.place"; + email = "alexandru.tocar@outlook.com"; github = "alexandrutocar"; githubId = 65486851; name = "Alexandru Tocar"; + keys = [ { fingerprint = "B617 DD24 3AB0 2E3F 2E67 DBFD 1305 2A85 D7A4 2AA4"; } ]; }; alexarice = { email = "alexrice999@hotmail.co.uk"; From fba21b3d2240767ef469dfec51d3284a31fcb137 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Mon, 10 Nov 2025 10:08:29 -0300 Subject: [PATCH 2171/2279] treewide: remove iedame --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/graphics/xournalpp/default.nix | 5 +---- pkgs/applications/misc/lutris/default.nix | 5 +---- .../science/electronics/librepcb/default.nix | 1 - pkgs/applications/science/misc/vite/default.nix | 2 +- pkgs/by-name/_1/_1password-cli/package.nix | 1 - pkgs/by-name/_1/_1password-gui/package.nix | 1 - pkgs/by-name/ad/adwsteamgtk/package.nix | 5 +---- pkgs/by-name/al/alure/package.nix | 2 +- pkgs/by-name/ap/appcleaner/package.nix | 5 +---- pkgs/by-name/ar/aranym/package.nix | 2 +- pkgs/by-name/ar/arduino-ide/package.nix | 5 +---- pkgs/by-name/ba/backrest/package.nix | 2 +- pkgs/by-name/bb/bbedit/package.nix | 2 +- pkgs/by-name/bl/bloodspilot-client/package.nix | 5 +---- pkgs/by-name/bl/bloodspilot-server/package.nix | 5 +---- pkgs/by-name/bo/bolt-launcher/package.nix | 1 - pkgs/by-name/bo/borgbackup/package.nix | 1 - pkgs/by-name/cu/cutechess/package.nix | 2 +- pkgs/by-name/cu/cutemaze/package.nix | 5 +---- pkgs/by-name/cy/cyberduck/package.nix | 1 - pkgs/by-name/en/ente-auth/package.nix | 1 - pkgs/by-name/en/ente-cli/package.nix | 5 +---- pkgs/by-name/en/ente-desktop/package.nix | 1 - pkgs/by-name/en/ente-web/package.nix | 1 - pkgs/by-name/fa/fallout-ce/package.nix | 5 +---- pkgs/by-name/fa/fallout2-ce/package.nix | 5 +---- pkgs/by-name/ff/fflogs/package.nix | 5 +---- pkgs/by-name/fi/filezilla/package.nix | 5 +---- pkgs/by-name/fl/flightgear/package.nix | 5 +---- pkgs/by-name/fr/freedink/package.nix | 2 +- pkgs/by-name/fr/freeorion/package.nix | 2 +- pkgs/by-name/fr/fritzing/package.nix | 1 - pkgs/by-name/ga/garden-of-coloured-lights/package.nix | 2 +- pkgs/by-name/ge/geogebra/package.nix | 1 - pkgs/by-name/ge/geogebra6/package.nix | 1 - pkgs/by-name/ge/getdp/package.nix | 2 +- pkgs/by-name/gh/ghostscript/package.nix | 5 +---- pkgs/by-name/gm/gmsh/package.nix | 2 +- pkgs/by-name/go/gogdl/package.nix | 2 +- pkgs/by-name/he/heroic-unwrapped/epic-integration.nix | 2 +- pkgs/by-name/he/heroic-unwrapped/legendary.nix | 2 +- pkgs/by-name/he/heroic-unwrapped/package.nix | 2 +- pkgs/by-name/is/istat-menus/package.nix | 5 +---- pkgs/by-name/it/itsycal/package.nix | 5 +---- pkgs/by-name/ke/keka/package.nix | 5 +---- pkgs/by-name/li/libfilezilla/package.nix | 5 +---- pkgs/by-name/li/lincity-ng/package.nix | 5 +---- pkgs/by-name/li/lincity/package.nix | 2 +- pkgs/by-name/lu/ludusavi/package.nix | 1 - pkgs/by-name/lu/lugaru/package.nix | 2 +- pkgs/by-name/me/megasync/package.nix | 2 +- pkgs/by-name/mi/microsoft-edge/package.nix | 1 - pkgs/by-name/mo/mountain-duck/package.nix | 5 +---- pkgs/by-name/mt/mtpaint/package.nix | 2 +- pkgs/by-name/mu/museum/package.nix | 1 - pkgs/by-name/ne/nethack/package.nix | 2 +- pkgs/by-name/nv/nvd/package.nix | 5 +---- pkgs/by-name/op/openlierox/package.nix | 5 +---- pkgs/by-name/op/opensurge/package.nix | 2 +- pkgs/by-name/pg/pgbackrest/package.nix | 5 +---- pkgs/by-name/po/podman-tui/package.nix | 2 +- pkgs/by-name/po/pomodoro-gtk/package.nix | 5 +---- pkgs/by-name/pr/pro-office-calculator/package.nix | 5 +---- pkgs/by-name/ra/rare/package.nix | 2 +- pkgs/by-name/ri/ringracers/package.nix | 5 +---- pkgs/by-name/ro/robodoc/package.nix | 2 +- pkgs/by-name/ru/runescape/package.nix | 10 ++-------- pkgs/by-name/sc/scanmem/package.nix | 2 +- pkgs/by-name/sg/sgt-puzzles/package.nix | 1 - pkgs/by-name/si/simulide/package.nix | 1 - pkgs/by-name/sl/sloth-app/package.nix | 5 +---- pkgs/by-name/sp/spotify/darwin.nix | 1 - pkgs/by-name/st/stats/package.nix | 1 - pkgs/by-name/ty/typioca/package.nix | 2 +- pkgs/by-name/un/unciv/package.nix | 2 +- pkgs/by-name/vo/vorta/package.nix | 5 +---- pkgs/by-name/we/wesnoth/package.nix | 5 +---- pkgs/by-name/xp/xpilot-ng/package.nix | 5 +---- pkgs/development/python-modules/img2pdf/default.nix | 1 - 80 files changed, 60 insertions(+), 185 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ef067bbd57e..02937fdc2279 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10840,12 +10840,6 @@ githubId = 1550265; name = "Dominic Steinitz"; }; - iedame = { - email = "git@ieda.me"; - github = "iedame"; - githubId = 60272; - name = "Rafael Ieda"; - }; if-loop69420 = { github = "if-loop69420"; githubId = 81078181; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 0d1eb3e9bab3..a64f5fee2efa 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -84,10 +84,7 @@ stdenv.mkDerivation rec { homepage = "https://xournalpp.github.io/"; changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - sikmir - iedame - ]; + maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; mainProgram = "xournalpp"; }; diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 0db487ac04c3..695e27216873 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -155,10 +155,7 @@ buildPythonApplication rec { homepage = "https://lutris.net"; description = "Open Source gaming platform for GNU/Linux"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - rapiteanu - iedame - ]; + maintainers = with maintainers; [ rapiteanu ]; platforms = platforms.linux; mainProgram = "lutris"; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index aade996079f6..4beee81b114d 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ luz thoughtpolice - iedame ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 956cf1f81569..1bdabe3875d6 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://vite.gforge.inria.fr/"; license = lib.licenses.cecill20; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 67ea511875f7..203aac1dbe54 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ joelburget khaneliman - iedame ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix index 5d16e783a215..f942a934d246 100644 --- a/pkgs/by-name/_1/_1password-gui/package.nix +++ b/pkgs/by-name/_1/_1password-gui/package.nix @@ -35,7 +35,6 @@ let timstott sebtm bdd - iedame ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/ad/adwsteamgtk/package.nix b/pkgs/by-name/ad/adwsteamgtk/package.nix index ea511de07ff4..870949986859 100644 --- a/pkgs/by-name/ad/adwsteamgtk/package.nix +++ b/pkgs/by-name/ad/adwsteamgtk/package.nix @@ -46,10 +46,7 @@ python3Packages.buildPythonApplication rec { description = "Simple Gtk wrapper for Adwaita-for-Steam"; homepage = "https://github.com/Foldex/AdwSteamGtk"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - reedrw - iedame - ]; + maintainers = with lib.maintainers; [ reedrw ]; mainProgram = "adwaita-steam-gtk"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/al/alure/package.nix b/pkgs/by-name/al/alure/package.nix index 8dc838ea4ced..902de43b04d9 100644 --- a/pkgs/by-name/al/alure/package.nix +++ b/pkgs/by-name/al/alure/package.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/kcat/alure"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ap/appcleaner/package.nix b/pkgs/by-name/ap/appcleaner/package.nix index c353691274a7..d84f642a9bc3 100644 --- a/pkgs/by-name/ap/appcleaner/package.nix +++ b/pkgs/by-name/ap/appcleaner/package.nix @@ -30,10 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://freemacsoft.net/appcleaner"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ - emilytrau - iedame - ]; + maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 23a8155b79bb..627790626b4d 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "aranym"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.unix; # never successfully built on Hydra for darwin or aarch64 linux broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index 76b6d956d922..10ef56583a6d 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -32,10 +32,7 @@ appimageTools.wrapType2 { changelog = "https://github.com/arduino/arduino-ide/releases/tag/${version}"; license = lib.licenses.agpl3Only; mainProgram = "arduino-ide"; - maintainers = with lib.maintainers; [ - clerie - iedame - ]; + maintainers = with lib.maintainers; [ clerie ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 2a4f0b1a5f8b..6f3d0906dc40 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -119,7 +119,7 @@ buildGoModule { homepage = "https://github.com/garethgeorge/backrest"; changelog = "https://github.com/garethgeorge/backrest/releases/tag/v${version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "backrest"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix index 2c39f1e6ca57..948111ed505b 100644 --- a/pkgs/by-name/bb/bbedit/package.nix +++ b/pkgs/by-name/bb/bbedit/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Powerful and full-featured professional HTML and text editor for macOS"; homepage = "https://www.barebones.com/products/bbedit/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/bl/bloodspilot-client/package.nix b/pkgs/by-name/bl/bloodspilot-client/package.nix index a6396e8aaad3..7436908119bb 100644 --- a/pkgs/by-name/bl/bloodspilot-client/package.nix +++ b/pkgs/by-name/bl/bloodspilot-client/package.nix @@ -41,10 +41,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "bloodspilot-client-sdl"; homepage = "http://bloodspilot.sf.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - raskin - iedame - ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bl/bloodspilot-server/package.nix b/pkgs/by-name/bl/bloodspilot-server/package.nix index d7991a6a5e58..bae259847895 100644 --- a/pkgs/by-name/bl/bloodspilot-server/package.nix +++ b/pkgs/by-name/bl/bloodspilot-server/package.nix @@ -28,10 +28,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xpilots"; homepage = "http://bloodspilot.sf.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - raskin - iedame - ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index e9a0f451b99d..81f60521132d 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -155,7 +155,6 @@ buildFHSEnv { maintainers = with lib.maintainers; [ nezia jaspersurmont - iedame ]; platforms = lib.platforms.linux; mainProgram = "${bolt.name}"; diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index be12bcedeedd..d37d9e471bba 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -153,7 +153,6 @@ python.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ dotlambda globin - iedame ]; }; } diff --git a/pkgs/by-name/cu/cutechess/package.nix b/pkgs/by-name/cu/cutechess/package.nix index cac459a1656d..01156db18db4 100644 --- a/pkgs/by-name/cu/cutechess/package.nix +++ b/pkgs/by-name/cu/cutechess/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { description = "GUI, CLI, and library for playing chess"; homepage = "https://cutechess.com/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = with lib.platforms; (linux ++ windows); mainProgram = "cutechess"; }; diff --git a/pkgs/by-name/cu/cutemaze/package.nix b/pkgs/by-name/cu/cutemaze/package.nix index 7569510e6dfd..6af04d14ba57 100644 --- a/pkgs/by-name/cu/cutemaze/package.nix +++ b/pkgs/by-name/cu/cutemaze/package.nix @@ -49,10 +49,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cutemaze"; homepage = "https://gottcode.org/cutemaze/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - dotlambda - iedame - ]; + maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cy/cyberduck/package.nix b/pkgs/by-name/cy/cyberduck/package.nix index cc77e28457b8..8ec704005524 100644 --- a/pkgs/by-name/cy/cyberduck/package.nix +++ b/pkgs/by-name/cy/cyberduck/package.nix @@ -53,7 +53,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ emilytrau DimitarNestorov - iedame ]; platforms = lib.platforms.darwin; mainProgram = "cyberduck"; diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 952e0458bb9e..447e285135ab 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -114,7 +114,6 @@ flutter332.buildFlutterApplication rec { schnow265 zi3m5f gepbird - iedame ]; mainProgram = "enteauth"; platforms = [ diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 72bcdd88444b..a4e5a7994861 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -86,10 +86,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/ente-io/ente/tree/main/cli#readme"; changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${finalAttrs.version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ - zi3m5f - iedame - ]; + maintainers = with lib.maintainers; [ zi3m5f ]; mainProgram = "ente"; }; }) diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix index 679e230e52cf..b1c4c9af23e9 100644 --- a/pkgs/by-name/en/ente-desktop/package.nix +++ b/pkgs/by-name/en/ente-desktop/package.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ pinpox yuka - iedame ]; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix index 64b3d99025fe..0f8dc49f68b2 100644 --- a/pkgs/by-name/en/ente-web/package.nix +++ b/pkgs/by-name/en/ente-web/package.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ pinpox oddlama - iedame ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fa/fallout-ce/package.nix b/pkgs/by-name/fa/fallout-ce/package.nix index ea5bdbe4dc82..f78478764167 100644 --- a/pkgs/by-name/fa/fallout-ce/package.nix +++ b/pkgs/by-name/fa/fallout-ce/package.nix @@ -94,10 +94,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/alexbatalov/fallout1-ce"; license = lib.licenses.sustainableUse; - maintainers = with lib.maintainers; [ - hughobrien - iedame - ]; + maintainers = with lib.maintainers; [ hughobrien ]; platforms = lib.platforms.linux; mainProgram = "fallout-ce"; }; diff --git a/pkgs/by-name/fa/fallout2-ce/package.nix b/pkgs/by-name/fa/fallout2-ce/package.nix index 202060bdd73d..befcd331fa73 100644 --- a/pkgs/by-name/fa/fallout2-ce/package.nix +++ b/pkgs/by-name/fa/fallout2-ce/package.nix @@ -98,10 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/alexbatalov/fallout2-ce"; license = lib.licenses.sustainableUse; - maintainers = with lib.maintainers; [ - hughobrien - iedame - ]; + maintainers = with lib.maintainers; [ hughobrien ]; platforms = lib.platforms.linux; mainProgram = "fallout2-ce"; }; diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 8217a17819ff..8cb23a6b8a53 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -32,10 +32,7 @@ appimageTools.wrapType2 { license = licenses.unfree; # no license listed mainProgram = "fflogs"; platforms = platforms.linux; - maintainers = with maintainers; [ - keysmashes - iedame - ]; + maintainers = with maintainers; [ keysmashes ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix index 6f481421e95d..951112e82be5 100644 --- a/pkgs/by-name/fi/filezilla/package.nix +++ b/pkgs/by-name/fi/filezilla/package.nix @@ -70,9 +70,6 @@ stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ - pSub - iedame - ]; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 056b3269774a..e7dff70ac77d 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -106,10 +106,7 @@ stdenv.mkDerivation rec { meta = { description = "Flight simulator"; - maintainers = with lib.maintainers; [ - raskin - iedame - ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; hydraPlatforms = [ ]; # disabled from hydra because it's so big license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/fr/freedink/package.nix b/pkgs/by-name/fr/freedink/package.nix index 403987aa189c..3917d5cc78ac 100644 --- a/pkgs/by-name/fr/freedink/package.nix +++ b/pkgs/by-name/fr/freedink/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gnu.org/software/freedink/"; # Formerly http://www.freedink.org license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "freedink"; }; diff --git a/pkgs/by-name/fr/freeorion/package.nix b/pkgs/by-name/fr/freeorion/package.nix index b825fa1cde31..8e33e5d72d69 100644 --- a/pkgs/by-name/fr/freeorion/package.nix +++ b/pkgs/by-name/fr/freeorion/package.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: { cc-by-sa-30 ]; platforms = platforms.linux; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/fr/fritzing/package.nix b/pkgs/by-name/fr/fritzing/package.nix index 17bdcf72565f..92ed4b12e155 100644 --- a/pkgs/by-name/fr/fritzing/package.nix +++ b/pkgs/by-name/fr/fritzing/package.nix @@ -132,7 +132,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ robberer muscaln - iedame ]; platforms = lib.platforms.unix; mainProgram = "Fritzing"; diff --git a/pkgs/by-name/ga/garden-of-coloured-lights/package.nix b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix index a851110e7e12..4ad230655160 100644 --- a/pkgs/by-name/ga/garden-of-coloured-lights/package.nix +++ b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Old-school vertical shoot-em-up / bullet hell"; mainProgram = "garden"; homepage = "https://sourceforge.net/projects/garden/"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; license = lib.licenses.gpl3; }; }) diff --git a/pkgs/by-name/ge/geogebra/package.nix b/pkgs/by-name/ge/geogebra/package.nix index 00e8f159e7f5..af4dec8c0c3d 100644 --- a/pkgs/by-name/ge/geogebra/package.nix +++ b/pkgs/by-name/ge/geogebra/package.nix @@ -48,7 +48,6 @@ let maintainers = with maintainers; [ sikmir soupglasses - iedame ]; license = with licenses; [ gpl3 diff --git a/pkgs/by-name/ge/geogebra6/package.nix b/pkgs/by-name/ge/geogebra6/package.nix index ce76216cf6bc..3f9b349401b1 100644 --- a/pkgs/by-name/ge/geogebra6/package.nix +++ b/pkgs/by-name/ge/geogebra6/package.nix @@ -25,7 +25,6 @@ let maintainers = with maintainers; [ voidless sikmir - iedame ]; license = licenses.geogebra; sourceProvenance = with sourceTypes; [ diff --git a/pkgs/by-name/ge/getdp/package.nix b/pkgs/by-name/ge/getdp/package.nix index 2fc9925b416a..38b4807c8fa8 100644 --- a/pkgs/by-name/ge/getdp/package.nix +++ b/pkgs/by-name/ge/getdp/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ''; homepage = "http://getdp.info/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 38b90bc90cd6..72b8d217748e 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -247,10 +247,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - tobim - iedame - ]; + maintainers = with lib.maintainers; [ tobim ]; mainProgram = "gs"; }; } diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index c27b128b153d..1b7b9655a6b7 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gmsh.info/"; changelog = "https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_${lib.concatStringsSep "_" (lib.versions.splitVersion finalAttrs.version)}#changelog"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 89485c76662a..d553563a35c4 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { mainProgram = "gogdl"; homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ iedame ]; + maintainers = [ ]; }; # Upstream no longer create git tags when bumping the version, so we have to diff --git a/pkgs/by-name/he/heroic-unwrapped/epic-integration.nix b/pkgs/by-name/he/heroic-unwrapped/epic-integration.nix index bcd6f7f1dd28..a5c9d6cf59ce 100644 --- a/pkgs/by-name/he/heroic-unwrapped/epic-integration.nix +++ b/pkgs/by-name/he/heroic-unwrapped/epic-integration.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Etaash-mathamsetty/heroic-epic-integration"; changelog = "https://github.com/Etaash-mathamsetty/heroic-epic-integration/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/he/heroic-unwrapped/legendary.nix b/pkgs/by-name/he/heroic-unwrapped/legendary.nix index 7e9aca05af29..8d272d5d306c 100644 --- a/pkgs/by-name/he/heroic-unwrapped/legendary.nix +++ b/pkgs/by-name/he/heroic-unwrapped/legendary.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication { ''; homepage = "https://github.com/Heroic-Games-Launcher/legendary"; license = licenses.gpl3; - maintainers = with maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "legendary"; }; diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 40ddf2d279fa..67449b132c17 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher"; changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform. # It may also work on other Linux targets, but all the game stores only # support x86 Linux, so it would require extra hacking to run games via QEMU diff --git a/pkgs/by-name/is/istat-menus/package.nix b/pkgs/by-name/is/istat-menus/package.nix index 735c129521f1..b01cbd3a3755 100644 --- a/pkgs/by-name/is/istat-menus/package.nix +++ b/pkgs/by-name/is/istat-menus/package.nix @@ -48,10 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac"; homepage = "https://bjango.com/mac/istatmenus/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ - FlameFlag - iedame - ]; + maintainers = with lib.maintainers; [ FlameFlag ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix index 2f6c0ad48f17..a2473445bedf 100644 --- a/pkgs/by-name/it/itsycal/package.nix +++ b/pkgs/by-name/it/itsycal/package.nix @@ -31,10 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Tiny menu bar calendar"; homepage = "https://www.mowglii.com/itsycal/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - FlameFlag - iedame - ]; + maintainers = with lib.maintainers; [ FlameFlag ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index 82c36600c333..fcea35e15e49 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -31,10 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ - emilytrau - iedame - ]; + maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/li/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix index f9bb201a5a44..2e13cea6a997 100644 --- a/pkgs/by-name/li/libfilezilla/package.nix +++ b/pkgs/by-name/li/libfilezilla/package.nix @@ -42,10 +42,7 @@ stdenv.mkDerivation { homepage = "https://lib.filezilla-project.org/"; description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - pSub - iedame - ]; + maintainers = with maintainers; [ pSub ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/li/lincity-ng/package.nix b/pkgs/by-name/li/lincity-ng/package.nix index 734b8868105c..bf18626698d7 100644 --- a/pkgs/by-name/li/lincity-ng/package.nix +++ b/pkgs/by-name/li/lincity-ng/package.nix @@ -77,10 +77,7 @@ stdenv.mkDerivation (finalAttrs: { description = "City building game"; mainProgram = "lincity-ng"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - raskin - iedame - ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix index 571a59053726..5b49bb1feb20 100644 --- a/pkgs/by-name/li/lincity/package.nix +++ b/pkgs/by-name/li/lincity/package.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xlincity"; license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/lincity"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index b1d4711ff5f0..acc6dc154f3e 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -125,7 +125,6 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ pasqui23 megheaiulian - iedame ]; mainProgram = "ludusavi"; }; diff --git a/pkgs/by-name/lu/lugaru/package.nix b/pkgs/by-name/lu/lugaru/package.nix index 3481c6380883..e32937a32d13 100644 --- a/pkgs/by-name/lu/lugaru/package.nix +++ b/pkgs/by-name/lu/lugaru/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { description = "Third person ninja rabbit fighting game"; mainProgram = "lugaru"; homepage = "https://osslugaru.gitlab.io"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix index 6142a59e7c35..e3d6054f6554 100644 --- a/pkgs/by-name/me/megasync/package.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { "i686-linux" "x86_64-linux" ]; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "megasync"; }; }) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 35b07f7afe98..0c07af51a6d3 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -274,7 +274,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { leleuvilela bricklou jonhermansen - iedame ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mo/mountain-duck/package.nix b/pkgs/by-name/mo/mountain-duck/package.nix index b2c928db3105..e1a73025e404 100644 --- a/pkgs/by-name/mo/mountain-duck/package.nix +++ b/pkgs/by-name/mo/mountain-duck/package.nix @@ -30,10 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://mountainduck.io"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ - emilytrau - iedame - ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix index 8bddf23e71db..8d42cd38b305 100644 --- a/pkgs/by-name/mt/mtpaint/package.nix +++ b/pkgs/by-name/mt/mtpaint/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "mtpaint"; }; } diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 2a6d2cb31a2b..360818d02c08 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -61,7 +61,6 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ pinpox oddlama - iedame ]; mainProgram = "museum"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix index db5b8c7b01c5..40e0e2e301d0 100644 --- a/pkgs/by-name/ne/nethack/package.nix +++ b/pkgs/by-name/ne/nethack/package.nix @@ -236,7 +236,7 @@ stdenvUsed.mkDerivation (finalAttrs: { homepage = "http://nethack.org/"; license = lib.licenses.ngpl; platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "nethack"; broken = if qtMode then stdenv.hostPlatform.isDarwin else false; }; diff --git a/pkgs/by-name/nv/nvd/package.nix b/pkgs/by-name/nv/nvd/package.nix index d42e74f36d33..2cc7afa9f97e 100644 --- a/pkgs/by-name/nv/nvd/package.nix +++ b/pkgs/by-name/nv/nvd/package.nix @@ -37,10 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://khumba.net/projects/nvd"; license = lib.licenses.asl20; mainProgram = "nvd"; - maintainers = with lib.maintainers; [ - khumba - iedame - ]; + maintainers = with lib.maintainers; [ khumba ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix index c1436871f4b4..471d8986e18a 100644 --- a/pkgs/by-name/op/openlierox/package.nix +++ b/pkgs/by-name/op/openlierox/package.nix @@ -82,10 +82,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://openlierox.net"; license = lib.licenses.lgpl2Plus; mainProgram = "openlierox"; - maintainers = with lib.maintainers; [ - tomasajt - iedame - ]; + maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix index 0088113e1d0c..9b3294882af6 100644 --- a/pkgs/by-name/op/opensurge/package.nix +++ b/pkgs/by-name/op/opensurge/package.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix index 4b5ebce7beb8..8fb4765760dc 100644 --- a/pkgs/by-name/pg/pgbackrest/package.nix +++ b/pkgs/by-name/pg/pgbackrest/package.nix @@ -58,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/pgbackrest/pgbackrest/releases/tag/release%2F${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "pgbackrest"; - maintainers = with lib.maintainers; [ - zaninime - iedame - ]; + maintainers = with lib.maintainers; [ zaninime ]; }; }) diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index f793403ea8ba..42b5c2cb6d13 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -55,7 +55,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/containers/podman-tui"; description = "Podman Terminal UI"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "podman-tui"; }; }) diff --git a/pkgs/by-name/po/pomodoro-gtk/package.nix b/pkgs/by-name/po/pomodoro-gtk/package.nix index 9f0686ff4e6b..e31da5221375 100644 --- a/pkgs/by-name/po/pomodoro-gtk/package.nix +++ b/pkgs/by-name/po/pomodoro-gtk/package.nix @@ -58,10 +58,7 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/idevecore/pomodoro"; license = lib.licenses.gpl3Plus; mainProgram = "pomodoro"; - maintainers = with lib.maintainers; [ - aleksana - iedame - ]; + maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/pr/pro-office-calculator/package.nix b/pkgs/by-name/pr/pro-office-calculator/package.nix index d423abb0238b..05e5f044009a 100644 --- a/pkgs/by-name/pr/pro-office-calculator/package.nix +++ b/pkgs/by-name/pr/pro-office-calculator/package.nix @@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Completely normal office calculator"; mainProgram = "procalc"; homepage = "https://proofficecalculator.com/"; - maintainers = with lib.maintainers; [ - pmiddend - iedame - ]; + maintainers = with lib.maintainers; [ pmiddend ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3Only; }; diff --git a/pkgs/by-name/ra/rare/package.nix b/pkgs/by-name/ra/rare/package.nix index c4579d0b4047..17946ca8e507 100644 --- a/pkgs/by-name/ra/rare/package.nix +++ b/pkgs/by-name/ra/rare/package.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "GUI for Legendary, an Epic Games Launcher open source alternative"; homepage = "https://github.com/RareDevs/Rare"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; mainProgram = "rare"; diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix index a5d6ea698c7e..9b42418ae36a 100644 --- a/pkgs/by-name/ri/ringracers/package.nix +++ b/pkgs/by-name/ri/ringracers/package.nix @@ -114,10 +114,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kartkrew.org"; platforms = lib.platforms.linux ++ lib.platforms.darwin; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - donovanglover - iedame - ]; + maintainers = with lib.maintainers; [ donovanglover ]; mainProgram = "ringracers"; }; }) diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix index 69e6ddcc7deb..42d2b2d5aaa3 100644 --- a/pkgs/by-name/ro/robodoc/package.nix +++ b/pkgs/by-name/ro/robodoc/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { Java -- basically any program in which you can use remarks/comments. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "robodoc"; }; diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix index f097ee43ca31..f7231fd44cf4 100644 --- a/pkgs/by-name/ru/runescape/package.nix +++ b/pkgs/by-name/ru/runescape/package.nix @@ -99,10 +99,7 @@ let homepage = "https://www.runescape.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ - grburst - iedame - ]; + maintainers = with maintainers; [ grburst ]; platforms = [ "x86_64-linux" ]; }; }; @@ -152,10 +149,7 @@ buildFHSEnv { description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3"; homepage = "https://www.runescape.com/"; license = licenses.unfree; - maintainers = with maintainers; [ - grburst - iedame - ]; + maintainers = with maintainers; [ grburst ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/sc/scanmem/package.nix b/pkgs/by-name/sc/scanmem/package.nix index 361bf233dd5d..cdfa36491f18 100644 --- a/pkgs/by-name/sc/scanmem/package.nix +++ b/pkgs/by-name/sc/scanmem/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix index ea96bc0f7ec1..e4f2f026b5eb 100644 --- a/pkgs/by-name/sg/sgt-puzzles/package.nix +++ b/pkgs/by-name/sg/sgt-puzzles/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ raskin tomfitzhenry - iedame ]; platforms = lib.platforms.linux; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index b7b1d4c4a059..3dfb24aafb63 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -172,7 +172,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ carloscraveiro tomasajt - iedame ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/sl/sloth-app/package.nix b/pkgs/by-name/sl/sloth-app/package.nix index b494bf0c8443..0d069c4d7fda 100644 --- a/pkgs/by-name/sl/sloth-app/package.nix +++ b/pkgs/by-name/sl/sloth-app/package.nix @@ -37,10 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sveinbjorn.org/sloth"; license = lib.licenses.bsd3; mainProgram = "Sloth"; - maintainers = with lib.maintainers; [ - emilytrau - iedame - ]; + maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix index eb755a90b8bc..4307b745a54f 100644 --- a/pkgs/by-name/sp/spotify/darwin.nix +++ b/pkgs/by-name/sp/spotify/darwin.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ matteopacini Enzime - iedame ]; }; } diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index ebaa395e8381..1a9fb908e342 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -37,7 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ FlameFlag emilytrau - iedame ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix index 192109c75a9f..538929d68616 100644 --- a/pkgs/by-name/ty/typioca/package.nix +++ b/pkgs/by-name/ty/typioca/package.nix @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/bloznelis/typioca"; changelog = "https://github.com/bloznelis/typioca/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; mainProgram = "typioca"; }; }) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index dee5c524f0fc..e29a96c41624 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "Open-source Android/Desktop remake of Civ V"; mainProgram = "unciv"; homepage = "https://github.com/yairm210/Unciv"; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = [ ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/by-name/vo/vorta/package.nix b/pkgs/by-name/vo/vorta/package.nix index 1f21868cc963..ac1911cbe607 100644 --- a/pkgs/by-name/vo/vorta/package.nix +++ b/pkgs/by-name/vo/vorta/package.nix @@ -100,10 +100,7 @@ python3Packages.buildPythonApplication rec { description = "Desktop Backup Client for Borg"; homepage = "https://vorta.borgbase.com/"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - ma27 - iedame - ]; + maintainers = with lib.maintainers; [ ma27 ]; platforms = lib.platforms.linux; mainProgram = "vorta"; }; diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix index be34a6058bc8..b7a1b7be0254 100644 --- a/pkgs/by-name/we/wesnoth/package.nix +++ b/pkgs/by-name/we/wesnoth/package.nix @@ -158,10 +158,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.wesnoth.org/"; changelog = "https://github.com/wesnoth/wesnoth/blob/${finalAttrs.version}/changelog.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - niklaskorz - iedame - ]; + maintainers = with lib.maintainers; [ niklaskorz ]; platforms = lib.platforms.unix; mainProgram = "wesnoth${suffix}"; }; diff --git a/pkgs/by-name/xp/xpilot-ng/package.nix b/pkgs/by-name/xp/xpilot-ng/package.nix index 4b7b17d5ed80..b5e54059c896 100644 --- a/pkgs/by-name/xp/xpilot-ng/package.nix +++ b/pkgs/by-name/xp/xpilot-ng/package.nix @@ -44,10 +44,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - raskin - iedame - ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 09450c1e77db..29b055ba916a 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -103,7 +103,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ veprbl dotlambda - iedame ]; }; } From 6f9fd01bc1e2e8962ebfdc4c22c136e0c48653a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 13:41:34 +0000 Subject: [PATCH 2172/2279] toml-f: 0.4.2 -> 0.4.3 --- pkgs/by-name/to/toml-f/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/toml-f/package.nix b/pkgs/by-name/to/toml-f/package.nix index 9b82c4ce6f57..aef8af6711b4 100644 --- a/pkgs/by-name/to/toml-f/package.nix +++ b/pkgs/by-name/to/toml-f/package.nix @@ -20,13 +20,13 @@ assert ( stdenv.mkDerivation rec { pname = "toml-f"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "toml-f"; repo = "toml-f"; rev = "v${version}"; - hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE="; + hash = "sha256-QRghnzsLGuQ5MHoVVTDg6ACtwVIkIRexNx/zrrQ0Icc="; }; patches = [ From b649a541b493fafc6f7c0e14ffd141f9e1323652 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 10 Nov 2025 14:35:59 +0100 Subject: [PATCH 2173/2279] paperless-ngx: 2.19.3 -> 2.19.5 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.4 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.5 --- pkgs/by-name/pa/paperless-ngx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 30d6f1f9d595..1c8ebd1e2174 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -28,13 +28,13 @@ xorg, }: let - version = "2.19.3"; + version = "2.19.5"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-VhBo61jW4lZeJYJcRRuVuYbR4enpM2JD47DDDlFJuao="; + hash = "sha256-sIPi7A6V5YNDB0ZvB5uIQaO/P5hIxY3JNRnB2sfVii0="; }; python = python3.override { @@ -80,7 +80,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-AJp796oO8qOltPKndOXlLx1luCOfzsRSFscCUCe6MZo="; + hash = "sha256-lxZOwt+/ReU7m7he0iJSt5HqaPkRksveCgvDG7uodjA="; }; nativeBuildInputs = [ From f71fd88f64d9b81e37c7c7f323d3dd1bdca2bf49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:04:25 +0000 Subject: [PATCH 2174/2279] mctc-lib: 0.5.0 -> 0.5.1 --- pkgs/by-name/mc/mctc-lib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 6883ac8a7e6a..f619f22aa368 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -21,13 +21,13 @@ assert ( stdenv.mkDerivation rec { pname = "mctc-lib"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "grimme-lab"; repo = "mctc-lib"; rev = "v${version}"; - hash = "sha256-MWqvFxFGnFrGppiSy97oUWz7p1sD6GkTrMEZTFgSExg="; + hash = "sha256-rlwUNeuLzgSWZXDKCFS/H82+oH23tEzhhILqC/ZV6PI="; }; patches = [ From 38648387b41791cf9a9b766d492b21624b73f9ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:11:00 +0000 Subject: [PATCH 2175/2279] innernet: 1.7.0 -> 1.7.1 --- pkgs/by-name/in/innernet/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/innernet/package.nix b/pkgs/by-name/in/innernet/package.nix index c21e8a70debf..213aa2cd6f96 100644 --- a/pkgs/by-name/in/innernet/package.nix +++ b/pkgs/by-name/in/innernet/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tonarino"; repo = "innernet"; tag = "v${version}"; - hash = "sha256-9rw+hS4qwAL6adDzi2Hfl4TQBDWvPKjwpkbRCBKzwEY="; + hash = "sha256-wGxTdoWMHVUldW+bjli+5zqo3PRU/8tn7fxAeVrynjs="; }; - cargoHash = "sha256-MM6sYNmd/i8ba6WRLMsQWR3+KEc2o8Io+gAN9RjYj5E="; + cargoHash = "sha256-vDPs+EEl/ZbKxOrNHc86N7+5ij+4YmsZRo5/Sxja6ms="; nativeBuildInputs = [ rustPlatform.bindgenHook From 288536b9e376a65dd51d36aabf6d6d873268fdae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:36:29 +0000 Subject: [PATCH 2176/2279] wdt: 1.27.1612021-unstable-2025-09-18 -> 1.27.1612021-unstable-2025-11-07 --- pkgs/by-name/wd/wdt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix index b4cd2c1e59ef..b8b394e8a3c2 100644 --- a/pkgs/by-name/wd/wdt/package.nix +++ b/pkgs/by-name/wd/wdt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2025-09-18"; + version = "1.27.1612021-unstable-2025-11-07"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "42ec3e543655a4ca91052e9cd75f8fa6ebc4a817"; - sha256 = "sha256-VuK8zYCcpdS+FQU3/owPEdXH+R2aTao2nMnKOWw1rTM="; + rev = "8e9e24e747192354de66993af463be76b28c4468"; + sha256 = "sha256-B3eVZLgeSR/texyy152eRMs/WDCY5CW1tzGS4FynCjQ="; }; nativeBuildInputs = [ cmake ]; From 303b3d1b37d17e77e80ed513a260216f54baf4ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:40:28 +0000 Subject: [PATCH 2177/2279] exoscale-cli: 1.86.0 -> 1.87.0 --- pkgs/by-name/ex/exoscale-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix index e35bb87c7d8a..ac1ae4100295 100644 --- a/pkgs/by-name/ex/exoscale-cli/package.nix +++ b/pkgs/by-name/ex/exoscale-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.86.0"; + version = "1.87.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-AlpCTeopNfaN4IeumaEFTZNrBfIJH2RbfVoZaFRCy2Y="; + sha256 = "sha256-4AryuvgAlCm/Jci+s+XzpPTBB1A58o+gPrk2wgMzQW0="; }; vendorHash = null; From 9daefc0c6126d7c5bab3e282b3f7492ac295a166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:41:34 +0000 Subject: [PATCH 2178/2279] python3Packages.icontract: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/icontract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index c3005903d75a..1d2f95869227 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = "icontract"; tag = "v${version}"; - hash = "sha256-7mRQ1g2mllHIaZh0jEd/iCgaDja1KJXuRnamhDo/Pbo="; + hash = "sha256-FRfDcjylYGWwYPgCipzS+NZYCSPATlQdWtavTo/NZY0="; }; preCheck = '' From 32bd3e163680ebac14730d98373a7188d9abfda5 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 10 Nov 2025 14:45:02 +0100 Subject: [PATCH 2179/2279] gnomeExtensions.gsconnect: 66 -> 67 https://github.com/GSConnect/gnome-shell-extension-gsconnect/releases/tag/v67 --- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 3dc94311f766..594bd158950d 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extension-gsconnect"; - version = "66"; + version = "67"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GSConnect"; repo = "gnome-shell-extension-gsconnect"; rev = "v${finalAttrs.version}"; - hash = "sha256-QPvdSmt4aUkPvaOUonovrCxW4pxrgoopXGi3KSukVD8="; + hash = "sha256-o+ip+2c9Aw8sfP1eh1Kn7CfI4SbwyAYMW17XrkMf/YI="; }; patches = [ From 05f91b8dd1b5d9f62cc65cc81ac116c8d65df8b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 14:53:41 +0000 Subject: [PATCH 2180/2279] snipe-it: 8.3.4 -> 8.3.5 --- pkgs/by-name/sn/snipe-it/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 33996474eea8..0d102e644a9f 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -12,16 +12,16 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "snipe-it"; - version = "8.3.4"; + version = "8.3.5"; src = fetchFromGitHub { owner = "grokability"; repo = "snipe-it"; tag = "v${finalAttrs.version}"; - hash = "sha256-Oi2UClik3l9tGTmzSmhK0B2ce6gNQtwPc1cSMPn207M="; + hash = "sha256-n0N164v3pSlrsFCx52hBGB1f7E1FSoo5XS7uM+SHQXg="; }; - vendorHash = "sha256-gqLVjhixJVfZZA9ilsCNiIoJz2VbAeGHVCARCJ14Rs4="; + vendorHash = "sha256-QRRvjaLYuYXnvrSVx+OITjHtn/UdWRC8aSEXy8uu5IA="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From dcaaf615c568860b27f96a51df2ea6622a4b9247 Mon Sep 17 00:00:00 2001 From: Andrew Benbow Date: Mon, 10 Nov 2025 10:01:01 -0500 Subject: [PATCH 2181/2279] drupal: 11.2.5 -> 11.2.7 --- pkgs/by-name/dr/drupal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix index 564daab0fecf..a3b8844a0aaf 100644 --- a/pkgs/by-name/dr/drupal/package.nix +++ b/pkgs/by-name/dr/drupal/package.nix @@ -8,17 +8,17 @@ php.buildComposerProject2 (finalAttrs: { pname = "drupal"; - version = "11.2.5"; + version = "11.2.7"; src = fetchFromGitLab { domain = "git.drupalcode.org"; owner = "project"; repo = "drupal"; tag = finalAttrs.version; - hash = "sha256-y6oKz9ldj1jP6VYIzw0iqVQM5bMOY5UOj7Yf2rUk2fc="; + hash = "sha256-mLpdLMacj3ueY8e8YtBA+0D2HOIE2A25Gt3+1E5NqoA="; }; - vendorHash = "sha256-sBzh772IRZ1e84s6iBsTHPK2qdtMP91UqHYpLIofqwM="; + vendorHash = "sha256-s9pUsCJF8PJmiZRqLNEDulGu5fElaN8HVYk+3VtP6CY="; composerNoPlugins = false; passthru = { From f7b0783d0b5cef8ecc72e7e4afd872736685e044 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 15:06:16 +0000 Subject: [PATCH 2182/2279] python3Packages.pysmartthings: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/pysmartthings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index e239a5eaa290..ea4ae9fe74d8 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = "pysmartthings"; tag = "v${version}"; - hash = "sha256-BSD/7eitZZ+9iL6IEOPfv+51CuV7wJZAlqHSVbPOvTY="; + hash = "sha256-8p9lEf+SoU1WRJxavUwUjlIKjQxcPyBsgVLcwv8XFHs="; }; build-system = [ poetry-core ]; From 63a3836595539e78c65b7e8094c6dfece4aeb3f3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 10 Nov 2025 18:07:19 +0300 Subject: [PATCH 2183/2279] kdePackages.plasma-keyboard: init at 0.1.0 --- pkgs/kde/default.nix | 1 + pkgs/kde/generated/licenses.json | 14 ++++++++++ pkgs/kde/misc/plasma-keyboard/default.nix | 33 +++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/kde/misc/plasma-keyboard/default.nix diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 334d409e970d..03436b9bf0e6 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -86,6 +86,7 @@ let oxygen-icons = self.callPackage ./misc/oxygen-icons { }; phonon = self.callPackage ./misc/phonon { }; phonon-vlc = self.callPackage ./misc/phonon-vlc { }; + plasma-keyboard = self.callPackage ./misc/plasma-keyboard { }; plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { }; polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index b218ff318e9d..be1dfb110e83 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -2716,6 +2716,20 @@ "LicenseRef-KFQF-Accepted-GPL", "LicenseRef-Qt-Commercial" ], + "plasma-keyboard": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], "plasma-mobile": [ "Apache-2.0", "BSD-2-Clause", diff --git a/pkgs/kde/misc/plasma-keyboard/default.nix b/pkgs/kde/misc/plasma-keyboard/default.nix new file mode 100644 index 000000000000..8579e1312c8d --- /dev/null +++ b/pkgs/kde/misc/plasma-keyboard/default.nix @@ -0,0 +1,33 @@ +{ + mkKdeDerivation, + fetchFromGitLab, + qtvirtualkeyboard, + pkg-config, + wayland-protocols, +}: +mkKdeDerivation rec { + pname = "plasma-keyboard"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "plasma"; + repo = "plasma-keyboard"; + tag = "v${version}"; + hash = "sha256-Bka/tmSZIaQ6ZgWx5lCXKM8tlBUgKUy2Amv2TepdO7s="; + }; + + extraNativeBuildInputs = [ + pkg-config + ]; + + extraBuildInputs = [ + qtvirtualkeyboard + wayland-protocols + ]; + + qtWrapperArgs = [ + # FIXME: fix this upstream? This should probably be XDG_DATA_DIRS + "--set QT_VIRTUALKEYBOARD_HUNSPELL_DATA_PATH /run/current-system/sw/share/hunspell/" + ]; +} From 0f3ecbcef6d7c10ab594dd149e150b45f4ea1991 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 15:20:06 +0000 Subject: [PATCH 2184/2279] csharpier: 1.1.2 -> 1.2.0 --- pkgs/by-name/cs/csharpier/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 1f6c82c5e380..cf8cd87587a3 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.1.2"; + version = "1.2.0"; executables = "csharpier"; - nugetHash = "sha256-dlWIqlErXT0l8WaLwtgKb7xpYVunkZihaJ3EzKqaqFE="; + nugetHash = "sha256-YEIUoh6af8DIAN6hh+3H5XbTbdJwe+f7TPXdZxWNgck="; meta = with lib; { description = "Opinionated code formatter for C#"; From a5daf6745dcc36fb33bf762cc9cfc091b4990719 Mon Sep 17 00:00:00 2001 From: Sewer56 Date: Tue, 4 Nov 2025 18:46:37 +0000 Subject: [PATCH 2185/2279] linuxPackages.nvidiaPackages.production: 580.95.05 -> 580.105.08 (x86_64 only) Update pkgs/os-specific/linux/nvidia-x11/default.nix Co-authored-by: Kiskae <546681+Kiskae@users.noreply.github.com> --- pkgs/os-specific/linux/nvidia-x11/default.nix | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 7c58fb9fee8a..9d94d35598e4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,32 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "580.95.05"; - sha256_64bit = "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc="; - sha256_aarch64 = "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk="; - openSha256 = "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI="; - settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14="; - persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg="; + version = if stdenv.hostPlatform.system == "aarch64-linux" then "580.95.05" else "580.105.08"; + sha256_64bit = + if stdenv.hostPlatform.system == "aarch64-linux" then + "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc=" + else + "sha256-2cboGIZy8+t03QTPpp3VhHn6HQFiyMKMjRdiV2MpNHU="; + sha256_aarch64 = + if stdenv.hostPlatform.system == "aarch64-linux" then + "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk=" + else + null; + openSha256 = + if stdenv.hostPlatform.system == "aarch64-linux" then + "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI=" + else + "sha256-FGmMt3ShQrw4q6wsk8DSvm96ie5yELoDFYinSlGZcwQ="; + settingsSha256 = + if stdenv.hostPlatform.system == "aarch64-linux" then + "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=" + else + "sha256-YvzWO1U3am4Nt5cQ+b5IJ23yeWx5ud1HCu1U0KoojLY="; + persistencedSha256 = + if stdenv.hostPlatform.system == "aarch64-linux" then + "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=" + else + "sha256-qh8pKGxUjEimCgwH7q91IV7wdPyV5v5dc5/K/IcbruI="; }; latest = selectHighestVersion production (generic { From cdfc3bf51e9c228a38c9cc87ac85b1a3d05369b8 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Mon, 10 Nov 2025 16:23:00 +0100 Subject: [PATCH 2186/2279] teleport_16: remove --- nixos/tests/teleport.nix | 1 - pkgs/by-name/te/teleport_16/package.nix | 17 ----------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/by-name/te/teleport_16/package.nix diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index 6b8acb332c43..e1dc146ce2da 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -9,7 +9,6 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let packages = with pkgs; { - "16" = teleport_16; "17" = teleport_17; "18" = teleport_18; }; diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix deleted file mode 100644 index 2599a4488b81..000000000000 --- a/pkgs/by-name/te/teleport_16/package.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - buildTeleport, - buildGoModule, - wasm-bindgen-cli_0_2_95, - withRdpClient ? true, - extPatches ? [ ], -}: -buildTeleport { - version = "16.5.18"; - hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo="; - vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8="; - pnpmHash = "sha256-Sn3rM6l6pADG7GHenlL3NC0oLc4GFZLTzqDHgzInLbk="; - cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; - - wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; - inherit buildGoModule withRdpClient extPatches; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 930bcec70e97..7a11170c6824 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1496,6 +1496,7 @@ mapAliases { teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27 tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10 telepathy-haze = throw "'telepathy-haze' has been removed due to being unmaintained and broken since 2023"; # Added 2025-11-04 + teleport_16 = throw "teleport 16 has been removed as it is EOL. Please upgrade to Teleport 17 or later"; # Added 2025-11-10 temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26 temurin-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04 temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 From cf545496603818c61fba1ef2c4811e1d67476812 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 10 Nov 2025 15:13:55 +0100 Subject: [PATCH 2187/2279] treewide: remove in-tree usages of nixpkgs.config.allowUnfree In multiple NixOS tests, nixpkgs.config.allowUnfree or nixpkgs.config.allowUnfreePredicate was set. This leads to Hydra building and redistributing packages with a unfree license. This is a quite huge legal problem. This changes removes these use cases. --- nixos/tests/breitbandmessung.nix | 3 --- nixos/tests/brscan5.nix | 1 - nixos/tests/consul.nix | 4 ---- nixos/tests/deconz.nix | 1 - nixos/tests/minecraft-server.nix | 2 -- nixos/tests/n8n.nix | 6 ------ nixos/tests/outline.nix | 1 - nixos/tests/prometheus-exporters.nix | 3 --- nixos/tests/quake3.nix | 14 -------------- nixos/tests/sabnzbd.nix | 3 --- nixos/tests/unifi.nix | 2 -- nixos/tests/virtualbox.nix | 2 -- nixos/tests/vscode-remote-ssh.nix | 18 +----------------- 13 files changed, 1 insertion(+), 59 deletions(-) diff --git a/nixos/tests/breitbandmessung.nix b/nixos/tests/breitbandmessung.nix index 3b5ba5584af6..f7c51887e872 100644 --- a/nixos/tests/breitbandmessung.nix +++ b/nixos/tests/breitbandmessung.nix @@ -23,9 +23,6 @@ environment.systemPackages = with pkgs; [ breitbandmessung ]; environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; - - # breitbandmessung is unfree - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "breitbandmessung" ]; }; enableOCR = true; diff --git a/nixos/tests/brscan5.nix b/nixos/tests/brscan5.nix index 9155846c14a8..419518859891 100644 --- a/nixos/tests/brscan5.nix +++ b/nixos/tests/brscan5.nix @@ -7,7 +7,6 @@ node.pkgsReadOnly = false; nodes.machine = { - nixpkgs.config.allowUnfree = true; hardware.sane = { enable = true; brscan5 = { diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index da72d1d132bd..141e51940b47 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -57,8 +57,6 @@ let ]; networking.firewall = firewallSettings; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "consul" ]; - services.consul = { enable = true; inherit webUi; @@ -87,8 +85,6 @@ let ]; networking.firewall = firewallSettings; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "consul" ]; - services.consul = assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { diff --git a/nixos/tests/deconz.nix b/nixos/tests/deconz.nix index 6272e44ff77c..23cea5d0c752 100644 --- a/nixos/tests/deconz.nix +++ b/nixos/tests/deconz.nix @@ -12,7 +12,6 @@ in node.pkgsReadOnly = false; nodes.machine = { - nixpkgs.config.allowUnfree = true; services.deconz = { enable = true; inherit httpPort; diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix index 32d4619cd5cd..f84a79949e63 100644 --- a/nixos/tests/minecraft-server.nix +++ b/nixos/tests/minecraft-server.nix @@ -15,8 +15,6 @@ in { environment.systemPackages = [ pkgs.mcrcon ]; - nixpkgs.config.allowUnfree = true; - services.minecraft-server = { declarative = true; enable = true; diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix index 673e322f786b..ee1f835f8c99 100644 --- a/nixos/tests/n8n.nix +++ b/nixos/tests/n8n.nix @@ -15,12 +15,6 @@ in nodes.machine = { ... }: { - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "n8n" - ]; - services.n8n = { enable = true; environment.WEBHOOK_URL = webhookUrl; diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index 9dc6bab39ecc..1085db6bf5b7 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -8,7 +8,6 @@ nodes.outline = { virtualisation.memorySize = 2 * 1024; - nixpkgs.config.allowUnfree = true; services.outline = { enable = true; forceHttps = false; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index c4e60a72416a..f40875b30a52 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1502,9 +1502,6 @@ let metricProvider = { services.sabnzbd.enable = true; - # unrar is required for sabnzbd - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [ "unrar" ]; - # extract the generated api key before starting systemd.services.sabnzbd-apikey = { requires = [ "sabnzbd.service" ]; diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index f16d2240851f..0ecfade54e59 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -7,18 +7,6 @@ let }); }; - # Only allow the demo data to be used (only if it's unfreeRedistributable). - unfreePredicate = - pkg: - let - allowPackageNames = [ - "quake3-demodata" - "quake3-pointrelease" - ]; - allowLicenses = [ lib.licenses.unfreeRedistributable ]; - in - lib.elem pkg.pname allowPackageNames && lib.elem (pkg.meta.license or null) allowLicenses; - client = { pkgs, ... }: { @@ -26,7 +14,6 @@ let hardware.graphics.enable = true; environment.systemPackages = [ pkgs.quake3demo ]; nixpkgs.config.packageOverrides = overrides; - nixpkgs.config.allowUnfreePredicate = unfreePredicate; }; in { @@ -49,7 +36,6 @@ in + "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log"; }; nixpkgs.config.packageOverrides = overrides; - nixpkgs.config.allowUnfreePredicate = unfreePredicate; networking.firewall.allowedUDPPorts = [ 27960 ]; }; diff --git a/nixos/tests/sabnzbd.nix b/nixos/tests/sabnzbd.nix index 92d574d717b2..03aa4dc9e9f2 100644 --- a/nixos/tests/sabnzbd.nix +++ b/nixos/tests/sabnzbd.nix @@ -11,9 +11,6 @@ services.sabnzbd = { enable = true; }; - - # unrar is unfree - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "unrar" ]; }; testScript = '' diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix index ee3c8e1bdb84..0f357630b587 100644 --- a/nixos/tests/unifi.nix +++ b/nixos/tests/unifi.nix @@ -11,8 +11,6 @@ node.pkgsReadOnly = false; nodes.machine = { - nixpkgs.config.allowUnfree = true; - services.unifi.enable = true; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 98125aec0328..8355c69cd692 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -426,8 +426,6 @@ let enable = true; } // vboxHostConfig; - - nixpkgs.config.allowUnfree = config.virtualisation.virtualbox.host.enableExtensionPack; }; testScript = '' diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 7e563820b581..852011735e27 100644 --- a/nixos/tests/vscode-remote-ssh.nix +++ b/nixos/tests/vscode-remote-ssh.nix @@ -1,22 +1,6 @@ import ./make-test-python.nix ( - { lib, ... }@args: + { lib, pkgs, ... }@args: let - pkgs = args.pkgs.extend ( - self: super: { - stdenv = super.stdenv.override { - config = super.config // { - allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "vscode" - "vscode-with-extensions" - "vscode-extension-ms-vscode-remote-remote-ssh" - ]; - }; - }; - } - ); - inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; inherit (pkgs.vscode.passthru) rev vscodeServer; From ffeec20a1b8ab12c9bbf5cff9765a8912ecb07c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 15:53:34 +0000 Subject: [PATCH 2188/2279] vimPlugins.avante-nvim: 0.0.27-unstable-2025-10-31 -> 0.0.27-unstable-2025-11-09 --- .../vim/plugins/non-generated/avante-nvim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index f79b73dc93db..fb6958f0b2dc 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-10-31"; + version = "0.0.27-unstable-2025-11-09"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "7f48770e66684e9a7d4d5b9c47505a23e0167a6e"; - hash = "sha256-U8RnTBGW+dR26JATQ10JbM8R03qX/ovPjvelHw2J7fc="; + rev = "f8a7cd1a606460ec0a2c4ec886bc102daccf912e"; + hash = "sha256-jRIPBO/5JKFe2bZYjPtW8o0dDujoCxU8zq9Ot3hCtzs="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; From 88c4a9f6c4b0d728a4b357d8e4852bb4b809a867 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 10 Nov 2025 17:13:10 +0100 Subject: [PATCH 2189/2279] diebahn: 2.9.0 -> 2.9.2 --- pkgs/by-name/di/diebahn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index b77125dd7e2d..de786e22b984 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; tag = version; - hash = "sha256-9ADJX2NFYv+l7umAmDLa1cO6wEnaNKu9SLzwJjfGrRM="; + hash = "sha256-e39FA0QKn91ZgN+SCY9kYQ6lGc8BgYgLxGj2dSUgi2Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-OijGiVBGe4wmGN7e9xOnZRoF9HpiryGi+stqgBIrlzc="; + hash = "sha256-UQc5Q2Wsr3YRSTjT+VWIWjOvDnS2ggvvcVPde+gjqlw="; }; nativeBuildInputs = [ From a364ae4d315c3ca6f9a51a450ef4677ff4b2a1b7 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 10 Nov 2025 17:13:28 +0100 Subject: [PATCH 2190/2279] diebahn: add maintainer cholli --- pkgs/by-name/di/diebahn/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index de786e22b984..18e14e4dcfb6 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda lilacious + cholli ]; teams = [ lib.teams.gnome-circle ]; }; From 9c1a17ffedae66fe8d02e913cf4d383a7fc2152d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 16:23:55 +0000 Subject: [PATCH 2191/2279] v2raya: 2.2.7.3 -> 2.2.7.4 --- pkgs/by-name/v2/v2raya/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index a56633d319eb..58e18a152554 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -18,13 +18,13 @@ }: let pname = "v2raya"; - version = "2.2.7.3"; + version = "2.2.7.4"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; tag = "v${version}"; - hash = "sha256-tgSZJGHkpQGhja5C62w6QpflYBBtt3rPCCPT+3yTzm4="; + hash = "sha256-Dr9RKVGt5zjUOVwUAXe2m8F29Z64BhyrmuLYGwZMd0A="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; From 1ce4af8d88b060023ec99e6281b8e11a11342fc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 16:27:15 +0000 Subject: [PATCH 2192/2279] bikeshed: 5.3.4 -> 5.4.0 --- pkgs/by-name/bi/bikeshed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix index f7f48af594ea..bd5df8ca9e6b 100644 --- a/pkgs/by-name/bi/bikeshed/package.nix +++ b/pkgs/by-name/bi/bikeshed/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "bikeshed"; - version = "5.3.4"; + version = "5.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QcypdeFIzEt2cx8PWWWhnMMhnc2oEWZUOm8kge4KJQY="; + hash = "sha256-lI05x3IYiXyInjm/It8c3JwR1H1m6VVBuehjKiNEZzo="; }; build-system = [ python3Packages.setuptools ]; From 9731d5459097191e28990d64d3cc1e98cc0dd396 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 10:19:44 -0500 Subject: [PATCH 2193/2279] ckd8s-cli: migrate from nodePackages --- pkgs/by-name/cd/cdk8s-cli/package.nix | 55 ++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 709 ------------------ 5 files changed, 56 insertions(+), 711 deletions(-) create mode 100644 pkgs/by-name/cd/cdk8s-cli/package.nix diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix new file mode 100644 index 000000000000..f9874402a2a6 --- /dev/null +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cdk8s-cli"; + version = "2.203.1"; + + src = fetchFromGitHub { + owner = "cdk8s-team"; + repo = "cdk8s-cli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-vp4AdAreL7qFp91l0OTwHJuqatCrBRRlXZ4cydQy2H0="; + }; + + yarnOfflineCache = fetchYarnDeps { + inherit (finalAttrs) src; + hash = "sha256-0lsA4FabwKF5JoCU2JlcEcgldGeICUZtl1kAcI7sqSQ="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + # Skip tests, they need network access + env.SKIP_TESTS = 1; + + # Set the version properly, setting it earlier makes the build fail + # because `projen` requires a version of 0.0.0 in the package.json + postInstall = '' + substituteInPlace $out/lib/node_modules/cdk8s-cli/package.json \ + --replace-fail '0.0.0' '${finalAttrs.version}' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-line-interface for CDK for Kubernetes"; + homepage = "https://github.com/cdk8s-team/cdk8s-cli"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "cdk8s"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 71d845fa6d3f..202399c8211f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -82,6 +82,7 @@ mapAliases { inherit (pkgs) carbon-now-cli; # added 2023-08-17 inherit (pkgs) carto; # added 2023-08-17 castnow = pkgs.castnow; # added 2023-07-30 + inherit (pkgs) cdk8s-cli; # Added 2025-11-10 inherit (pkgs) cdktf-cli; # added 2025-10-02 inherit (pkgs) clean-css-cli; # added 2023-08-18 inherit (pkgs) coc-clangd; # added 2024-06-29 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d907f1456299..1dc8eb9a92f5 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -6,7 +6,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; aws-cdk = "cdk"; - cdk8s-cli = "cdk8s"; clipboard-cli = "clipboard"; cpy-cli = "cpy"; fast-cli = "fast"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 38761a8c7dff..c35806676ff0 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -11,7 +11,6 @@ , "awesome-lint" , "browserify" , "browser-sync" -, "cdk8s-cli" , "clipboard-cli" , "coc-go" , "coc-ltex" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 455d9400a826..dd851000f64a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1398,33 +1398,6 @@ let sha512 = "uyKjxCe1ou11RJz6koBr5vXtyaGjTA45hF+H88GNW96vms7jKqmYdMm067Az1OKwl38h02lQRQ2tmoEzV7u74w=="; }; }; - "@jsii/check-node-1.108.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.108.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.108.0.tgz"; - sha512 = "wa8AGH31Cl0x1jU/KtM6JB32IurBmK1YiX5ZnCndifRCehLnS8DmJCPYrzJbKD4xqmHigaq6696fAnM/L7qIsw=="; - }; - }; - "@jsii/check-node-1.109.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.109.0.tgz"; - sha512 = "KUdmXNeCpOgjwK3QtEnxwMjIbGsPG4YkSwYsU1dmYftOz8x/oTC/D4Bz9uS7f4ARBBVkCWJWtS01l8nQgAZ2jQ=="; - }; - }; - "@jsii/spec-1.109.0" = { - name = "_at_jsii_slash_spec"; - packageName = "@jsii/spec"; - version = "1.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.109.0.tgz"; - sha512 = "+IQT4DN7/ZjaheFuwKgfpVdDIF+Reb8Hq4nO43Lu0hjeVugelOL0P22cXL229BjQ5yDRr44Fr64FuI/WUNGRKA=="; - }; - }; "@listr2/prompt-adapter-inquirer-2.0.18" = { name = "_at_listr2_slash_prompt-adapter-inquirer"; packageName = "@listr2/prompt-adapter-inquirer"; @@ -3126,15 +3099,6 @@ let sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; }; - "@types/node-16.18.126" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.18.126"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz"; - sha512 = "OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw=="; - }; - }; "@types/node-16.9.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -3486,15 +3450,6 @@ let sha512 = "/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="; }; }; - "@xmldom/xmldom-0.9.8" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.9.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.8.tgz"; - sha512 = "p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A=="; - }; - }; "@yarnpkg/lockfile-1.0.2" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -6033,24 +5988,6 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.69.52" = { - name = "cdk8s"; - packageName = "cdk8s"; - version = "2.69.52"; - src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.69.52.tgz"; - sha512 = "rD+ggdyr6WyyD2JoICrQ2uQS9+n7q5JhxAedQzv/y97jFbma9PwaCE37jnD7CGqVv74fzodYqIFbr/AzKqB7lw=="; - }; - }; - "cdk8s-plus-28-2.5.6" = { - name = "cdk8s-plus-28"; - packageName = "cdk8s-plus-28"; - version = "2.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-28/-/cdk8s-plus-28-2.5.6.tgz"; - sha512 = "ghANDg6Qmsr3vQlEig7ZDWD03ZPXkjae7ks0HaRy2clIW553mCSTjcZirvuJGaIHDN2OV2S1dLXjdIYuMq3qOA=="; - }; - }; "cdktf-0.20.11" = { name = "cdktf"; packageName = "cdktf"; @@ -6573,15 +6510,6 @@ let sha512 = "5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w=="; }; }; - "cliui-6.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; - sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; - }; - }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -6744,15 +6672,6 @@ let sha512 = "lxsbbcSMxCdT+9wUv1AvBH9791andoWDcQ6s7ZK6KsMZ+UkRLO3obzhi7Zm+RIA3lHecqzaGmOKyRnu0Dx/Zew=="; }; }; - "codemaker-1.109.0" = { - name = "codemaker"; - packageName = "codemaker"; - version = "1.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.109.0.tgz"; - sha512 = "hDz+p5ZROu20gS8+Fm0e0/Etlke2TyqajN9hzki9m5N3kkfcA0YVTDj3AJjT82k/kwMoTcXNrgdEr33kdOBNNQ=="; - }; - }; "collapse-white-space-2.1.0" = { name = "collapse-white-space"; packageName = "collapse-white-space"; @@ -6978,15 +6897,6 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; - "commonmark-0.31.2" = { - name = "commonmark"; - packageName = "commonmark"; - version = "0.31.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commonmark/-/commonmark-0.31.2.tgz"; - sha512 = "2fRLTyb9r/2835k5cwcAwOj0DEc44FARnMp5veGsJ+mEAZdi52sNopLu07ZyElQUz058H43whzlERDIaaSw4rg=="; - }; - }; "compact2string-1.4.1" = { name = "compact2string"; packageName = "compact2string"; @@ -7239,15 +7149,6 @@ let sha512 = "vbK8i3rIb/xwZxSpTjz3SagHn1qq9BChLEfy5Hf6fB3/2eFbrwt2n9kHwQcS0CPTRBesreeAcsJfMq2229FnbQ=="; }; }; - "constructs-10.4.2" = { - name = "constructs"; - packageName = "constructs"; - version = "10.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.4.2.tgz"; - sha512 = "wsNxBlAott2qg8Zv87q3eYZYgheb9lchtBfjHzzLHtXbttwSrHPs1NNQbBrmbb1YZvYg2+Vh0Dor76w4mFxJkA=="; - }; - }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -7995,15 +7896,6 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; - "date-format-4.0.14" = { - name = "date-format"; - packageName = "date-format"; - version = "4.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz"; - sha512 = "39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="; - }; - }; "debounce-fn-5.1.2" = { name = "debounce-fn"; packageName = "debounce-fn"; @@ -8085,15 +7977,6 @@ let sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; - "decamelize-5.0.1" = { - name = "decamelize"; - packageName = "decamelize"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz"; - sha512 = "VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA=="; - }; - }; "decamelize-6.0.0" = { name = "decamelize"; packageName = "decamelize"; @@ -8481,15 +8364,6 @@ let sha512 = "DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q=="; }; }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha512 = "rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g=="; - }; - }; "detect-indent-6.1.0" = { name = "detect-indent"; packageName = "detect-indent"; @@ -8508,15 +8382,6 @@ let sha512 = "bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw=="; }; }; - "detect-newline-2.1.0" = { - name = "detect-newline"; - packageName = "detect-newline"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz"; - sha512 = "CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg=="; - }; - }; "detect-port-1.6.1" = { name = "detect-port"; packageName = "detect-port"; @@ -8733,15 +8598,6 @@ let sha512 = "6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw=="; }; }; - "dot-case-3.0.4" = { - name = "dot-case"; - packageName = "dot-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - }; "dot-prop-4.2.1" = { name = "dot-prop"; packageName = "dot-prop"; @@ -8805,15 +8661,6 @@ let sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; }; }; - "downlevel-dts-0.11.0" = { - name = "downlevel-dts"; - packageName = "downlevel-dts"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/downlevel-dts/-/downlevel-dts-0.11.0.tgz"; - sha512 = "vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw=="; - }; - }; "dtrace-provider-0.6.0" = { name = "dtrace-provider"; packageName = "dtrace-provider"; @@ -9183,15 +9030,6 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; - "entities-3.0.1" = { - name = "entities"; - packageName = "entities"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; - sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; - }; - }; "entities-4.5.0" = { name = "entities"; packageName = "entities"; @@ -10920,15 +10758,6 @@ let sha512 = "5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ=="; }; }; - "fs-extra-10.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - }; "fs-extra-11.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -10956,15 +10785,6 @@ let sha512 = "V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg=="; }; }; - "fs-extra-8.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - }; "fs-extra-9.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -13017,15 +12837,6 @@ let sha512 = "CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA=="; }; }; - "interpret-1.4.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; - sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; - }; - }; "interpret-3.1.1" = { name = "interpret"; packageName = "interpret"; @@ -14385,24 +14196,6 @@ let sha512 = "qxiV/NMucgvHHupZJ36QACejcgZ3qY1FzjVHMOBmDHm+dISZ39p7dH7Hiq2ErMEwCDzdvQgR1OwCsUnrBH6oVQ=="; }; }; - "jsii-5.5.24" = { - name = "jsii"; - packageName = "jsii"; - version = "5.5.24"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.5.24.tgz"; - sha512 = "ZpMBjLRO0dZ7A3UX5wFrSqOwS7Yn8mZizbMUDBzhwJ6OficlZF4qZDUh/fxcO/LHaehvrim7nPvJfN6/1l8ivQ=="; - }; - }; - "jsii-5.8.0" = { - name = "jsii"; - packageName = "jsii"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.8.0.tgz"; - sha512 = "aFcGir8GAQu5ZNzuvqLxLSvMeSSFsHeh1enoXt7Vp23lvQ7eBvUXMfxmsJ8exq7SuIAVhmx0dWjrJyekOCmAFA=="; - }; - }; "jsii-pacmak-1.102.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; @@ -14412,24 +14205,6 @@ let sha512 = "3/nqBYNH8n/5IWI0sBFBYl1yATokEDUDQtYFLjzk7oXNWpUJ23/encI78Cs55ZS6UXcfWN3xczGLqCWnsgEpnw=="; }; }; - "jsii-pacmak-1.109.0" = { - name = "jsii-pacmak"; - packageName = "jsii-pacmak"; - version = "1.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.109.0.tgz"; - sha512 = "KiP7+ir1EXgMxFwnN+RH1tpt7EfkrWnMjsYVsYsi5HMXnBRcnsVi5F6BSgDuDxqEG54dQg4aQ2b4Hp795GcDig=="; - }; - }; - "jsii-reflect-1.109.0" = { - name = "jsii-reflect"; - packageName = "jsii-reflect"; - version = "1.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.109.0.tgz"; - sha512 = "Opjz+mGk2m8qu8dumTkFspUhZFgaANlMyq8pacyzVlB8OVmjOTcc5VhfQtywVkv0R3CvaTR3AzHRK57QYrzz6Q=="; - }; - }; "jsii-rosetta-5.4.30" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; @@ -14439,24 +14214,6 @@ let sha512 = "DyJlVO1L7p37poEtja3ktr3zGv15kvnkVrJ+uPuv5+QOvSs2XTTzi2qsgt/l7N/6yXelQ2LDvSDzXfEY08UZjg=="; }; }; - "jsii-rosetta-5.8.0" = { - name = "jsii-rosetta"; - packageName = "jsii-rosetta"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.8.0.tgz"; - sha512 = "iRqQoGDONPfL6Ga8VnctreQsrYzfWvsFSocKcOctiiHJ+5mbFwWreg/XLMFTz8N3VlblzUbNRnCXfB4XE+3XOg=="; - }; - }; - "jsii-srcmak-0.1.1236" = { - name = "jsii-srcmak"; - packageName = "jsii-srcmak"; - version = "0.1.1236"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1236.tgz"; - sha512 = "tnVMEbT1m8KdUgky56KZXT7vdLJjLmAclzSo2H59MCNUcp6eHfBxFQFyHJpXsS0B77vc8tHTMUlo4qoISuts3A=="; - }; - }; "json-buffer-3.0.0" = { name = "json-buffer"; packageName = "json-buffer"; @@ -14601,15 +14358,6 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.5.0" = { - name = "json2jsii"; - packageName = "json2jsii"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.5.0.tgz"; - sha512 = "KU1W63OO4hKK5mhYxRmoVY8qbw3igOLlPsq8o6nFZBHdD0ZQEghVbV604wB/pY0ofZPp1Hy92jkFjo6xsMUNEA=="; - }; - }; "json5-2.2.3" = { name = "json5"; packageName = "json5"; @@ -14655,15 +14403,6 @@ let sha512 = "oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w=="; }; }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; - }; - }; "jsonfile-6.1.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -15591,15 +15330,6 @@ let sha512 = "1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg=="; }; }; - "lodash.truncate-4.4.2" = { - name = "lodash.truncate"; - packageName = "lodash.truncate"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; - }; - }; "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; @@ -15717,15 +15447,6 @@ let sha512 = "9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w=="; }; }; - "log4js-6.9.1" = { - name = "log4js"; - packageName = "log4js"; - version = "6.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz"; - sha512 = "1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g=="; - }; - }; "logform-2.7.0" = { name = "logform"; packageName = "logform"; @@ -18840,15 +18561,6 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.109.0" = { - name = "oo-ascii-tree"; - packageName = "oo-ascii-tree"; - version = "1.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.109.0.tgz"; - sha512 = "0YZJaT5UFMnaj8ol0U3gG9pVbS27mG9rq/G+ED44GiFsi/Jb3mOtOXScFJXd7tdkOnXHS7oUCp1m7DUQ1BC6sA=="; - }; - }; "open-0.0.5" = { name = "open"; packageName = "open"; @@ -21207,15 +20919,6 @@ let sha512 = "GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg=="; }; }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; - }; - }; "rechoir-0.7.1" = { name = "rechoir"; packageName = "rechoir"; @@ -22044,15 +21747,6 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "require-main-filename-2.0.0" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - }; "require-package-name-2.0.1" = { name = "require-package-name"; packageName = "require-package-name"; @@ -22818,15 +22512,6 @@ let sha512 = "lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g=="; }; }; - "semver-intersect-1.5.0" = { - name = "semver-intersect"; - packageName = "semver-intersect"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.5.0.tgz"; - sha512 = "BDjWX7yCC0haX4W/zrnV2JaMpVirwaEkGOBmgRQtH++F1N3xl9v7k9H44xfTqwl+yLNNSbMKosoVSTIiJVQ2Pw=="; - }; - }; "send-0.19.0" = { name = "send"; packageName = "send"; @@ -23025,15 +22710,6 @@ let sha512 = "AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA=="; }; }; - "shelljs-0.8.5" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"; - sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="; - }; - }; "shiki-1.29.2" = { name = "shiki"; packageName = "shiki"; @@ -23394,15 +23070,6 @@ let sha512 = "c3iQfVBeHIqsPW2vD7x3UcYuCl7QDNtQm+HLV3jB434hoi2A/jOOPqi1nLSuWQKX51v4j9+aMA0VN8LIOObTNw=="; }; }; - "snake-case-3.0.4" = { - name = "snake-case"; - packageName = "snake-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz"; - sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; - }; - }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -23565,15 +23232,6 @@ let sha512 = "R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g=="; }; }; - "sort-json-2.0.1" = { - name = "sort-json"; - packageName = "sort-json"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-json/-/sort-json-2.0.1.tgz"; - sha512 = "s8cs2bcsQCzo/P2T/uoU6Js4dS/jnX8+4xunziNoq9qmSpZNCrRIAIvp4avsz0ST18HycV4z/7myJ7jsHWB2XQ=="; - }; - }; "sort-keys-4.2.0" = { name = "sort-keys"; packageName = "sort-keys"; @@ -23709,15 +23367,6 @@ let sha512 = "Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg=="; }; }; - "spdx-license-list-6.9.0" = { - name = "spdx-license-list"; - packageName = "spdx-license-list"; - version = "6.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.9.0.tgz"; - sha512 = "L2jl5vc2j6jxWcNCvcVj/BW9A8yGIG02Dw+IUw0ZxDM70f7Ylf5Hq39appV1BI9yxyWQRpq2TQ1qaXvf+yjkqA=="; - }; - }; "spdy-1.32.5" = { name = "spdy"; packageName = "spdy"; @@ -23817,15 +23466,6 @@ let sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; }; }; - "sscaff-1.2.274" = { - name = "sscaff"; - packageName = "sscaff"; - version = "1.2.274"; - src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.274.tgz"; - sha512 = "sztRa50SL1LVxZnF1au6QT1SC2z0S1oEOyi2Kpnlg6urDns93aL32YxiJcNkLcY+VHFtVqm/SRv4cb+6LeoBQA=="; - }; - }; "ssh2-1.16.0" = { name = "ssh2"; packageName = "ssh2"; @@ -24024,15 +23664,6 @@ let sha512 = "pqMqwQCso0PBJt2PQmDO0cFj0lyqmiwOMiMSkVtRokl7e+ZTRYgDHKnuZNbqjiJXgsg4nuqtD/zxuo9KqTp0Yw=="; }; }; - "stream-chain-2.2.5" = { - name = "stream-chain"; - packageName = "stream-chain"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.5.tgz"; - sha512 = "1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA=="; - }; - }; "stream-combiner-0.0.4" = { name = "stream-combiner"; packageName = "stream-combiner"; @@ -24060,15 +23691,6 @@ let sha512 = "Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A=="; }; }; - "stream-json-1.9.1" = { - name = "stream-json"; - packageName = "stream-json"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz"; - sha512 = "uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw=="; - }; - }; "stream-shift-1.0.3" = { name = "stream-shift"; packageName = "stream-shift"; @@ -24123,15 +23745,6 @@ let sha512 = "3HXId/0W8sktQnQM6rOZf2LuDDMbakMgAjpViLk758/h0br+iGqZFFfUxxJSqEvGvT742PyFr4v/TBXUtowdCg=="; }; }; - "streamroller-3.1.5" = { - name = "streamroller"; - packageName = "streamroller"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz"; - sha512 = "KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw=="; - }; - }; "streamx-2.22.0" = { name = "streamx"; packageName = "streamx"; @@ -24618,15 +24231,6 @@ let sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="; }; }; - "table-6.9.0" = { - name = "table"; - packageName = "table"; - version = "6.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.9.0.tgz"; - sha512 = "9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A=="; - }; - }; "tailwindcss-4.0.14" = { name = "tailwindcss"; packageName = "tailwindcss"; @@ -25473,15 +25077,6 @@ let sha512 = "vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="; }; }; - "typescript-5.5.4" = { - name = "typescript"; - packageName = "typescript"; - version = "5.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz"; - sha512 = "Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q=="; - }; - }; "typescript-5.8.2" = { name = "typescript"; packageName = "typescript"; @@ -25491,15 +25086,6 @@ let sha512 = "aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="; }; }; - "typescript-5.9.0-dev.20250314" = { - name = "typescript"; - packageName = "typescript"; - version = "5.9.0-dev.20250314"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.9.0-dev.20250314.tgz"; - sha512 = "b9eLo5FjlR0BRMsYIxZYCrtTTUu97N1bh+DpQFCEm5OfRGzUg/Oc09fgct4jA4NF7R5Yg9oxWqVT90uto1TsvA=="; - }; - }; "ua-parser-js-1.0.40" = { name = "ua-parser-js"; packageName = "ua-parser-js"; @@ -27354,15 +26940,6 @@ let sha512 = "K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw=="; }; }; - "which-module-2.0.1" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz"; - sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; - }; - }; "which-pm-2.2.0" = { name = "which-pm"; packageName = "which-pm"; @@ -27498,15 +27075,6 @@ let sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; - "workerpool-6.5.1" = { - name = "workerpool"; - packageName = "workerpool"; - version = "6.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz"; - sha512 = "Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA=="; - }; - }; "wrap-ansi-3.0.1" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -27750,15 +27318,6 @@ let sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; }; }; - "xmlbuilder-15.1.1" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "15.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; - }; - }; "xmlbuilder-4.0.0" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -27831,15 +27390,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.3" = { - name = "y18n"; - packageName = "y18n"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; - sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; - }; - }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -27894,15 +27444,6 @@ let sha512 = "+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA=="; }; }; - "yargs-15.4.1" = { - name = "yargs"; - packageName = "yargs"; - version = "15.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; - sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; - }; - }; "yargs-16.2.0" = { name = "yargs"; packageName = "yargs"; @@ -27921,15 +27462,6 @@ let sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; }; }; - "yargs-parser-18.1.3" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "18.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; - }; - }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -31256,247 +30788,6 @@ in bypassCache = true; reconstructLock = true; }; - cdk8s-cli = nodeEnv.buildNodePackage { - name = "cdk8s-cli"; - packageName = "cdk8s-cli"; - version = "2.200.17"; - src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.200.17.tgz"; - sha512 = "U2D0fL0cJerPAjnabvc8w1H1O2VficFw0RSWJ5phn+8u3pRhSxp00dILm4p/Dn/VNduXrdiV9s7dQENSXDuxdQ=="; - }; - dependencies = [ - sources."@jsii/check-node-1.109.0" - sources."@jsii/spec-1.109.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-16.18.126" - sources."@xmldom/xmldom-0.9.8" - sources."ajv-8.17.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."astral-regex-2.0.0" - sources."at-least-node-1.0.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."camelcase-6.3.0" - sources."case-1.6.3" - sources."cdk8s-2.69.52" - sources."cdk8s-plus-28-2.5.6" - sources."chalk-4.1.2" - sources."cliui-7.0.4" - sources."clone-2.1.2" - ( - sources."codemaker-1.109.0" - // { - dependencies = [ - sources."fs-extra-10.1.0" - ]; - } - ) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" - sources."commonmark-0.31.2" - sources."concat-map-0.0.1" - sources."constructs-10.4.2" - sources."date-format-4.0.14" - sources."debug-4.4.0" - sources."decamelize-5.0.1" - sources."detect-indent-5.0.0" - sources."detect-newline-2.1.0" - sources."dot-case-3.0.4" - ( - sources."downlevel-dts-0.11.0" - // { - dependencies = [ - sources."typescript-5.9.0-dev.20250314" - ]; - } - ) - sources."emoji-regex-8.0.0" - sources."entities-3.0.1" - sources."escalade-3.2.0" - sources."escape-string-regexp-4.0.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.3" - sources."fast-uri-3.0.6" - sources."fastq-1.19.1" - sources."fill-range-7.1.1" - sources."find-up-4.1.0" - sources."flatted-3.3.3" - ( - sources."fs-extra-8.1.0" - // { - dependencies = [ - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - } - ) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."hasown-2.0.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."interpret-1.4.0" - sources."is-core-module-2.16.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - ( - sources."jsii-5.8.0" - // { - dependencies = [ - sources."cliui-8.0.1" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - } - ) - ( - sources."jsii-pacmak-1.109.0" - // { - dependencies = [ - sources."fs-extra-10.1.0" - sources."yargs-16.2.0" - ]; - } - ) - ( - sources."jsii-reflect-1.109.0" - // { - dependencies = [ - sources."fs-extra-10.1.0" - sources."yargs-16.2.0" - ]; - } - ) - ( - sources."jsii-rosetta-5.8.0" - // { - dependencies = [ - sources."cliui-8.0.1" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - } - ) - ( - sources."jsii-srcmak-0.1.1236" - // { - dependencies = [ - sources."@jsii/check-node-1.108.0" - sources."cliui-8.0.1" - sources."fs-extra-9.1.0" - sources."jsii-5.5.24" - sources."typescript-5.5.4" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - } - ) - sources."json-schema-0.4.0" - sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.5.0" - sources."jsonfile-6.1.0" - sources."locate-path-5.0.0" - sources."lodash.truncate-4.4.2" - sources."log4js-6.9.1" - sources."lower-case-2.0.2" - sources."mdurl-1.0.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.8" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."ms-2.1.3" - sources."ncp-2.0.0" - sources."no-case-3.0.4" - sources."once-1.4.0" - sources."oo-ascii-tree-1.109.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."rechoir-0.6.2" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" - sources."resolve-1.22.10" - sources."reusify-1.1.0" - sources."rfdc-1.4.1" - sources."run-parallel-1.2.0" - sources."semver-7.7.1" - ( - sources."semver-intersect-1.5.0" - // { - dependencies = [ - sources."semver-6.3.1" - ]; - } - ) - sources."set-blocking-2.0.0" - sources."shelljs-0.8.5" - sources."slice-ansi-4.0.0" - sources."snake-case-3.0.4" - sources."sort-json-2.0.1" - sources."spdx-license-list-6.9.0" - sources."sscaff-1.2.274" - sources."stream-chain-2.2.5" - sources."stream-json-1.9.1" - sources."streamroller-3.1.5" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."table-6.9.0" - sources."to-regex-range-5.0.1" - sources."tslib-2.8.1" - sources."typescript-5.8.2" - sources."universalify-2.0.1" - sources."which-module-2.0.1" - sources."workerpool-6.5.1" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xmlbuilder-15.1.1" - sources."y18n-5.0.8" - sources."yaml-2.7.0" - ( - sources."yargs-15.4.1" - // { - dependencies = [ - sources."camelcase-5.3.1" - sources."cliui-6.0.0" - sources."decamelize-1.2.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" - ]; - } - ) - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tool for Cloud Development Kit (CDK) for Kubernetes (cdk8s)"; - homepage = "https://github.com/cdk8s-team/cdk8s-cli#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; clipboard-cli = nodeEnv.buildNodePackage { name = "clipboard-cli"; packageName = "clipboard-cli"; From ce181599f266c111de177e56d2875828fa3ddd93 Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 25 Oct 2025 17:48:08 +0200 Subject: [PATCH 2194/2279] oscar64: v1.32.263 -> v1.32.265 --- pkgs/by-name/os/oscar64/package.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/os/oscar64/package.nix b/pkgs/by-name/os/oscar64/package.nix index 6dba5f6bfd39..15eea238d2da 100644 --- a/pkgs/by-name/os/oscar64/package.nix +++ b/pkgs/by-name/os/oscar64/package.nix @@ -3,28 +3,24 @@ stdenv, nix-update-script, fetchFromGitHub, - fetchpatch, + fetchpatch2, }: stdenv.mkDerivation (finalAttrs: { pname = "oscar64"; - version = "1.32.263"; + version = "1.32.265"; src = fetchFromGitHub { owner = "drmortalwombat"; repo = "oscar64"; tag = "v${finalAttrs.version}"; - hash = "sha256-g8HUJcoI7fBmypPO79QYiOdhIYh1/sctSaEC8RLaM+s="; + hash = "sha256-nPwebydRFHoIWp2sbfPaudKj/sPZRKamYdIuSVZ9dcc="; }; - # FIXME: can be removed whenever the version is bumped. patches = [ - (fetchpatch { - url = "https://github.com/drmortalwombat/oscar64/commit/3b0f954144e36903fd396c099714722f9fa2430a.patch"; - hash = "sha256-6S7Gx9pZSNBHxX9uyS0zApe263dUo5DGviEczpP1FpQ="; - }) - (fetchpatch { - url = "https://github.com/drmortalwombat/oscar64/commit/744f496f0f71fae098063a1f3ed71722d31f7b1a.patch"; - hash = "sha256-84UBgVuKN7HMdkQfWUXMCfQSNqAe2QQ2yiifEN1JuOU="; + (fetchpatch2 { + name = "fix-make-install.patch"; + url = "https://github.com/drmortalwombat/oscar64/commit/af9e06a467be07422bc87058bebdef79e0a94ea1.patch?full_index=1"; + hash = "sha256-YsbdYi+dwLQSGOT8krJsFqJxS0EpIiQqavQpH0nl7S0="; }) ]; @@ -55,7 +51,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.nekowinston ]; mainProgram = "oscar64"; platforms = lib.platforms.unix; - # FIXME: enable aarch64-linux for the next version. - broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; }) From 965580522104ea1e724d3566c92d40f89820bf12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 17:35:32 +0100 Subject: [PATCH 2195/2279] python313Packages.playwrightcapture: 1.34.1 -> 1.34.3 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/v1.34.1...v1.34.3 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.34.3 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index b72fd95de37c..52724938aac3 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.34.1"; + version = "1.34.3"; pyproject = true; src = fetchFromGitHub { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-cywGV1hlxdZ9xU5adHKiZr2npdUpNkdF9sk9pykPFE8="; + hash = "sha256-wM4GoS9XiszlOMbwQ11JBWXVexspYgRPws4EnwiZ078="; }; pythonRelaxDeps = [ From ca5ee04c40a119912673ccd274e76d22b2b9389f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 10 Nov 2025 15:57:50 +0000 Subject: [PATCH 2196/2279] buildah: migrate to by-name --- .../default.nix => by-name/bu/buildah-unwrapped/package.nix} | 0 .../buildah/wrapper.nix => by-name/bu/buildah/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 deletions(-) rename pkgs/{development/tools/buildah/default.nix => by-name/bu/buildah-unwrapped/package.nix} (100%) rename pkgs/{development/tools/buildah/wrapper.nix => by-name/bu/buildah/package.nix} (100%) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix similarity index 100% rename from pkgs/development/tools/buildah/default.nix rename to pkgs/by-name/bu/buildah-unwrapped/package.nix diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/by-name/bu/buildah/package.nix similarity index 100% rename from pkgs/development/tools/buildah/wrapper.nix rename to pkgs/by-name/bu/buildah/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 595f98e9eb3d..8bb907fdfeb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1759,9 +1759,6 @@ with pkgs; hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; }; - buildah = callPackage ../development/tools/buildah/wrapper.nix { }; - buildah-unwrapped = callPackage ../development/tools/buildah { }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables ( haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix ); From 1a9018af28d99d46eb8ae637e5468e28d1e08660 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 10:24:33 -0500 Subject: [PATCH 2197/2279] nodePackages.jsonlint: drop Unmaintained upstream so let's drop it. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 89 ------------------- 4 files changed, 1 insertion(+), 91 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 202399c8211f..c0fd721772f8 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -200,6 +200,7 @@ mapAliases { inherit (pkgs) js-beautify; # Added 2025-11-06 inherit (pkgs) jshint; # Added 2025-11-06 inherit (pkgs) json-diff; # Added 2025-11-07 + jsonlint = throw "'jsonlint' has been removed because it is unmaintained upstream"; # Added 2025-11-10 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 inherit (pkgs) json-server; # Added 2025-11-06 joplin = pkgs.joplin-cli; # Added 2025-11-02 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 1dc8eb9a92f5..71f5a07d6f8b 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -13,7 +13,6 @@ fkill-cli = "fkill"; grunt-cli = "grunt"; gulp-cli = "gulp"; - jsonlint = "jsonlint"; poor-mans-t-sql-formatter-cli = "sqlformat"; pulp = "pulp"; purescript-language-server = "purescript-language-server"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c35806676ff0..a65c862f1667 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -36,7 +36,6 @@ , "jsdoc" , "json" , "json-refs" -, "jsonlint" , "lcov-result-merger" , "live-server" , "livedown" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index dd851000f64a..1d0e20670857 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3513,15 +3513,6 @@ let sha512 = "/6JGNTkedAaGCxxWPHLHLzPAv+bJdPK1X4BvdQFfjpUUu8ccwWf5reGRxGf/vPRfly24dspufAwMWkgALW3gbw=="; }; }; - "JSV-4.0.2" = { - name = "JSV"; - packageName = "JSV"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; - sha512 = "ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw=="; - }; - }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -3918,15 +3909,6 @@ let sha512 = "7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="; }; }; - "ansi-styles-1.0.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; - sha512 = "3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA=="; - }; - }; "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -6006,15 +5988,6 @@ let sha512 = "PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg=="; }; }; - "chalk-0.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - sha512 = "sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ=="; - }; - }; "chalk-1.1.3" = { name = "chalk"; packageName = "chalk"; @@ -11595,15 +11568,6 @@ let sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="; }; }; - "has-color-0.1.7" = { - name = "has-color"; - packageName = "has-color"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; - sha512 = "kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw=="; - }; - }; "has-cors-1.1.0" = { name = "has-cors"; packageName = "has-cors"; @@ -17877,15 +17841,6 @@ let sha512 = "TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="; }; }; - "nomnom-1.8.1" = { - name = "nomnom"; - packageName = "nomnom"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; - sha512 = "5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ=="; - }; - }; "nopt-2.0.0" = { name = "nopt"; packageName = "nopt"; @@ -23871,15 +23826,6 @@ let sha512 = "IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg=="; }; }; - "strip-ansi-0.1.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; - sha512 = "behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg=="; - }; - }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -25212,15 +25158,6 @@ let sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="; }; }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha512 = "z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ=="; - }; - }; "underscore-1.8.3" = { name = "underscore"; packageName = "underscore"; @@ -33482,32 +33419,6 @@ in bypassCache = true; reconstructLock = true; }; - jsonlint = nodeEnv.buildNodePackage { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz"; - sha512 = "jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A=="; - }; - dependencies = [ - sources."JSV-4.0.2" - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - sources."has-color-0.1.7" - sources."nomnom-1.8.1" - sources."strip-ansi-0.1.1" - sources."underscore-1.6.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Validate JSON"; - homepage = "http://zaach.github.com/jsonlint/"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; From bd16d452b0adb8446fd45aab74cf5f974a114ce5 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 10:34:35 -0500 Subject: [PATCH 2198/2279] svelte-check: migrate from nodePackages --- pkgs/by-name/sv/svelte-check/package.nix | 80 +++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 155 ------------------ 4 files changed, 81 insertions(+), 156 deletions(-) create mode 100644 pkgs/by-name/sv/svelte-check/package.nix diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix new file mode 100644 index 000000000000..99cbb21e53b0 --- /dev/null +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pnpm, + nodejs, + makeBinaryWrapper, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "svelte-check"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "sveltejs"; + repo = "language-tools"; + tag = "svelte-check-${finalAttrs.version}"; + hash = "sha256-+KDl7tTyXo6QMQpMGA4hSChDaPrfqfVKJXGunTlo9Rg="; + }; + + pnpmWorkspaces = [ "svelte-check..." ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + fetcherVersion = 2; + hash = "sha256-3bsY31sp5hjTYhRiZniAMVb3kZ1EqOlbyOvljU8jHlY="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + pnpm run --filter=svelte-check... build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + pnpm install --filter=svelte-check... --frozen-lockfile --offline --force --ignore-scripts + mkdir -p $out/lib/node_modules/svelte-check/ + mkdir -p $out/bin + + mv {packages,node_modules} $out/lib/node_modules/svelte-check/ + + makeWrapper ${lib.getExe nodejs} $out/bin/svelte-check \ + --add-flags "$out/lib/node_modules/svelte-check/packages/svelte-check/bin/svelte-check" \ + --set NODE_PATH "$out/lib/node_modules/svelte-check/packages/svelte-check/node_modules/" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--use-github-releases" + "--version-regex" + "svelte-check-(.*)" + ]; + }; + + meta = { + description = "Svelte code checker"; + downloadPage = "https://www.npmjs.com/package/svelte-check"; + homepage = "https://github.com/sveltejs/language-tools"; + license = lib.licenses.mit; + mainProgram = "svelte-check"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index c0fd721772f8..b8823ef00438 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -284,6 +284,7 @@ mapAliases { stf = throw "stf was removed because it was broken"; # added 2023-08-21 inherit (pkgs) stylelint; # added 2023-09-13 surge = pkgs.surge-cli; # Added 2023-09-08 + inherit (pkgs) svelte-check; # Added 2025-11-10 inherit (pkgs) svelte-language-server; # Added 2024-05-12 inherit (pkgs) svgo; # added 2025-08-24 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a65c862f1667..7be3875fcd84 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -61,7 +61,6 @@ , "semver" , "sloc" , "smartdc" -, "svelte-check" , "tiddlywiki" , "tsun" , "ttf2eot" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1d0e20670857..eac7150a1942 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -21,15 +21,6 @@ let sha512 = "3yWxPTq3UQ/FY9p1ErPxIyfT64elWaMvM9lIHnaqpyft63tkxodF5aUElYHrdisWve5cETkh1+KBw1yJuW0aRw=="; }; }; - "@ampproject/remapping-2.3.0" = { - name = "_at_ampproject_slash_remapping"; - packageName = "@ampproject/remapping"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz"; - sha512 = "30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="; - }; - }; "@angular-devkit/architect-0.1902.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; @@ -2622,15 +2613,6 @@ let sha512 = "Pb6M8TDO9DtSVla9yXSTAxmo9GVEouq5P40DWXdOie69bXogZTkgvopCq+yEvTMA0F6PEvdJmbtTV3ccIp11VQ=="; }; }; - "@sveltejs/acorn-typescript-1.0.5" = { - name = "_at_sveltejs_slash_acorn-typescript"; - packageName = "@sveltejs/acorn-typescript"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz"; - sha512 = "IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ=="; - }; - }; "@swc/core-1.11.9" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; @@ -4170,15 +4152,6 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "aria-query-5.3.2" = { - name = "aria-query"; - packageName = "aria-query"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz"; - sha512 = "COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw=="; - }; - }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -4746,15 +4719,6 @@ let sha512 = "iP4DebzoNlP/YN2dpwCgb8zoCmhtkajzS48JvwmkSkXvPI3DHc7m+XYL5tGnSlJtR6nImXZmdCuN5aP8dh1d8A=="; }; }; - "axobject-query-4.1.0" = { - name = "axobject-query"; - packageName = "axobject-query"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz"; - sha512 = "qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ=="; - }; - }; "b4a-1.6.7" = { name = "b4a"; packageName = "b4a"; @@ -6555,15 +6519,6 @@ let sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; }; }; - "clsx-2.1.1" = { - name = "clsx"; - packageName = "clsx"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz"; - sha512 = "eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA=="; - }; - }; "cmd-extension-1.0.2" = { name = "cmd-extension"; packageName = "cmd-extension"; @@ -9507,15 +9462,6 @@ let sha512 = "UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw=="; }; }; - "esm-env-1.2.2" = { - name = "esm-env"; - packageName = "esm-env"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz"; - sha512 = "Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA=="; - }; - }; "espree-10.3.0" = { name = "espree"; packageName = "espree"; @@ -9543,15 +9489,6 @@ let sha512 = "ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg=="; }; }; - "esrap-1.4.5" = { - name = "esrap"; - packageName = "esrap"; - version = "1.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/esrap/-/esrap-1.4.5.tgz"; - sha512 = "CjNMjkBWWZeHn+VX+gS8YvFwJ5+NDhg8aWZBSFJPR8qQduDNjbJodA2WcwCm7uQa5Rjqj+nZvVmceg1RbHFB9g=="; - }; - }; "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; @@ -10146,15 +10083,6 @@ let sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; }; }; - "fdir-6.4.3" = { - name = "fdir"; - packageName = "fdir"; - version = "6.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz"; - sha512 = "PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw=="; - }; - }; "fecha-4.2.3" = { name = "fecha"; packageName = "fecha"; @@ -13557,15 +13485,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-reference-3.0.3" = { - name = "is-reference"; - packageName = "is-reference"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz"; - sha512 = "ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw=="; - }; - }; "is-regex-1.2.1" = { name = "is-regex"; packageName = "is-regex"; @@ -14934,15 +14853,6 @@ let sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ=="; }; }; - "locate-character-3.0.0" = { - name = "locate-character"; - packageName = "locate-character"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz"; - sha512 = "SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA=="; - }; - }; "locate-path-5.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -24096,15 +24006,6 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "svelte-5.23.0" = { - name = "svelte"; - packageName = "svelte"; - version = "5.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-5.23.0.tgz"; - sha512 = "v0lL3NuKontiCxholEiAXCB+BYbndlKbwlDMK0DS86WgGELMJSpyqCSbJeMEMBDwOglnS7Ar2Rq0wwa/z2L8Vg=="; - }; - }; "sver-1.8.4" = { name = "sver"; packageName = "sver"; @@ -27516,15 +27417,6 @@ let sha512 = "4WDF9bNWWXe8OAI319bVw5dmG4BklEk8wzFGwRQxEzKb+0mgDU5J/jtyZPo0BEusVIU1+3mRQIEdT5LtQn+aAw=="; }; }; - "zimmerframe-1.1.2" = { - name = "zimmerframe"; - packageName = "zimmerframe"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.2.tgz"; - sha512 = "rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w=="; - }; - }; "zip-stream-2.1.3" = { name = "zip-stream"; packageName = "zip-stream"; @@ -37120,53 +37012,6 @@ in bypassCache = true; reconstructLock = true; }; - svelte-check = nodeEnv.buildNodePackage { - name = "svelte-check"; - packageName = "svelte-check"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-4.1.5.tgz"; - sha512 = "Gb0T2IqBNe1tLB9EB1Qh+LOe+JB8wt2/rNBDGvkxQVvk8vNeAoG+vZgFB/3P5+zC7RWlyBlzm9dVjZFph/maIg=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.3.0" - sources."@jridgewell/gen-mapping-0.3.8" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.5.0" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@sveltejs/acorn-typescript-1.0.5" - sources."@types/estree-1.0.6" - sources."acorn-8.14.1" - sources."aria-query-5.3.2" - sources."axobject-query-4.1.0" - sources."chokidar-4.0.3" - sources."clsx-2.1.1" - sources."esm-env-1.2.2" - sources."esrap-1.4.5" - sources."fdir-6.4.3" - sources."is-reference-3.0.3" - sources."locate-character-3.0.0" - sources."magic-string-0.30.17" - sources."mri-1.2.0" - sources."picocolors-1.1.1" - sources."picomatch-4.0.2" - sources."readdirp-4.1.2" - sources."sade-1.8.1" - sources."svelte-5.23.0" - sources."typescript-5.8.2" - sources."zimmerframe-1.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Svelte Code Checker Terminal Interface"; - homepage = "https://github.com/sveltejs/language-tools#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; From 727d02790a7f072396337f85c24d078528a823b9 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 10:44:51 -0500 Subject: [PATCH 2199/2279] tiddlywiki: migrate from nodePackages --- pkgs/by-name/ti/tiddlywiki/package.nix | 43 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 -------- 4 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/ti/tiddlywiki/package.nix diff --git a/pkgs/by-name/ti/tiddlywiki/package.nix b/pkgs/by-name/ti/tiddlywiki/package.nix new file mode 100644 index 000000000000..a39c8e90cdb0 --- /dev/null +++ b/pkgs/by-name/ti/tiddlywiki/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeBinaryWrapper, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tiddlywiki"; + version = "5.3.8"; + + src = fetchFromGitHub { + owner = "tiddlywiki"; + repo = "tiddlywiki5"; + tag = "v${finalAttrs.version}"; + hash = "sha256-nBBjD9JB4tliRJ5N1aK3pc9PzCHG1fByj7vWtKnNEzI="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + nodejs + ]; + + installPhase = '' + mkdir -p $out/lib/node_modules/tiddlywiki/ + mv * $out/lib/node_modules/tiddlywiki/ + + makeWrapper ${lib.getExe nodejs} $out/bin/tiddlywiki \ + --add-flags "$out/lib/node_modules/tiddlywiki/tiddlywiki.js" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Self-contained JavaScript wiki for the browser, Node.js, AWS Lambda etc"; + homepage = "https://tiddlywiki.com"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "tiddlywiki"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b8823ef00438..b3cbe011b0fe 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -348,6 +348,7 @@ mapAliases { thelounge-theme-zenburn-monospace = throw "thelounge-theme-zenburn-monospace has been removed because thelounge was moved out of nodePackages"; # added 2025-03-12 thelounge-theme-zenburn-sourcecodepro = throw "thelounge-theme-zenburn-sourcecodepro has been removed because thelounge was moved out of nodePackages"; # added 2025-03-12 three = throw "three was removed because it was no longer needed"; # Added 2023-09-08 + inherit (pkgs) tiddlywiki; # Added 2025-11-10 triton = pkgs.triton; # Added 2023-05-06 ts-node = throw "'ts-node' was removed because it is unmaintained, and since NodeJS 22.6.0+, experimental TypeScript support is built-in to NodeJS."; # Added 2025-11-07 typescript = pkgs.typescript; # Added 2023-06-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7be3875fcd84..cede9310846c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -61,7 +61,6 @@ , "semver" , "sloc" , "smartdc" -, "tiddlywiki" , "tsun" , "ttf2eot" , "vega-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index eac7150a1942..37b8975dec90 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -37012,24 +37012,6 @@ in bypassCache = true; reconstructLock = true; }; - tiddlywiki = nodeEnv.buildNodePackage { - name = "tiddlywiki"; - packageName = "tiddlywiki"; - version = "5.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.3.6.tgz"; - sha512 = "RfWt+Bo/UsTdzP5N4nEInjaJjgAzylUMf21hE4FL5v65c3x054+A+3g3sgW1m68lTJbTbiiqSZ6q6BEIZMwhSQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "a non-linear personal web notebook"; - homepage = "https://github.com/TiddlyWiki/TiddlyWiki5#readme"; - license = "BSD"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tsun = nodeEnv.buildNodePackage { name = "tsun"; packageName = "tsun"; From 87258df63377ebc38f7217271b645eb4a8cca7dc Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 11:29:03 -0500 Subject: [PATCH 2200/2279] peerflix-server: migrate from nodePackages --- pkgs/by-name/pe/peerflix-server/package.nix | 35 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 664 ------------------ 4 files changed, 36 insertions(+), 665 deletions(-) create mode 100644 pkgs/by-name/pe/peerflix-server/package.nix diff --git a/pkgs/by-name/pe/peerflix-server/package.nix b/pkgs/by-name/pe/peerflix-server/package.nix new file mode 100644 index 000000000000..e5eb96990a43 --- /dev/null +++ b/pkgs/by-name/pe/peerflix-server/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "peerflix-server"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "asapach"; + repo = "peerflix-server"; + tag = "v${finalAttrs.version}"; + hash = "sha256-on1k6ONCI267h+hXlF0kveLFO5KSoEI1EqFCbphYMhI="; + }; + + npmDepsHash = "sha256-1RCuVZcasFmuPXyGlHxUE1AB5rCeVk2ctst2z1X5Ubw="; + + npmFlags = [ "--ignore-scripts" ]; + + dontNpmBuild = true; + dontNpmPrune = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Streaming torrent client for Node.js with web ui"; + homepage = "https://github.com/asapach/peerflix-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "peerflix-server"; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index b3cbe011b0fe..0a7df1062856 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -249,6 +249,7 @@ mapAliases { parcel-bundler = self.parcel; # added 2023-09-04 parsoid = throw "The Javascript version of Parsoid has been deprecated by upstream and no longer works with modern MediaWiki versions"; # Added 2025-11-04 inherit (pkgs) patch-package; # added 2024-06-29 + inherit (pkgs) peerflix-server; # Added 2025-11-10 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index cede9310846c..d87fa16618f2 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -47,7 +47,6 @@ , "node2nix" , "np" , "peerflix" -, "peerflix-server" , "poor-mans-t-sql-formatter-cli" , "postcss" , "prebuild-install" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 37b8975dec90..22621987b2d4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4053,15 +4053,6 @@ let sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; }; }; - "archiver-3.1.1" = { - name = "archiver"; - packageName = "archiver"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz"; - sha512 = "5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg=="; - }; - }; "archiver-5.3.2" = { name = "archiver"; packageName = "archiver"; @@ -4071,15 +4062,6 @@ let sha512 = "+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw=="; }; }; - "archiver-utils-2.1.0" = { - name = "archiver-utils"; - packageName = "archiver-utils"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz"; - sha512 = "bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="; - }; - }; "archiver-utils-3.0.4" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -6870,15 +6852,6 @@ let sha512 = "w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA=="; }; }; - "compress-commons-2.1.1" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz"; - sha512 = "eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q=="; - }; - }; "compress-commons-4.1.2" = { name = "compress-commons"; packageName = "compress-commons"; @@ -7023,15 +6996,6 @@ let sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; }; - "connect-multiparty-2.2.0" = { - name = "connect-multiparty"; - packageName = "connect-multiparty"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.2.0.tgz"; - sha512 = "zKcpA7cuXGEhuw9Pz7JmVCFmp85jzGLGm/iiagXTwyEAJp4ypLPtRS/V4IGuGb9KjjrgHBs6P/gDCpZHnFzksA=="; - }; - }; "consola-3.4.0" = { name = "consola"; packageName = "consola"; @@ -7302,15 +7266,6 @@ let sha512 = "VC2Gs20JcTyeQob6UViBLnyP0bYHkBh6EiKzot9vi2DmeGlFT9Wd7VG3NBrkNx/jYvFBeyDOMMHdHQhbtKLgHQ=="; }; }; - "crc-3.8.0" = { - name = "crc"; - packageName = "crc"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz"; - sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; - }; - }; "crc-32-1.2.2" = { name = "crc-32"; packageName = "crc-32"; @@ -7320,15 +7275,6 @@ let sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; }; - "crc32-stream-3.0.1" = { - name = "crc32-stream"; - packageName = "crc32-stream"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz"; - sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; - }; - }; "crc32-stream-4.0.3" = { name = "crc32-stream"; packageName = "crc32-stream"; @@ -10434,15 +10380,6 @@ let sha512 = "pzNZh42/A2HmcRIpddSP0T+zBofd119o5rNB2u1YHv36CM2C/ietI2ZsjWZ2LSL7J0BNVkFn1a9Ad+cmO2lDQg=="; }; }; - "fluent-ffmpeg-2.1.3" = { - name = "fluent-ffmpeg"; - packageName = "fluent-ffmpeg"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.3.tgz"; - sha512 = "Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q=="; - }; - }; "fn-annotate-1.2.0" = { name = "fn-annotate"; packageName = "fn-annotate"; @@ -11955,15 +11892,6 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -14619,15 +14547,6 @@ let sha512 = "Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA=="; }; }; - "lazystream-1.0.1" = { - name = "lazystream"; - packageName = "lazystream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"; - sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw=="; - }; - }; "leven-2.1.0" = { name = "leven"; packageName = "leven"; @@ -14970,24 +14889,6 @@ let sha512 = "aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="; }; }; - "lodash.defaults-4.2.0" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; - }; - }; - "lodash.difference-4.5.0" = { - name = "lodash.difference"; - packageName = "lodash.difference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"; - sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA=="; - }; - }; "lodash.escaperegexp-4.1.2" = { name = "lodash.escaperegexp"; packageName = "lodash.escaperegexp"; @@ -14997,15 +14898,6 @@ let sha512 = "TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="; }; }; - "lodash.flatten-4.4.0" = { - name = "lodash.flatten"; - packageName = "lodash.flatten"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; - }; - }; "lodash.groupby-4.6.0" = { name = "lodash.groupby"; packageName = "lodash.groupby"; @@ -15204,15 +15096,6 @@ let sha512 = "1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg=="; }; }; - "lodash.union-4.6.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; - sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; - }; - }; "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; @@ -15519,15 +15402,6 @@ let sha512 = "sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="; }; }; - "magnet-uri-2.0.1" = { - name = "magnet-uri"; - packageName = "magnet-uri"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; - sha512 = "PmoK9UeaVTXHNYGAJab/HmTYBvz3QuvMQKiEVu6mAuLsOcV/TUJuiyffKh+ayn0zLnU3ViLModW6jbxUUUWSZg=="; - }; - }; "magnet-uri-4.2.3" = { name = "magnet-uri"; packageName = "magnet-uri"; @@ -17292,15 +17166,6 @@ let sha512 = "ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA=="; }; }; - "multiparty-4.2.3" = { - name = "multiparty"; - packageName = "multiparty"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz"; - sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ=="; - }; - }; "mute-stdout-2.0.0" = { name = "mute-stdout"; packageName = "mute-stdout"; @@ -20370,15 +20235,6 @@ let sha512 = "D5e2iIC5dNENWyBxsjhEnNOMCwZZ64TARK6dyMN+3g4OTC4MJxyjh9hKLjTGoNhDOPrgjI+YlFEHFnrp/cSnzQ=="; }; }; - "random-bytes-1.0.0" = { - name = "random-bytes"; - packageName = "random-bytes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha512 = "iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ=="; - }; - }; "random-iterate-1.0.1" = { name = "random-iterate"; packageName = "random-iterate"; @@ -20658,15 +20514,6 @@ let sha512 = "vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg=="; }; }; - "read-torrent-1.3.1" = { - name = "read-torrent"; - packageName = "read-torrent"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.1.tgz"; - sha512 = "TzPdVpK3xEnvsS1yCy94CiOmfzG2/MNuZjpZi64+HJxb9fVZD4nIfFFGZ9T2N/dgwOFumfacw3xCD6rXtgwn2g=="; - }; - }; "read-yaml-file-2.1.0" = { name = "read-yaml-file"; packageName = "read-yaml-file"; @@ -24978,15 +24825,6 @@ let sha512 = "R8375j0qwXyIu/7R0tjdF06/sElHqbmdmWC9M2qQHpEVbvE4I5+38KJI7LUUmQMp7NVq4tKHiBMkT0NFM453Ig=="; }; }; - "uid-safe-2.1.5" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; - sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; - }; - }; "uint8array-extras-0.3.0" = { name = "uint8array-extras"; packageName = "uint8array-extras"; @@ -27417,15 +27255,6 @@ let sha512 = "4WDF9bNWWXe8OAI319bVw5dmG4BklEk8wzFGwRQxEzKb+0mgDU5J/jtyZPo0BEusVIU1+3mRQIEdT5LtQn+aAw=="; }; }; - "zip-stream-2.1.3" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.3.tgz"; - sha512 = "EkXc2JGcKhO5N5aZ7TmuNo45budRaFGHOmz24wtJR7znbNqDPmdZtUauKX6et8KAVseAMBOyWJqEpXcHTBsh7Q=="; - }; - }; "zip-stream-4.1.1" = { name = "zip-stream"; packageName = "zip-stream"; @@ -35631,499 +35460,6 @@ in bypassCache = true; reconstructLock = true; }; - peerflix-server = nodeEnv.buildNodePackage { - name = "peerflix-server"; - packageName = "peerflix-server"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.6.0.tgz"; - sha512 = "NGLR8G6SP7WriloFrS5JDU8Rx1Ia1OlbJOpqGeAzMKxhrajnAdPza8VeXozMUk0oBCS8hr+cuLQ7stprgzISXg=="; - }; - dependencies = [ - sources."accepts-1.3.8" - sources."addr-to-ip-port-1.5.4" - sources."after-0.8.2" - sources."ajv-6.12.6" - sources."archiver-3.1.1" - ( - sources."archiver-utils-2.1.0" - // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - } - ) - sources."array-flatten-1.1.1" - sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.4" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" - sources."base64-js-1.5.1" - sources."base64id-2.0.0" - sources."basic-auth-2.0.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bencode-0.7.0" - sources."bitfield-0.1.0" - sources."bittorrent-dht-6.4.2" - ( - sources."bittorrent-tracker-7.7.0" - // { - dependencies = [ - sources."bencode-0.8.0" - sources."ws-1.1.5" - ]; - } - ) - sources."bl-4.1.0" - sources."blob-0.0.5" - sources."bn.js-4.12.1" - sources."bncode-0.5.3" - sources."body-parser-1.20.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-equal-0.0.1" - sources."buffer-equals-1.0.4" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.9" - sources."bytes-3.1.2" - sources."call-bind-apply-helpers-1.0.2" - sources."call-bound-1.0.4" - sources."caseless-0.12.0" - sources."chrome-dgram-3.0.6" - sources."chrome-dns-1.0.1" - sources."chrome-net-3.3.4" - sources."combined-stream-1.0.8" - sources."compact2string-1.4.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.3.1" - sources."component-inherit-0.0.3" - ( - sources."compress-commons-2.1.1" - // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - } - ) - sources."concat-map-0.0.1" - ( - sources."connect-multiparty-2.2.0" - // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.7.3" - sources."on-finished-2.3.0" - sources."qs-6.5.3" - sources."setprototypeof-1.1.1" - sources."statuses-1.5.0" - sources."toidentifier-1.0.0" - ]; - } - ) - ( - sources."content-disposition-0.5.4" - // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - } - ) - sources."content-type-1.0.5" - sources."cookie-0.7.1" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."crc-3.8.0" - sources."crc32-stream-3.0.1" - sources."cyclist-0.1.1" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."decompress-response-3.3.0" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dunder-proto-1.0.1" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."encodeurl-2.0.0" - sources."end-of-stream-1.4.4" - ( - sources."engine.io-3.6.2" - // { - dependencies = [ - sources."cookie-0.4.2" - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - } - ) - ( - sources."engine.io-client-3.5.4" - // { - dependencies = [ - sources."debug-3.1.0" - ]; - } - ) - sources."engine.io-parser-2.2.1" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."events-3.3.0" - ( - sources."express-4.21.2" - // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - } - ) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fifo-0.1.4" - sources."finalhandler-1.3.1" - sources."flatten-0.0.1" - ( - sources."fluent-ffmpeg-2.1.3" - // { - dependencies = [ - sources."async-0.2.10" - ]; - } - ) - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-chunk-store-1.7.0" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.3.0" - sources."get-proto-1.0.1" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."gopd-1.2.0" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - ( - sources."has-binary2-1.0.3" - // { - dependencies = [ - sources."isarray-2.0.1" - ]; - } - ) - sources."has-cors-1.1.0" - sources."has-symbols-1.1.0" - sources."hasown-2.0.2" - sources."hat-0.0.3" - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."immediate-chunk-store-1.0.8" - sources."indexof-0.0.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ip-1.1.9" - sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."k-bucket-0.6.0" - ( - sources."k-rpc-3.7.0" - // { - dependencies = [ - sources."k-bucket-2.0.1" - ]; - } - ) - ( - sources."k-rpc-socket-1.11.1" - // { - dependencies = [ - sources."bencode-2.0.3" - ]; - } - ) - ( - sources."lazystream-1.0.1" - // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - } - ) - sources."lodash-4.17.21" - sources."lodash.defaults-4.2.0" - sources."lodash.difference-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.isplainobject-4.0.6" - sources."lodash.union-4.6.0" - sources."lru-2.0.1" - sources."magnet-uri-2.0.1" - sources."math-intrinsics-1.1.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."mkdirp-classic-0.5.3" - ( - sources."morgan-1.10.0" - // { - dependencies = [ - sources."on-finished-2.3.0" - ]; - } - ) - sources."ms-2.0.0" - ( - sources."multiparty-4.2.3" - // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.8.1" - sources."safe-buffer-5.2.1" - sources."statuses-1.5.0" - ]; - } - ) - sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.4" - sources."normalize-path-3.0.0" - sources."oauth-sign-0.9.0" - sources."object-inspect-1.13.4" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."options-0.0.6" - ( - sources."parse-torrent-4.1.0" - // { - dependencies = [ - sources."magnet-uri-4.2.3" - ]; - } - ) - sources."parse-torrent-file-2.1.4" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.12" - ( - sources."peer-wire-protocol-0.7.1" - // { - dependencies = [ - sources."bncode-0.2.3" - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - } - ) - sources."peer-wire-swarm-0.12.2" - sources."performance-now-2.1.0" - sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.7" - sources."psl-1.15.0" - sources."pump-3.0.2" - sources."punycode-2.3.1" - sources."qs-6.13.0" - sources."queue-microtask-1.2.3" - sources."queue-tick-1.0.1" - sources."random-access-file-2.2.1" - sources."random-access-storage-1.4.3" - sources."random-bytes-1.0.0" - sources."random-iterate-1.0.1" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - sources."re-emitter-1.1.4" - sources."read-torrent-1.3.1" - sources."readable-stream-3.6.2" - ( - sources."request-2.88.2" - // { - dependencies = [ - sources."qs-6.5.3" - ]; - } - ) - sources."rimraf-2.7.1" - sources."run-parallel-1.2.0" - sources."run-series-1.1.9" - sources."rusha-0.8.14" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - ( - sources."send-0.19.0" - // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - } - ) - sources."serve-static-1.16.2" - sources."setprototypeof-1.2.0" - sources."side-channel-1.1.0" - sources."side-channel-list-1.0.0" - sources."side-channel-map-1.0.1" - sources."side-channel-weakmap-1.0.2" - sources."simple-concat-1.0.1" - sources."simple-get-2.8.2" - ( - sources."simple-peer-6.4.4" - // { - dependencies = [ - sources."readable-stream-2.3.8" - ]; - } - ) - sources."simple-sha1-2.1.2" - ( - sources."simple-websocket-4.3.1" - // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.0.1" - sources."ultron-1.1.1" - sources."ws-2.3.1" - ]; - } - ) - ( - sources."socket.io-2.5.1" - // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - } - ) - sources."socket.io-adapter-1.1.2" - ( - sources."socket.io-client-2.5.0" - // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - sources."socket.io-parser-3.3.4" - ]; - } - ) - ( - sources."socket.io-parser-3.4.3" - // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - ]; - } - ) - sources."speedometer-0.1.4" - sources."sshpk-1.18.0" - sources."statuses-2.0.1" - ( - sources."string2compact-1.3.2" - // { - dependencies = [ - sources."ipaddr.js-2.2.0" - ]; - } - ) - sources."string_decoder-1.1.1" - sources."tar-stream-2.2.0" - sources."thirty-two-0.0.2" - sources."thunky-1.1.0" - sources."to-array-0.1.4" - sources."toidentifier-1.0.1" - sources."torrent-discovery-5.4.0" - sources."torrent-piece-1.1.2" - ( - sources."torrent-stream-1.2.1" - // { - dependencies = [ - sources."end-of-stream-0.1.5" - sources."mkdirp-0.3.5" - sources."once-1.3.3" - ]; - } - ) - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."uid-safe-2.1.5" - sources."ultron-1.0.2" - sources."uniq-1.0.1" - sources."unpipe-1.0.0" - sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."utp-0.0.7" - sources."uuid-3.4.0" - sources."vary-1.1.2" - ( - sources."verror-1.10.0" - // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - } - ) - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."ws-7.5.10" - sources."xmlhttprequest-ssl-1.6.3" - sources."xtend-4.0.2" - sources."yeast-0.1.2" - sources."zip-stream-2.1.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Streaming torrent client for node.js with web ui"; - homepage = "https://github.com/asapach/peerflix-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage { name = "poor-mans-t-sql-formatter-cli"; packageName = "poor-mans-t-sql-formatter-cli"; From 86f9e71ca9bd53cd5a2dd7ffd958ae2f4c8bdad6 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 11:40:47 -0500 Subject: [PATCH 2201/2279] nodePackages.multi-file-swagger: drop --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 95 ------------------- 3 files changed, 1 insertion(+), 96 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 0a7df1062856..d917819e7b5a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -227,6 +227,7 @@ mapAliases { inherit (pkgs) mermaid-cli; # added 2023-10-01 meshcommander = throw "meshcommander was removed because it was abandoned upstream"; # added 2024-12-02 inherit (pkgs) mocha; # Added 2025-11-04 + multi-file-swagger = throw "'multi-file-swagger' has been removed because it is unmaintained upstream"; # Added 2025-11-10 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 neovim = pkgs.neovim-node-client; # added 2024-11-13 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d87fa16618f2..a9e4882f5760 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -41,7 +41,6 @@ , "livedown" , "madoko" , "mathjax" -, "multi-file-swagger" , "nijs" , "node-gyp-build" , "node2nix" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 22621987b2d4..12afec7b20b6 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -14079,15 +14079,6 @@ let sha512 = "lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA=="; }; }; - "json-refs-3.0.15" = { - name = "json-refs"; - packageName = "json-refs"; - version = "3.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz"; - sha512 = "0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw=="; - }; - }; "json-schema-0.2.2" = { name = "json-schema"; packageName = "json-schema"; @@ -34198,92 +34189,6 @@ in bypassCache = true; reconstructLock = true; }; - multi-file-swagger = nodeEnv.buildNodePackage { - name = "multi-file-swagger"; - packageName = "multi-file-swagger"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/multi-file-swagger/-/multi-file-swagger-2.3.0.tgz"; - sha512 = "kiGLOSzovuYddOePdYicu/jkIjvlNgvq/bP/0C0+oiPBIuiJWLS1vXPvnU2OowRQPi/Hxnp0HuRI5/7s7qu8Qg=="; - }; - dependencies = [ - sources."argparse-1.0.10" - sources."asap-2.0.6" - sources."asynckit-0.4.0" - sources."call-bind-apply-helpers-1.0.2" - sources."call-bound-1.0.4" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."component-emitter-1.3.1" - sources."cookiejar-2.1.4" - sources."debug-4.4.0" - sources."delayed-stream-1.0.0" - sources."dezalgo-1.0.4" - sources."dunder-proto-1.0.1" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."es-set-tostringtag-2.1.0" - sources."esprima-4.0.1" - sources."fast-safe-stringify-2.1.1" - sources."form-data-4.0.2" - sources."formidable-2.1.2" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.3.0" - sources."get-proto-1.0.1" - sources."gopd-1.2.0" - sources."graphlib-2.1.8" - sources."has-symbols-1.1.0" - sources."has-tostringtag-1.0.2" - sources."hasown-2.0.2" - sources."hexoid-1.0.0" - sources."inherits-2.0.4" - sources."js-yaml-3.14.1" - ( - sources."json-refs-3.0.15" - // { - dependencies = [ - sources."commander-4.1.1" - ]; - } - ) - sources."lodash-4.17.21" - sources."math-intrinsics-1.1.0" - sources."methods-1.1.2" - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."ms-2.1.3" - sources."native-promise-only-0.8.1" - sources."object-inspect-1.13.4" - sources."once-1.4.0" - sources."path-loader-1.0.12" - sources."punycode-2.3.1" - sources."qs-6.14.0" - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - sources."semver-7.7.1" - sources."side-channel-1.1.0" - sources."side-channel-list-1.0.0" - sources."side-channel-map-1.0.1" - sources."side-channel-weakmap-1.0.2" - sources."slash-3.0.0" - sources."sprintf-js-1.0.3" - sources."string_decoder-1.3.0" - sources."superagent-7.1.6" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Multi-file Swagger example"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; From 11e14030502512ae92d0e59fbc40ced0f9af7e23 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 12:05:38 -0500 Subject: [PATCH 2202/2279] nodePackages.livedown: drop Unmaintained and has lots of bugs. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 1329 ----------------- 3 files changed, 1 insertion(+), 1330 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index d917819e7b5a..12c1e76e7910 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -212,6 +212,7 @@ mapAliases { inherit (pkgs) lerna; # added 2025-02-12 less = pkgs.lessc; # added 2024-06-15 less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15 + livedown = throw "'livedown' has been removed because it was unmaintained"; # Added 2025-11-10 inherit (pkgs) localtunnel; # Added 2025-11-08 lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18 lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a9e4882f5760..e9810044e091 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -38,7 +38,6 @@ , "json-refs" , "lcov-result-merger" , "live-server" -, "livedown" , "madoko" , "mathjax" , "nijs" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 12afec7b20b6..f64888516dea 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -3621,15 +3621,6 @@ let sha512 = "4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA=="; }; }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha512 = "QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA=="; - }; - }; "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; @@ -3963,15 +3954,6 @@ let sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; }; }; - "anymatch-1.3.2" = { - name = "anymatch"; - packageName = "anymatch"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz"; - sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA=="; - }; - }; "anymatch-2.0.0" = { name = "anymatch"; packageName = "anymatch"; @@ -4134,15 +4116,6 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "arr-diff-2.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"; - sha512 = "dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA=="; - }; - }; "arr-diff-4.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -4215,15 +4188,6 @@ let sha512 = "M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="; }; }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; "array-flatten-2.1.2" = { name = "array-flatten"; packageName = "array-flatten"; @@ -4287,15 +4251,6 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "array-unique-0.2.1" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; - sha512 = "G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg=="; - }; - }; "array-unique-0.3.2" = { name = "array-unique"; packageName = "array-unique"; @@ -4305,15 +4260,6 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "arraybuffer.slice-0.0.7" = { - name = "arraybuffer.slice"; - packageName = "arraybuffer.slice"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; - sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="; - }; - }; "arrify-1.0.1" = { name = "arrify"; packageName = "arrify"; @@ -4710,15 +4656,6 @@ let sha512 = "OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg=="; }; }; - "backo2-1.0.2" = { - name = "backo2"; - packageName = "backo2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - sha512 = "zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="; - }; - }; "backoff-2.5.0" = { name = "backoff"; packageName = "backoff"; @@ -4764,15 +4701,6 @@ let sha512 = "kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="; }; }; - "base64-arraybuffer-0.1.4" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; - sha512 = "a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg=="; - }; - }; "base64-js-0.0.8" = { name = "base64-js"; packageName = "base64-js"; @@ -4998,15 +4926,6 @@ let sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; - "blob-0.0.5" = { - name = "blob"; - packageName = "blob"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"; - sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; - }; - }; "blob-to-buffer-1.2.9" = { name = "blob-to-buffer"; packageName = "blob-to-buffer"; @@ -5070,15 +4989,6 @@ let sha512 = "0P5VuWobU5Gwbeio8n9Jsdv0tE1IikrV9n4f7RsnXHNtxmdd/oeIO6QyoSEUAEyo5P6i3XMfBppi82WqNsT4JA=="; }; }; - "body-parser-1.20.3" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz"; - sha512 = "7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g=="; - }; - }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -5169,15 +5079,6 @@ let sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; }; }; - "braces-1.8.5" = { - name = "braces"; - packageName = "braces"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"; - sha512 = "xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw=="; - }; - }; "braces-2.3.2" = { name = "braces"; packageName = "braces"; @@ -6060,15 +5961,6 @@ let sha512 = "yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="; }; }; - "chokidar-1.7.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; - sha512 = "mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg=="; - }; - }; "chokidar-2.1.8" = { name = "chokidar"; packageName = "chokidar"; @@ -6816,24 +6708,6 @@ let sha512 = "3D+EY5nsRhqnOwDxveBv5T8wGo4DEvYxjDtPGmdOX+gfr5gE92c2RC0w2wa+xEefm07QuVqqcF3nZJUZ92l/og=="; }; }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - sha512 = "WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw=="; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha512 = "jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA=="; - }; - }; "component-emitter-1.3.1" = { name = "component-emitter"; packageName = "component-emitter"; @@ -6843,15 +6717,6 @@ let sha512 = "T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ=="; }; }; - "component-inherit-0.0.3" = { - name = "component-inherit"; - packageName = "component-inherit"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - sha512 = "w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA=="; - }; - }; "compress-commons-4.1.2" = { name = "compress-commons"; packageName = "compress-commons"; @@ -7068,15 +6933,6 @@ let sha512 = "kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA=="; }; }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; "content-type-1.0.4" = { name = "content-type"; packageName = "content-type"; @@ -7131,24 +6987,6 @@ let sha512 = "rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ=="; }; }; - "cookie-0.4.2" = { - name = "cookie"; - packageName = "cookie"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; - }; - }; - "cookie-0.7.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz"; - sha512 = "6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="; - }; - }; "cookie-0.7.2" = { name = "cookie"; packageName = "cookie"; @@ -7158,15 +6996,6 @@ let sha512 = "yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="; }; }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; "cookiejar-2.1.4" = { name = "cookiejar"; packageName = "cookiejar"; @@ -7788,24 +7617,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; - "debug-4.1.1" = { - name = "debug"; - packageName = "debug"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -8832,15 +8643,6 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "engine.io-3.6.2" = { - name = "engine.io"; - packageName = "engine.io"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.2.tgz"; - sha512 = "C4JjGQZLY3kWlIDx0BQNKizbrfpb7NahxDztGdN5jrPK2ghmXiNDN+E/t0JzDeNRZxPVaszxEng42Pmj27X/0w=="; - }; - }; "engine.io-6.6.4" = { name = "engine.io"; packageName = "engine.io"; @@ -8850,15 +8652,6 @@ let sha512 = "ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g=="; }; }; - "engine.io-client-3.5.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.4.tgz"; - sha512 = "ydc8uuMMDxC5KCKNJN3zZKYJk2sgyTuTZQ7Aj1DJSsLKAcizA/PzWivw8fZMIjJVBo2CJOYzntv4FSjY/Lr//g=="; - }; - }; "engine.io-client-6.6.3" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -8868,15 +8661,6 @@ let sha512 = "T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w=="; }; }; - "engine.io-parser-2.2.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz"; - sha512 = "x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="; - }; - }; "engine.io-parser-5.2.3" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -8886,15 +8670,6 @@ let sha512 = "HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q=="; }; }; - "entities-1.1.2" = { - name = "entities"; - packageName = "entities"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; - }; - }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -9660,15 +9435,6 @@ let sha512 = "Fqs7ChZm72y40wKjOFXBKg7nJZvQJmewP5/7LtePDdnah/+FH9Hp5sgMujSCMPXlxOAW2//1jrW9pnsY7o20vQ=="; }; }; - "expand-brackets-0.1.5" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha512 = "hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA=="; - }; - }; "expand-brackets-2.1.4" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -9678,15 +9444,6 @@ let sha512 = "w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA=="; }; }; - "expand-range-1.8.2" = { - name = "expand-range"; - packageName = "expand-range"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"; - sha512 = "AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA=="; - }; - }; "expand-template-2.0.3" = { name = "expand-template"; packageName = "expand-template"; @@ -9714,15 +9471,6 @@ let sha512 = "8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="; }; }; - "express-4.21.2" = { - name = "express"; - packageName = "express"; - version = "4.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.21.2.tgz"; - sha512 = "28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -9777,15 +9525,6 @@ let sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; }; - "extglob-0.3.2" = { - name = "extglob"; - packageName = "extglob"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; - sha512 = "1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg=="; - }; - }; "extglob-2.0.4" = { name = "extglob"; packageName = "extglob"; @@ -10146,15 +9885,6 @@ let sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; }; }; - "filename-regex-2.0.1" = { - name = "filename-regex"; - packageName = "filename-regex"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; - sha512 = "BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -10164,15 +9894,6 @@ let sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; - "fill-range-2.2.4" = { - name = "fill-range"; - packageName = "fill-range"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz"; - sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="; - }; - }; "fill-range-4.0.0" = { name = "fill-range"; packageName = "fill-range"; @@ -10209,15 +9930,6 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "finalhandler-1.3.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz"; - sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ=="; - }; - }; "find-up-1.1.2" = { name = "find-up"; packageName = "find-up"; @@ -10425,15 +10137,6 @@ let sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha512 = "SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw=="; - }; - }; "for-own-1.0.0" = { name = "for-own"; packageName = "for-own"; @@ -10533,15 +10236,6 @@ let sha512 = "CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g=="; }; }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; "fragment-cache-0.2.1" = { name = "fragment-cache"; packageName = "fragment-cache"; @@ -10965,15 +10659,6 @@ let sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; }; }; - "github-slugger-1.5.0" = { - name = "github-slugger"; - packageName = "github-slugger"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.5.0.tgz"; - sha512 = "wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw=="; - }; - }; "github-slugger-2.0.0" = { name = "github-slugger"; packageName = "github-slugger"; @@ -11055,15 +10740,6 @@ let sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; }; }; - "glob-base-0.3.0" = { - name = "glob-base"; - packageName = "glob-base"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; - sha512 = "ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA=="; - }; - }; "glob-escape-0.0.2" = { name = "glob-escape"; packageName = "glob-escape"; @@ -11082,15 +10758,6 @@ let sha512 = "AD7lbWbwF2Ii9gBQsQIOEzwuqP/jsnyvK27/3JDq1kn/JyfDtYI6AWz3ZQwcPuQdHSBcFh+A2yT/SEep27LOGg=="; }; }; - "glob-parent-2.0.0" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; - sha512 = "JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w=="; - }; - }; "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; @@ -11424,24 +11091,6 @@ let sha512 = "R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg=="; }; }; - "has-binary2-1.0.3" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz"; - sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="; - }; - }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha512 = "g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="; - }; - }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -11811,15 +11460,6 @@ let sha512 = "sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg=="; }; }; - "html-entities-1.4.0" = { - name = "html-entities"; - packageName = "html-entities"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz"; - sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; - }; - }; "html-void-elements-3.0.0" = { name = "html-void-elements"; packageName = "html-void-elements"; @@ -12333,15 +11973,6 @@ let sha512 = "oBIzs6EARNMzrLgVg20fK52H19WcRHBiukiiEkw9rnnI//8rinEBMLrYdwEfJ9d4K7bjV1L6nSGft6H/qzHNgQ=="; }; }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha512 = "i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -12513,15 +12144,6 @@ let sha512 = "1aVsPEsJWMJq/pdMU61CDlm1URcW702MTB4w9/zUjMus6H/Py8o7g68Pr9D4I6QluWGt/KdmswuRhaA05xVR1w=="; }; }; - "innertext-1.0.3" = { - name = "innertext"; - packageName = "innertext"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/innertext/-/innertext-1.0.3.tgz"; - sha512 = "ZC410b7IbrTrmt8bQb27xUOJgXkJu+XL6MVncb9FGyxjRIHyQqNjpSDY20zvSUttkAiYj0dait/67/sXyWvwYg=="; - }; - }; "inquirer-12.4.3" = { name = "inquirer"; packageName = "inquirer"; @@ -12702,15 +12324,6 @@ let sha512 = "Mb6kv78bTi4RNAIIWL8Bbre7hXOR2pNUi3j8FaQkLaitf/ZWxkq3/iIwXNYk2ACO3IMfdVdQrOkUtwZblO7uBA=="; }; }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; "ipaddr.js-2.2.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -12954,15 +12567,6 @@ let sha512 = "eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="; }; }; - "is-dotfile-1.0.3" = { - name = "is-dotfile"; - packageName = "is-dotfile"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha512 = "9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg=="; - }; - }; "is-empty-1.2.0" = { name = "is-empty"; packageName = "is-empty"; @@ -12972,15 +12576,6 @@ let sha512 = "F2FnH/otLNJv0J6wc73A5Xo7oHLNnqplYqZhUu01tD54DIPvxIRSTSLkrUB/M0nHO4vo1O9PDfN4KoTxCzLh/w=="; }; }; - "is-equal-shallow-0.1.3" = { - name = "is-equal-shallow"; - packageName = "is-equal-shallow"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha512 = "0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA=="; - }; - }; "is-es2016-keyword-1.0.0" = { name = "is-es2016-keyword"; packageName = "is-es2016-keyword"; @@ -13008,15 +12603,6 @@ let sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; }; - "is-extglob-1.0.0" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"; - sha512 = "7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww=="; - }; - }; "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; @@ -13107,15 +12693,6 @@ let sha512 = "TuiCHA5zadRVryd5gDJzPZj7yJbyMeR2r7IK/gF9z2MZwPF+A7ML9YYO8CwzdLsmxeTmxlmC6GKIeQBWJFFMQg=="; }; }; - "is-glob-2.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"; - sha512 = "a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg=="; - }; - }; "is-glob-3.1.0" = { name = "is-glob"; packageName = "is-glob"; @@ -13224,15 +12801,6 @@ let sha512 = "JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ=="; }; }; - "is-number-2.1.0" = { - name = "is-number"; - packageName = "is-number"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; - sha512 = "QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg=="; - }; - }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; @@ -13242,15 +12810,6 @@ let sha512 = "4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="; }; }; - "is-number-4.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"; - sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; - }; - }; "is-number-7.0.0" = { name = "is-number"; packageName = "is-number"; @@ -13386,24 +12945,6 @@ let sha512 = "9UoipoxYmSk6Xy7QFgRv2HDyaysmgSG75TFQs6S+3pDM7ZhKTF/bskZV+0UlABHzKjNVhPjYCLfeZUEg1wXxig=="; }; }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha512 = "Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ=="; - }; - }; - "is-primitive-2.0.0" = { - name = "is-primitive"; - packageName = "is-primitive"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"; - sha512 = "N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q=="; - }; - }; "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; @@ -13710,15 +13251,6 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha512 = "c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ=="; - }; - }; "isarray-2.0.5" = { name = "isarray"; packageName = "isarray"; @@ -14637,15 +14169,6 @@ let sha512 = "wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A=="; }; }; - "linkify-it-2.2.0" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz"; - sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw=="; - }; - }; "linkify-it-5.0.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -15519,15 +15042,6 @@ let sha512 = "a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg=="; }; }; - "markdown-it-8.4.2" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "8.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz"; - sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ=="; - }; - }; "markdown-it-anchor-8.6.7" = { name = "markdown-it-anchor"; packageName = "markdown-it-anchor"; @@ -15537,33 +15051,6 @@ let sha512 = "FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA=="; }; }; - "markdown-it-emoji-1.4.0" = { - name = "markdown-it-emoji"; - packageName = "markdown-it-emoji"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; - sha512 = "QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg=="; - }; - }; - "markdown-it-github-headings-1.1.2" = { - name = "markdown-it-github-headings"; - packageName = "markdown-it-github-headings"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.2.tgz"; - sha512 = "8haIwpAx87DQHcEtzkfsWv2hxg4jOvow6/nJKAMQ2wYRMZQTIfJm9VzrDkqw72Bb4YXBmI0u3GA/3MdXVL/x5g=="; - }; - }; - "markdown-it-task-checkbox-1.0.6" = { - name = "markdown-it-task-checkbox"; - packageName = "markdown-it-task-checkbox"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz"; - sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; - }; - }; "markdown-table-3.0.4" = { name = "markdown-table"; packageName = "markdown-table"; @@ -15591,15 +15078,6 @@ let sha512 = "/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="; }; }; - "math-random-1.0.4" = { - name = "math-random"; - packageName = "math-random"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz"; - sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; - }; - }; "md5-2.3.0" = { name = "md5"; packageName = "md5"; @@ -15915,15 +15393,6 @@ let sha512 = "GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="; }; }; - "mdurl-1.0.1" = { - name = "mdurl"; - packageName = "mdurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; - }; - }; "mdurl-2.0.0" = { name = "mdurl"; packageName = "mdurl"; @@ -15933,15 +15402,6 @@ let sha512 = "Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w=="; }; }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; "mem-8.1.1" = { name = "mem"; packageName = "mem"; @@ -16005,15 +15465,6 @@ let sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; }; }; - "merge-descriptors-1.0.3" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz"; - sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="; - }; - }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -16572,15 +16023,6 @@ let sha512 = "Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA=="; }; }; - "micromatch-2.3.11" = { - name = "micromatch"; - packageName = "micromatch"; - version = "2.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; - sha512 = "LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA=="; - }; - }; "micromatch-3.1.10" = { name = "micromatch"; packageName = "micromatch"; @@ -18129,15 +17571,6 @@ let sha512 = "3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w=="; }; }; - "object.omit-2.0.1" = { - name = "object.omit"; - packageName = "object.omit"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; - sha512 = "UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA=="; - }; - }; "object.pick-1.3.0" = { name = "object.pick"; packageName = "object.pick"; @@ -18345,15 +17778,6 @@ let sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; }; }; - "opn-5.5.0" = { - name = "opn"; - packageName = "opn"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; - sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; - }; - }; "opn-6.0.0" = { name = "opn"; packageName = "opn"; @@ -18840,15 +18264,6 @@ let sha512 = "UGyowyjtx26n65kdAMWhm6/3uy5uSrpcuH7tt+QEVudiBoVS+eqHxD5kbi9oWVRwj7sCzXqwuM+rUGw7earl6A=="; }; }; - "parse-glob-3.0.4" = { - name = "parse-glob"; - packageName = "parse-glob"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"; - sha512 = "FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA=="; - }; - }; "parse-headers-2.0.5" = { name = "parse-headers"; packageName = "parse-headers"; @@ -18975,24 +18390,6 @@ let sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; }; - "parseqs-0.0.6" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz"; - sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="; - }; - }; - "parseuri-0.0.6" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz"; - sha512 = "AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="; - }; - }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -19200,15 +18597,6 @@ let sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="; }; }; - "path-to-regexp-0.1.12" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz"; - sha512 = "RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="; - }; - }; "path-to-regexp-1.9.0" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -19686,15 +19074,6 @@ let sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; }; }; - "preserve-0.2.0" = { - name = "preserve"; - packageName = "preserve"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"; - sha512 = "s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ=="; - }; - }; "prettier-2.8.8" = { name = "prettier"; packageName = "prettier"; @@ -19893,15 +19272,6 @@ let sha512 = "mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw=="; }; }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; "proxy-agent-6.5.0" = { name = "proxy-agent"; packageName = "proxy-agent"; @@ -20091,15 +19461,6 @@ let sha512 = "nR5uYqNsm8CgBhfCpsYKz6iDhvKjf0xdFT4KanNlLP40COGwZEsjbLoDyL9VrTXyiICUGUbsiN3gBpLGZhSZWQ=="; }; }; - "qs-6.13.0" = { - name = "qs"; - packageName = "qs"; - version = "6.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz"; - sha512 = "+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg=="; - }; - }; "qs-6.14.0" = { name = "qs"; packageName = "qs"; @@ -20235,15 +19596,6 @@ let sha512 = "Jdsdnezu913Ot8qgKgSgs63XkAjEsnMcS1z+cC6D6TNXsUXsMxy0RpclF2pzGZTEiTXL9BiArdGTEexcv4nqcA=="; }; }; - "randomatic-3.1.1" = { - name = "randomatic"; - packageName = "randomatic"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz"; - sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; - }; - }; "randombytes-2.1.0" = { name = "randombytes"; packageName = "randombytes"; @@ -20721,15 +20073,6 @@ let sha512 = "dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw=="; }; }; - "regex-cache-0.4.4" = { - name = "regex-cache"; - packageName = "regex-cache"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="; - }; - }; "regex-not-1.0.2" = { name = "regex-not"; packageName = "regex-not"; @@ -22800,15 +22143,6 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "socket.io-2.5.1" = { - name = "socket.io"; - packageName = "socket.io"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.5.1.tgz"; - sha512 = "eaTE4tBKRD6RFoetquMbxgvcpvoDtRyIlkIMI/SMK2bsKvbENTsDeeu4GJ/z9c90yOWxB7b/eC+yKLPbHnH6bA=="; - }; - }; "socket.io-4.8.1" = { name = "socket.io"; packageName = "socket.io"; @@ -22818,15 +22152,6 @@ let sha512 = "oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg=="; }; }; - "socket.io-adapter-1.1.2" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz"; - sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; - }; - }; "socket.io-adapter-2.5.5" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; @@ -22836,15 +22161,6 @@ let sha512 = "eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg=="; }; }; - "socket.io-client-2.5.0" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.5.0.tgz"; - sha512 = "lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw=="; - }; - }; "socket.io-client-4.8.1" = { name = "socket.io-client"; packageName = "socket.io-client"; @@ -22854,24 +22170,6 @@ let sha512 = "hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ=="; }; }; - "socket.io-parser-3.3.4" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.4.tgz"; - sha512 = "z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow=="; - }; - }; - "socket.io-parser-3.4.3" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.3.tgz"; - sha512 = "1rE4dZN3kCI/E5wixd393hmbqa78vVpkKmnEJhLeWoS/C5hbFYAbcSfnWoaVH43u9ToUVtzKjguxEZq+1XZfCQ=="; - }; - }; "socket.io-parser-4.2.4" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -24249,15 +23547,6 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; - "to-array-0.1.4" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - sha512 = "LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="; - }; - }; "to-object-path-0.3.0" = { name = "to-object-path"; packageName = "to-object-path"; @@ -24699,15 +23988,6 @@ let sha512 = "S/5/0kFftkq27FPNye0XM1e2NsnoD/3FS+pBmbjmmtLT6I+i344KoOf7pvXreaFsDamWeaJX55nczA1m5PsBDg=="; }; }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -24780,15 +24060,6 @@ let sha512 = "z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew=="; }; }; - "uc.micro-1.0.6" = { - name = "uc.micro"; - packageName = "uc.micro"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"; - sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; - }; - }; "uc.micro-2.1.0" = { name = "uc.micro"; packageName = "uc.micro"; @@ -27012,15 +26283,6 @@ let sha512 = "yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="; }; }; - "xmlhttprequest-ssl-1.6.3" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz"; - sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; - }; - }; "xmlhttprequest-ssl-2.1.2" = { name = "xmlhttprequest-ssl"; packageName = "xmlhttprequest-ssl"; @@ -27174,15 +26436,6 @@ let sha512 = "A1pf6fzh6eYkK0L4Qp7g9jzJSDrM6nN0bOn5T0IbY4Yo3w+YkWlHFkJP7mzknMXjqusHFHlKsK2N+4OLsK2MRA=="; }; }; - "yeast-0.1.2" = { - name = "yeast"; - packageName = "yeast"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - sha512 = "8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="; - }; - }; "yn-3.1.1" = { name = "yn"; packageName = "yn"; @@ -33555,588 +32808,6 @@ in bypassCache = true; reconstructLock = true; }; - livedown = nodeEnv.buildNodePackage { - name = "livedown"; - packageName = "livedown"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/livedown/-/livedown-2.1.1.tgz"; - sha512 = "C5x12+bwk7m2Sx3U27VZ7h5KP7vIlKfZGCabMi73nBGp0zPHtCaxQTPXDRoX5479EZUvycYJI0aD4h1d4+ds7w=="; - }; - dependencies = [ - sources."accepts-1.3.8" - sources."after-0.8.2" - sources."ajv-6.12.6" - sources."anymatch-1.3.2" - sources."argparse-1.0.10" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-flatten-1.1.1" - sources."array-unique-0.2.1" - sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" - sources."async-each-1.0.6" - sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.2" - sources."backo2-1.0.2" - ( - sources."base-0.11.2" - // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - } - ) - sources."base64-arraybuffer-0.1.4" - sources."base64id-2.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" - sources."blob-0.0.5" - sources."body-parser-1.20.3" - sources."braces-1.8.5" - sources."bufferutil-4.0.9" - sources."bytes-3.1.2" - ( - sources."cache-base-1.0.1" - // { - dependencies = [ - sources."isobject-3.0.1" - ]; - } - ) - sources."call-bind-apply-helpers-1.0.2" - sources."call-bound-1.0.4" - sources."caseless-0.12.0" - sources."chokidar-1.7.0" - ( - sources."class-utils-0.3.6" - // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - sources."isobject-3.0.1" - ]; - } - ) - sources."collection-visit-1.0.0" - sources."combined-stream-1.0.8" - sources."component-bind-1.0.0" - sources."component-emitter-1.3.1" - sources."component-inherit-0.0.3" - ( - sources."content-disposition-0.5.4" - // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - } - ) - sources."content-type-1.0.5" - sources."cookie-0.7.1" - sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.3" - sources."dashdash-1.14.1" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.2" - ( - sources."define-property-2.0.2" - // { - dependencies = [ - sources."isobject-3.0.1" - ]; - } - ) - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dunder-proto-1.0.1" - sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."encodeurl-2.0.0" - ( - sources."engine.io-3.6.2" - // { - dependencies = [ - sources."cookie-0.4.2" - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - } - ) - ( - sources."engine.io-client-3.5.4" - // { - dependencies = [ - sources."debug-3.1.0" - ]; - } - ) - sources."engine.io-parser-2.2.1" - sources."entities-1.1.2" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."escape-html-1.0.3" - sources."etag-1.8.1" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - ( - sources."express-4.21.2" - // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - } - ) - sources."extend-3.0.2" - ( - sources."extend-shallow-3.0.2" - // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - } - ) - sources."extglob-0.3.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."file-uri-to-path-1.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - sources."finalhandler-1.3.1" - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - sources."fsevents-1.2.13" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.3.0" - sources."get-proto-1.0.1" - sources."get-value-2.0.6" - sources."getpass-0.1.7" - sources."github-slugger-1.5.0" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."gopd-1.2.0" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - ( - sources."has-binary2-1.0.3" - // { - dependencies = [ - sources."isarray-2.0.1" - ]; - } - ) - sources."has-cors-1.1.0" - sources."has-symbols-1.1.0" - ( - sources."has-value-1.0.0" - // { - dependencies = [ - sources."isobject-3.0.1" - ]; - } - ) - ( - sources."has-values-1.0.0" - // { - dependencies = [ - ( - sources."is-number-3.0.0" - // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - } - ) - sources."kind-of-4.0.0" - ]; - } - ) - sources."hasown-2.0.2" - sources."html-entities-1.4.0" - sources."http-errors-2.0.0" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."indexof-0.0.1" - sources."inherits-2.0.4" - sources."innertext-1.0.3" - sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.1" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.1" - sources."is-descriptor-1.0.3" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - ( - sources."is-plain-object-2.0.4" - // { - dependencies = [ - sources."isobject-3.0.1" - ]; - } - ) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-typedarray-1.0.0" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" - sources."isobject-2.1.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."kind-of-3.2.2" - sources."linkify-it-2.2.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."markdown-it-8.4.2" - sources."markdown-it-emoji-1.4.0" - sources."markdown-it-github-headings-1.1.2" - sources."markdown-it-task-checkbox-1.0.6" - sources."math-intrinsics-1.1.0" - sources."math-random-1.0.4" - sources."mdurl-1.0.1" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.3" - sources."methods-1.1.2" - sources."micromatch-2.3.11" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimist-1.2.8" - ( - sources."mixin-deep-1.3.2" - // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - } - ) - sources."ms-2.0.0" - sources."nan-2.22.2" - ( - sources."nanomatch-1.2.13" - // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.3" - ]; - } - ) - sources."negotiator-0.6.3" - sources."node-gyp-build-4.8.4" - sources."normalize-path-2.1.1" - sources."oauth-sign-0.9.0" - ( - sources."object-copy-0.1.0" - // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - ]; - } - ) - sources."object-inspect-1.13.4" - ( - sources."object-visit-1.0.1" - // { - dependencies = [ - sources."isobject-3.0.1" - ]; - } - ) - sources."object.omit-2.0.1" - ( - sources."object.pick-1.3.0" - // { - dependencies = [ - sources."isobject-3.0.1" - ]; - } - ) - sources."on-finished-2.4.1" - sources."opn-5.5.0" - sources."parse-glob-3.0.4" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.12" - sources."performance-now-2.1.0" - sources."posix-character-classes-0.1.1" - sources."preserve-0.2.0" - sources."process-nextick-args-2.0.1" - sources."proxy-addr-2.0.7" - sources."psl-1.15.0" - sources."punycode-2.3.1" - sources."qs-6.13.0" - ( - sources."randomatic-3.1.1" - // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.3" - ]; - } - ) - sources."range-parser-1.2.1" - sources."raw-body-2.5.2" - sources."readable-stream-2.3.8" - ( - sources."readdirp-2.2.1" - // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - ( - sources."braces-2.3.2" - // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - } - ) - ( - sources."expand-brackets-2.1.4" - // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - } - ) - ( - sources."extglob-2.0.4" - // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - } - ) - ( - sources."fill-range-4.0.0" - // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - } - ) - sources."is-descriptor-0.1.7" - ( - sources."is-number-3.0.0" - // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - } - ) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."micromatch-3.1.10" - ]; - } - ) - sources."regex-cache-0.4.4" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - ( - sources."request-2.88.2" - // { - dependencies = [ - sources."qs-6.5.3" - ]; - } - ) - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - ( - sources."send-0.19.0" - // { - dependencies = [ - sources."encodeurl-1.0.2" - sources."ms-2.1.3" - ]; - } - ) - sources."serve-static-1.16.2" - ( - sources."set-value-2.0.1" - // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - } - ) - sources."setprototypeof-1.2.0" - sources."side-channel-1.1.0" - sources."side-channel-list-1.0.0" - sources."side-channel-map-1.0.1" - sources."side-channel-weakmap-1.0.2" - ( - sources."snapdragon-0.8.2" - // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - sources."is-descriptor-0.1.7" - ]; - } - ) - ( - sources."snapdragon-node-2.1.1" - // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - } - ) - sources."snapdragon-util-3.0.1" - ( - sources."socket.io-2.5.1" - // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - } - ) - sources."socket.io-adapter-1.1.2" - ( - sources."socket.io-client-2.5.0" - // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - sources."socket.io-parser-3.3.4" - ]; - } - ) - ( - sources."socket.io-parser-3.4.3" - // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - ]; - } - ) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - sources."sshpk-1.18.0" - ( - sources."static-extend-0.1.2" - // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - ]; - } - ) - sources."statuses-2.0.1" - sources."string_decoder-1.1.1" - sources."to-array-0.1.4" - sources."to-object-path-0.3.0" - sources."to-regex-3.0.2" - ( - sources."to-regex-range-2.1.1" - // { - dependencies = [ - sources."is-number-3.0.0" - ]; - } - ) - sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-is-1.6.18" - sources."uc.micro-1.0.6" - sources."union-value-1.0.1" - sources."unpipe-1.0.0" - ( - sources."unset-value-1.0.0" - // { - dependencies = [ - ( - sources."has-value-0.3.1" - // { - dependencies = [ - sources."isobject-2.1.0" - ]; - } - ) - sources."has-values-0.1.4" - sources."isobject-3.0.1" - ]; - } - ) - sources."uri-js-4.4.1" - sources."urix-0.1.0" - sources."use-3.1.1" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" - sources."vary-1.1.2" - ( - sources."verror-1.10.0" - // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - } - ) - sources."ws-7.5.10" - sources."xmlhttprequest-ssl-1.6.3" - sources."yeast-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Live Markdown previews for your favourite editor"; - homepage = "https://github.com/shime/livedown"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; madoko = nodeEnv.buildNodePackage { name = "madoko"; packageName = "madoko"; From a399fb09ccdd75a5a3ac11e6757d1860b69fa6ec Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 12:14:20 -0500 Subject: [PATCH 2203/2279] nodePackages.json-refs: drop Unmaintained and has a bunch of vulnerable dependencies --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 160 ------------------ 3 files changed, 1 insertion(+), 161 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 12c1e76e7910..e40cd581878f 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -202,6 +202,7 @@ mapAliases { inherit (pkgs) json-diff; # Added 2025-11-07 jsonlint = throw "'jsonlint' has been removed because it is unmaintained upstream"; # Added 2025-11-10 inherit (pkgs) jsonplaceholder; # Added 2025-11-04 + json-refs = throw "'json-refs' has been removed because it is unmaintained and has several known vulnerable dependencies"; # Added 2025-11-10 inherit (pkgs) json-server; # Added 2025-11-06 joplin = pkgs.joplin-cli; # Added 2025-11-02 inherit (pkgs) kaput-cli; # added 2024-12-03 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index e9810044e091..7ba8a3c0928a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -35,7 +35,6 @@ , "js-yaml" , "jsdoc" , "json" -, "json-refs" , "lcov-result-merger" , "live-server" , "madoko" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f64888516dea..be1782953e0b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -6663,15 +6663,6 @@ let sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; - "commander-4.1.1" = { - name = "commander"; - packageName = "commander"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -6996,15 +6987,6 @@ let sha512 = "yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="; }; }; - "cookiejar-2.1.4" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz"; - sha512 = "LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw=="; - }; - }; "copy-descriptor-0.1.1" = { name = "copy-descriptor"; packageName = "copy-descriptor"; @@ -10227,15 +10209,6 @@ let sha512 = "KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ=="; }; }; - "formidable-2.1.2" = { - name = "formidable"; - packageName = "formidable"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz"; - sha512 = "CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g=="; - }; - }; "fragment-cache-0.2.1" = { name = "fragment-cache"; packageName = "fragment-cache"; @@ -10983,15 +10956,6 @@ let sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; - "graphlib-2.1.8" = { - name = "graphlib"; - packageName = "graphlib"; - version = "2.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz"; - sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; - }; - }; "graphology-0.25.4" = { name = "graphology"; packageName = "graphology"; @@ -11379,15 +11343,6 @@ let sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; - "hexoid-1.0.0" = { - name = "hexoid"; - packageName = "hexoid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz"; - sha512 = "QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g=="; - }; - }; "highlight-es-1.0.3" = { name = "highlight-es"; packageName = "highlight-es"; @@ -15492,15 +15447,6 @@ let sha512 = "tmj4CKZJVQd/ZuN9hnYD8HBAs/3RdDdqUeJG9RbVYlEZLuPYK4EW+EekMqLsCV4w1HastX+Pk2Ov87OQmeo01A=="; }; }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; "micro-9.3.5-canary.3" = { name = "micro"; packageName = "micro"; @@ -16707,15 +16653,6 @@ let sha512 = "GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA=="; }; }; - "native-promise-only-0.8.1" = { - name = "native-promise-only"; - packageName = "native-promise-only"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; - sha512 = "zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg=="; - }; - }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -18534,15 +18471,6 @@ let sha512 = "haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="; }; }; - "path-loader-1.0.12" = { - name = "path-loader"; - packageName = "path-loader"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.12.tgz"; - sha512 = "n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ=="; - }; - }; "path-match-1.2.4" = { name = "path-match"; packageName = "path-match"; @@ -23070,15 +22998,6 @@ let sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg=="; }; }; - "superagent-7.1.6" = { - name = "superagent"; - packageName = "superagent"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz"; - sha512 = "gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g=="; - }; - }; "supports-color-2.0.0" = { name = "supports-color"; packageName = "supports-color"; @@ -32305,85 +32224,6 @@ in bypassCache = true; reconstructLock = true; }; - json-refs = nodeEnv.buildNodePackage { - name = "json-refs"; - packageName = "json-refs"; - version = "3.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz"; - sha512 = "0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw=="; - }; - dependencies = [ - sources."argparse-1.0.10" - sources."asap-2.0.6" - sources."asynckit-0.4.0" - sources."call-bind-apply-helpers-1.0.2" - sources."call-bound-1.0.4" - sources."combined-stream-1.0.8" - sources."commander-4.1.1" - sources."component-emitter-1.3.1" - sources."cookiejar-2.1.4" - sources."debug-4.4.0" - sources."delayed-stream-1.0.0" - sources."dezalgo-1.0.4" - sources."dunder-proto-1.0.1" - sources."es-define-property-1.0.1" - sources."es-errors-1.3.0" - sources."es-object-atoms-1.1.1" - sources."es-set-tostringtag-2.1.0" - sources."esprima-4.0.1" - sources."fast-safe-stringify-2.1.1" - sources."form-data-4.0.2" - sources."formidable-2.1.2" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.3.0" - sources."get-proto-1.0.1" - sources."gopd-1.2.0" - sources."graphlib-2.1.8" - sources."has-symbols-1.1.0" - sources."has-tostringtag-1.0.2" - sources."hasown-2.0.2" - sources."hexoid-1.0.0" - sources."inherits-2.0.4" - sources."js-yaml-3.14.1" - sources."lodash-4.17.21" - sources."math-intrinsics-1.1.0" - sources."methods-1.1.2" - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."ms-2.1.3" - sources."native-promise-only-0.8.1" - sources."object-inspect-1.13.4" - sources."once-1.4.0" - sources."path-loader-1.0.12" - sources."punycode-2.3.1" - sources."qs-6.14.0" - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - sources."semver-7.7.1" - sources."side-channel-1.1.0" - sources."side-channel-list-1.0.0" - sources."side-channel-map-1.0.1" - sources."side-channel-weakmap-1.0.2" - sources."slash-3.0.0" - sources."sprintf-js-1.0.3" - sources."string_decoder-1.3.0" - sources."superagent-7.1.6" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)"; - homepage = "https://github.com/whitlockjc/json-refs"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; From e2e42a4e9fe164ea81b73139825f4815b8df941b Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Mon, 10 Nov 2025 18:21:22 +0100 Subject: [PATCH 2204/2279] maintainers: add SchahinRohani --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 689b137da2f2..f1950d6b1a3d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23249,6 +23249,12 @@ github = "scd31"; githubId = 57571338; }; + SchahinRohani = { + email = "schahin@rouhanizadeh.de"; + github = "SchahinRohani"; + githubId = 24507823; + name = "Schahin Rouhanizadeh"; + }; schinmai-akamai = { email = "schinmai@akamai.com"; github = "tchinmai7"; From 01b0c2aab8839254667b89769c2dd9e07f589233 Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Mon, 10 Nov 2025 18:22:41 +0100 Subject: [PATCH 2205/2279] flyctl: add SchahinRohani as maintainer --- pkgs/by-name/fl/flyctl/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 109016e70fb4..31d17695f3fe 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -78,6 +78,7 @@ buildGoModule rec { jsierles techknowlogick RaghavSood + SchahinRohani ]; mainProgram = "flyctl"; }; From e707a4eb7f23b3ae54494e2a566ef52c6cf5a798 Mon Sep 17 00:00:00 2001 From: Schahin Rouhanizadeh Date: Mon, 10 Nov 2025 18:24:33 +0100 Subject: [PATCH 2206/2279] flyctl: 0.3.172 -> 0.3.209 --- pkgs/by-name/fl/flyctl/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 31d17695f3fe..4f6a45b2b426 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -6,20 +6,23 @@ testers, flyctl, installShellFiles, + git, }: buildGoModule rec { pname = "flyctl"; - version = "0.3.172"; + version = "0.3.209"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-jKzlKOdE+SrCzY81ciI9sKN0iiFZMsKp04A+1TV1+i0="; + leaveDotGit = true; + hash = "sha256-D1MSlg6oFmdyiEaq10DUwzADzleilFIQ22oQd8LGfRk="; }; - vendorHash = "sha256-D6b+dLoE4IdhsmnWILe7Thkggq3p0ur4C3BOz7Cuk98="; + proxyVendor = true; + vendorHash = "sha256-ezGA1LGwQVFMzV/Ogj26pooD06O7FNTXMrYWkv6AwWM="; subPackages = [ "." ]; @@ -31,11 +34,17 @@ buildGoModule rec { ]; tags = [ "production" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + git + ]; patches = [ ./disable-auto-update.patch ]; preBuild = '' + # Embed VCS Infos + export GOFLAGS="$GOFLAGS -buildvcs=true" + GOOS= GOARCH= CGO_ENABLED=0 go generate ./... ''; From c6e6f266fbdd31a3a79aeb45b4a854831b52bcd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 17:36:48 +0000 Subject: [PATCH 2207/2279] terraform-providers.hashicorp_vault: 5.3.0 -> 5.4.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 2c413730cf25..805153d813ad 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -669,13 +669,13 @@ "vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U=" }, "hashicorp_vault": { - "hash": "sha256-5jx6a2BfnugD41D6iK7wvOzmMPImxNHCiIix4+puRp4=", + "hash": "sha256-xmi+79FoT8vXHJqMmIAIV+YcpZzAA40cNOxDOufJkro=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v5.3.0", + "rev": "v5.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qrztgFJ/WDTxP5565rnx2sAELFKQGOxFuEYqWQQYVVY=" + "vendorHash": "sha256-zZUFUcgMQkbnh7It9k/7J/2KfiP1q3nlcC58xPb2bBo=" }, "hashicorp_vsphere": { "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=", From 5626dac01aa9fc826609e0c39280cb4135690168 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 17:37:23 +0000 Subject: [PATCH 2208/2279] python3Packages.rectangle-packer: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/rectangle-packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rectangle-packer/default.nix b/pkgs/development/python-modules/rectangle-packer/default.nix index 186a11a10676..7163f13bc066 100644 --- a/pkgs/development/python-modules/rectangle-packer/default.nix +++ b/pkgs/development/python-modules/rectangle-packer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rectangle-packer"; - version = "2.0.4"; + version = "2.0.5"; pyproject = true; src = fetchFromGitHub { owner = "Penlect"; repo = "rectangle-packer"; rev = version; - hash = "sha256-Tm1ZkWTecmQDGsTOa1AP2GtjdxVgxklLIYSBlTSfSiY="; + hash = "sha256-BHFy88yrcfDRalvrzwUHseSKmQXIM70ginnd+W6LVLY="; }; build-system = [ From 679ddd612e23ecde2e76f3db0a030631697ceb73 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 10 Nov 2025 19:39:14 +0200 Subject: [PATCH 2209/2279] netron: 8.3.9 -> 8.7.3 electron_36 is also EOL and got marked as insecure in #458485. --- pkgs/by-name/ne/netron/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix index 319e29038ed9..33f06a2867a2 100644 --- a/pkgs/by-name/ne/netron/package.nix +++ b/pkgs/by-name/ne/netron/package.nix @@ -2,30 +2,30 @@ lib, stdenv, buildNpmPackage, - electron_36, + electron_39, fetchFromGitHub, jq, makeDesktopItem, }: let - electron = electron_36; + electron = electron_39; description = "Visualizer for neural network, deep learning and machine learning models"; icon = "netron"; in buildNpmPackage (finalAttrs: { pname = "netron"; - version = "8.3.9"; + version = "8.7.3"; src = fetchFromGitHub { owner = "lutzroeder"; repo = "netron"; tag = "v${finalAttrs.version}"; - hash = "sha256-4AnbhdZVkPhpzNxmjhRNcUTiWrxXNWqVrUxR8pO+ULo="; + hash = "sha256-4ATVEPOOju2nz7vsl+qCwG4A6F1HRx3/1MkFSUKPD2Q="; }; - npmDepsHash = "sha256-71O2cMr44tLv4m/iM/pOE126k1Z2DTRDKI7o7aWUePg="; + npmDepsHash = "sha256-TTAemrFZoXKlkPSHjQWZh0zree+s5ZWYXT0cy8xUBA0="; nativeBuildInputs = [ jq ]; From ce16c0709ee00138b886006f95761df0dd6cc5ee Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 10 Nov 2025 09:43:26 -0800 Subject: [PATCH 2210/2279] terraform-providers.hashicorp_aws: 6.19.0 -> 6.20.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 09db6999a939..1ec9e796571f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -489,13 +489,13 @@ "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug=" }, "hashicorp_aws": { - "hash": "sha256-wavy4GE4VrXhDYqWAJsexxFPDM/Roo+YKp/DqVw8+jU=", + "hash": "sha256-YxN5bk0Us+LZlNMzt1/eh5I2gV77S/J+wt82WIGZvZU=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.19.0", + "rev": "v6.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw=" + "vendorHash": "sha256-mTK19nqRGR7H45oUHgSC56KrAEJFIu/EocqBjY70fDY=" }, "hashicorp_awscc": { "hash": "sha256-eaFzTQehn1nIq0Zl/8r2AtmPQnhh7X44q/6JVzIzX2A=", From 6a9d42246e07a2eb1a53b9719d5c1c9affb877d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 17:58:30 +0000 Subject: [PATCH 2211/2279] mpvScripts.visualizer: 0-unstable-2025-04-12 -> 0-unstable-2025-11-07 --- pkgs/applications/video/mpv/scripts/visualizer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index 1f339bdbeffc..aa31c79ee833 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -6,13 +6,13 @@ }: buildLua { pname = "visualizer"; - version = "0-unstable-2025-04-12"; + version = "0-unstable-2025-11-07"; src = fetchFromGitHub { owner = "mfcc64"; repo = "mpv-scripts"; - rev = "bf6776f5c3dae8d83ba29b820496af89dc436613"; - sha256 = "9ApUBXjH4TKPP4P/fUXSNYbJu2AH6HBYt+1K+sHB7yE="; + rev = "fd73f95c6b642366adf1df8dd4ff998d89d2e13e"; + sha256 = "+4QV1f+8YffevXNYETHDl4Rwb5cDx+YBbaDk7MscHEU="; }; passthru.updateScript = unstableGitUpdater { }; From a81b558760cc94e74af291e643efb62a30ffc8e3 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 11 Nov 2025 01:56:30 +0800 Subject: [PATCH 2212/2279] writeShellApplication: use lib.concatMapAttrsStringSep --- pkgs/build-support/trivial-builders/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 620efd0cfad2..8f7e9cf14841 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -350,12 +350,10 @@ rec { ${lib.concatMapStringsSep "\n" (option: "set -o ${option}") bashOptions} '' + lib.optionalString (runtimeEnv != null) ( - lib.concatStrings ( - lib.mapAttrsToList (name: value: '' - ${lib.toShellVar name value} - export ${name} - '') runtimeEnv - ) + lib.concatMapAttrsStringSep "" (name: value: '' + ${lib.toShellVar name value} + export ${name} + '') runtimeEnv ) + lib.optionalString (runtimeInputs != [ ]) '' From 735b827525b296a13617680c367169d20ee11e51 Mon Sep 17 00:00:00 2001 From: er0k Date: Mon, 10 Nov 2025 13:20:58 -0500 Subject: [PATCH 2213/2279] aws-vault: 7.7.5 -> 7.6.5 There was a breaking change introduced in 7.7.0 on darwin platforms using the keychain backend, as reported by @retrry. This reverts to the last known working version, 7.6.5. --- pkgs/by-name/aw/aws-vault/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index f571c25b9782..9ef03bb306d8 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -9,25 +9,21 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.7.5"; + version = "7.6.5"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${version}"; - hash = "sha256-K91GNyvtjDO6UMU9cC+TbUdMWdXrPlKLU8u5cbEMdRA="; + hash = "sha256-2Z3gh4F29v04pV5hz4XEn1GZFLjXMBnbBghGKczoCBk="; }; - proxyVendor = true; - vendorHash = "sha256-3AL3vjKqzjrzgPrLLwIgWpn1hRB6soTMbaRly/fvziA="; - + vendorHash = "sha256-nzeNwiNiDXBO9fwMVlc09Ulj/SPzxV+vrMb70PB5N+8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; - env.CGO_ENABLED = "0"; - postInstall = '' # make xdg-open overrideable at runtime # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links From 996ddc4babf57cbddc27a0f3447c25a9ac7e3341 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 18:44:20 +0000 Subject: [PATCH 2214/2279] terraform-providers.sacloud_sakuracloud: 2.31.1 -> 2.31.2 --- .../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 2c413730cf25..a4a80fe12064 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1147,13 +1147,13 @@ "vendorHash": null }, "sacloud_sakuracloud": { - "hash": "sha256-kiAl/qdLbXzBCwgms3Y7TD/Ez2Hq0ifZ1SLVIPa9Bmk=", + "hash": "sha256-BNwGibmt6Ym8fqYtM3pB++Yo33LvOSBL+CY/FmSW/r0=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.31.1", + "rev": "v2.31.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-BREv9hd6Oa/S8NjpRoLcF8uUFykEyffQO0LCuA3WFmc=" + "vendorHash": "sha256-b1ziyrDKVUbTrN31t1IRFcK8EjsDSBP4FfArPkHKlBc=" }, "sap_btp": { "hash": "sha256-55SNzeOaMyaidEbCjGPNF20qhQgddNHOl2xNqd7OZU4=", From 6b8501e71e6771069d32e99d0a218bfac251bc03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 19:04:28 +0000 Subject: [PATCH 2215/2279] rasm: 2.3.9 -> 3.0 --- pkgs/by-name/ra/rasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index d3f982c715b5..8878b6c8de5a 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.3.9"; + version = "3.0"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-vTN9EmqfSZh8ecHlaSCi6qgsKtZBh8qr0vaqyiP5R9I="; + hash = "sha256-pRDfaQVqR7OVwSKh2dMU4QjEb5SGQ2eoG8g9aUJwrXU="; }; # by default the EXEC variable contains `rasm.exe` From 79d36bb6a121bf95c01c5e6f70a01d14e4a6bf90 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 10 Nov 2025 16:07:15 -0300 Subject: [PATCH 2216/2279] vimPlugins.gdscript-extended-lsp-nvim: init at 2025-10-28 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 08942cb6cd7b..6c4423fe7f6e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5633,6 +5633,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + gdscript-extended-lsp-nvim = buildVimPlugin { + pname = "gdscript-extended-lsp.nvim"; + version = "2025-10-28"; + src = fetchFromGitHub { + owner = "Teatek"; + repo = "gdscript-extended-lsp.nvim"; + rev = "27eab5f4979b759368a7760d6955fb93f147e97e"; + sha256 = "1jilxsz49w720ai41zksvap6bsib347bz9xh0x8b0izcpmsdjc80"; + }; + meta.homepage = "https://github.com/Teatek/gdscript-extended-lsp.nvim/"; + meta.hydraPlatforms = [ ]; + }; + gen-nvim = buildVimPlugin { pname = "gen.nvim"; version = "2025-05-03"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6208e68e00ae..99eb15e46ec3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -431,6 +431,7 @@ https://github.com/gfanto/fzf-lsp.nvim/,, https://github.com/junegunn/fzf.vim/,, https://github.com/NTBBloodbath/galaxyline.nvim/,, https://github.com/gbprod/nord.nvim/,,gbprod-nord +https://github.com/Teatek/gdscript-extended-lsp.nvim/,HEAD, https://github.com/David-Kunz/gen.nvim/,HEAD, https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, From 6e018e2405636cb8fd00169413c54ed0075d51c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 19:15:44 +0000 Subject: [PATCH 2217/2279] pure-prompt: 1.24.0 -> 1.25.0 --- pkgs/by-name/pu/pure-prompt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/pure-prompt/package.nix b/pkgs/by-name/pu/pure-prompt/package.nix index 889fe0c5a4f4..04ab659125ff 100644 --- a/pkgs/by-name/pu/pure-prompt/package.nix +++ b/pkgs/by-name/pu/pure-prompt/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-LfrZUv0UMVyygPd1RAv2EIWEvds2n0iEG8G2q7h5izM="; + sha256 = "sha256-Z4iBLmbQuil2tGpCGdA/uOqL28AAeA/PxtRKLYI3y7I="; }; strictDeps = true; From 21a0c5f256f2526959e2a01ba5c00bb21eb0e4e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 19:19:40 +0000 Subject: [PATCH 2218/2279] python3Packages.metakernel: 0.30.3 -> 0.30.4 --- pkgs/development/python-modules/metakernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 2e823b7ef137..b02e080ada61 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.30.3"; + version = "0.30.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nryNTYciAq16xkpW4HIm2NPFzkW1tCDQQB9UfHUKR10="; + hash = "sha256-SIWPiGMNsEcPIkcT0HY4/9QRt1wxPwYxZGLUOjywgug="; }; build-system = [ hatchling ]; From e096f3cd5b647d812287196c78f64ae1e98a6241 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 20:24:47 +0100 Subject: [PATCH 2219/2279] checkov: 3.2.490 -> 3.2.492 Diff: https://github.com/bridgecrewio/checkov/compare/3.2.490...3.2.492 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.492 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index bd243df7ba47..78c3f33dd932 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.490"; + version = "3.2.492"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-QK4dPF+3F53chmN2WSDkVkrnB+XFSAKWuxqQe1M8nu8="; + hash = "sha256-AEgNTv49IjSqTFDn8YQqu9si3uqfhO1whS5xTp9qxc4="; }; pythonRelaxDeps = [ From c1a4f1da330ddccf48fed947763ddc6d6e45f8de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Nov 2025 20:28:53 +0100 Subject: [PATCH 2220/2279] python313Packages.pygitguardian: 1.25.0 -> 1.26.0 Diff: https://github.com/GitGuardian/py-gitguardian/compare/v1.25.0...v1.26.0 Changelog: https://github.com/GitGuardian/py-gitguardian/blob/v1.26.0/CHANGELOG.md --- pkgs/development/python-modules/pygitguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 2c5468f77363..ec4cd9420f14 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.25.0"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; tag = "v${version}"; - hash = "sha256-XcmLaEnQ5cUTd71xvgvdS418RGOzpKydUDoSdVC/mgo="; + hash = "sha256-CwGmNyY4U1vt7CHuO4nS1TuUJWm6Ok8vIE3kRG/qles="; }; pythonRelaxDeps = [ From 1ed07e744214a85197873497a3eeeb27043594c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 19:35:20 +0000 Subject: [PATCH 2221/2279] bash-pinyin-completion-rs: 1.0.1 -> 1.0.2 --- pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix index d68235a1105e..62e0ee9a8b33 100644 --- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix +++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bash-pinyin-completion-rs"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "AOSC-Dev"; repo = "bash-pinyin-completion-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-XmxJYzDnA/7v/U3fFzNd2BQu43q6zYGSk/tJ0I6aKBo="; + hash = "sha256-fqrKaz46TYUYA2rcpChvFYZLISsxsMuxwWvbp2E4abU="; }; strictDeps = true; From 8a3dbe81d5cf9218505fdc538163583ec6a668be Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 11 Nov 2025 03:42:14 +0800 Subject: [PATCH 2222/2279] tests.trivial-builders.writeShellApplication.entries.test-meta: avoid duplicated and hard-coded value assertion The meta.description assertion has been broken at least twice during tree-wide meta.description linting. Let's address the root cause by comparing the meta attributes with the specified arguments. --- .../trivial-builders/test/writeShellApplication.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix index 1325d18366fc..0c15853f91c3 100644 --- a/pkgs/build-support/trivial-builders/test/writeShellApplication.nix +++ b/pkgs/build-support/trivial-builders/test/writeShellApplication.nix @@ -35,14 +35,15 @@ in linkFarm "writeShellApplication-tests" { test-meta = let - script = writeShellApplication { + args = { name = "test-meta"; text = ""; meta.description = "Test for the `writeShellApplication` `meta` argument"; }; + script = writeShellApplication args; in - assert script.meta.mainProgram == "test-meta"; - assert script.meta.description == "A test for the `writeShellApplication` `meta` argument"; + assert script.meta.mainProgram == args.name; + assert script.meta.description == args.meta.description; script; test-runtime-inputs = checkShellApplication { From e4892cecc747ec9ab5a40dc62b8f160b8fbc0633 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 19:45:48 +0000 Subject: [PATCH 2223/2279] maintainers/github-teams.json: Automated sync --- maintainers/github-teams.json | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 289edd306687..fc97e5225a83 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -220,7 +220,6 @@ "gshpychka": 23005347, "hexagonal-sun": 222664, "heywoodlh": 18178614, - "iedame": 60272, "isabelroses": 71222764, "jonhermansen": 660911, "juliusrickert": 5007494, From 115a7b7e0efef6993cc6f363afd0255d3d62ff99 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 28 Oct 2025 14:47:19 +0100 Subject: [PATCH 2224/2279] ollama-vulkan: init package Co-authored-by: Pavol Rusnak Co-authored-by: Oliver Bestmann --- pkgs/by-name/ol/ollama/package.nix | 35 +++++++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index da1c19d15004..624d9568975b 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -18,6 +18,11 @@ cudaArches ? cudaPackages.flags.realArches or [ ], autoAddDriverRunpath, apple-sdk_15, + vulkan-tools, + vulkan-headers, + vulkan-loader, + shaderc, + ccache, versionCheckHook, writableTmpDirAsHomeHook, @@ -29,7 +34,7 @@ ollama-cuda, config, - # one of `[ null false "rocm" "cuda" ]` + # one of `[ null false "rocm" "cuda" "vulkan" ]` acceleration ? null, }: @@ -38,6 +43,7 @@ assert builtins.elem acceleration [ false "rocm" "cuda" + "vulkan" ]; let @@ -50,9 +56,11 @@ let rocmRequested = shouldEnable "rocm" config.rocmSupport; cudaRequested = shouldEnable "cuda" config.cudaSupport; + vulkanRequested = shouldEnable "vulkan" false; enableRocm = rocmRequested && stdenv.hostPlatform.isLinux; enableCuda = cudaRequested && stdenv.hostPlatform.isLinux; + enableVulkan = vulkanRequested && stdenv.hostPlatform.isLinux; rocmLibs = [ rocmPackages.clr @@ -75,6 +83,11 @@ let cudaPackages.cuda_cccl ]; + vulkanLibs = [ + vulkan-headers + vulkan-loader + ]; + # Extract the major version of CUDA. e.g. 11 12 cudaMajorVersion = lib.versions.major cudaPackages.cuda_cudart.version; @@ -103,6 +116,9 @@ let ] ++ lib.optionals enableCuda [ "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib cudaLibs)}'" + ] + ++ lib.optionals enableVulkan [ + "--suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath (map lib.getLib vulkanLibs)}'" ]; wrapperArgs = builtins.concatStringsSep " " wrapperOptions; @@ -111,6 +127,8 @@ let buildGoModule.override { stdenv = cudaPackages.backendStdenv; } else if enableRocm then buildGoModule.override { stdenv = rocmPackages.stdenv; } + else if enableVulkan then + buildGoModule.override { stdenv = vulkan-tools.stdenv; } else buildGoModule; inherit (lib) licenses platforms maintainers; @@ -137,7 +155,8 @@ goBuild (finalAttrs: { CFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; CXXFLAGS = "-Wno-c++17-extensions -I${rocmPath}/include"; } - // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; }; + // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; } + // lib.optionalAttrs enableVulkan { VULKAN_SDK = shaderc.bin; }; nativeBuildInputs = [ cmake @@ -151,12 +170,16 @@ goBuild (finalAttrs: { ++ lib.optionals (enableRocm || enableCuda) [ makeBinaryWrapper autoAddDriverRunpath + ] + ++ lib.optionals enableVulkan [ + ccache ]; buildInputs = lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda cudaLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] + ++ lib.optionals enableVulkan vulkanLibs; # replace inaccurate version number with actual release version postPatch = '' @@ -261,11 +284,13 @@ goBuild (finalAttrs: { description = "Get up and running with large language models locally" + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" - + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration"; + + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration" + + lib.optionalString vulkanRequested ", using Vulkan for generic GPU acceleration"; homepage = "https://github.com/ollama/ollama"; changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix; + platforms = + if (rocmRequested || cudaRequested || vulkanRequested) then platforms.linux else platforms.unix; mainProgram = "ollama"; maintainers = with maintainers; [ abysssol diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 949198d461ec..7d7a63afacbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -392,6 +392,7 @@ with pkgs; ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; }; ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; }; + ollama-vulkan = callPackage ../by-name/ol/ollama/package.nix { acceleration = "vulkan"; }; device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { }; From 5949a18871549dc7139d88e7e133319051bf7a13 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 9 Nov 2025 18:14:14 +0100 Subject: [PATCH 2225/2279] treewide: use externalPath --- nixos/modules/services/backup/pgbackrest.nix | 10 ++-------- .../services/databases/postgres-websockets.nix | 14 ++------------ nixos/modules/services/databases/postgrest.nix | 14 ++------------ .../services/matrix/matrix-alertmanager.nix | 10 ++-------- .../monitoring/prometheus/exporters/storagebox.nix | 5 +---- .../services/networking/cloudflare-dyndns.nix | 6 +----- nixos/modules/services/networking/syncthing.nix | 7 +------ nixos/modules/services/security/step-ca.nix | 7 +------ nixos/modules/services/web-apps/librespeed.nix | 9 +-------- nixos/modules/services/web-apps/oncall.nix | 5 +---- nixos/modules/services/web-apps/photoprism.nix | 14 ++------------ 11 files changed, 16 insertions(+), 85 deletions(-) diff --git a/nixos/modules/services/backup/pgbackrest.nix b/nixos/modules/services/backup/pgbackrest.nix index 6e5880ba1f90..bb5c45604926 100644 --- a/nixos/modules/services/backup/pgbackrest.nix +++ b/nixos/modules/services/backup/pgbackrest.nix @@ -83,10 +83,7 @@ let secretPathOption = with lib.types; lib.mkOption { - type = nullOr (pathWith { - inStore = false; - absolute = true; - }); + type = nullOr externalPath; default = null; internal = true; }; @@ -142,10 +139,7 @@ in }; options.sftp-private-key-file = lib.mkOption { - type = nullOr (pathWith { - inStore = false; - absolute = true; - }); + type = nullOr externalPath; default = null; description = '' SFTP private key file. diff --git a/nixos/modules/services/databases/postgres-websockets.nix b/nixos/modules/services/databases/postgres-websockets.nix index 738f33bd7b0f..2312ac69a01a 100644 --- a/nixos/modules/services/databases/postgres-websockets.nix +++ b/nixos/modules/services/databases/postgres-websockets.nix @@ -31,12 +31,7 @@ in enable = lib.mkEnableOption "postgres-websockets"; pgpassFile = lib.mkOption { - type = - with lib.types; - nullOr (pathWith { - inStore = false; - absolute = true; - }); + type = with lib.types; nullOr externalPath; default = null; example = "/run/keys/db_password"; description = '' @@ -54,12 +49,7 @@ in }; jwtSecretFile = lib.mkOption { - type = - with lib.types; - nullOr (pathWith { - inStore = false; - absolute = true; - }); + type = with lib.types; nullOr externalPath; example = "/run/keys/jwt_secret"; description = '' Secret used to sign JWT tokens used to open communications channels. diff --git a/nixos/modules/services/databases/postgrest.nix b/nixos/modules/services/databases/postgrest.nix index 262a8e9433a3..503696540668 100644 --- a/nixos/modules/services/databases/postgrest.nix +++ b/nixos/modules/services/databases/postgrest.nix @@ -54,12 +54,7 @@ in enable = lib.mkEnableOption "PostgREST"; pgpassFile = lib.mkOption { - type = - with lib.types; - nullOr (pathWith { - inStore = false; - absolute = true; - }); + type = with lib.types; nullOr externalPath; default = null; example = "/run/keys/db_password"; description = '' @@ -77,12 +72,7 @@ in }; jwtSecretFile = lib.mkOption { - type = - with lib.types; - nullOr (pathWith { - inStore = false; - absolute = true; - }); + type = with lib.types; nullOr externalPath; default = null; example = "/run/keys/jwt_secret"; description = '' diff --git a/nixos/modules/services/matrix/matrix-alertmanager.nix b/nixos/modules/services/matrix/matrix-alertmanager.nix index 6d588a1c78cd..3782d53a084d 100644 --- a/nixos/modules/services/matrix/matrix-alertmanager.nix +++ b/nixos/modules/services/matrix/matrix-alertmanager.nix @@ -76,17 +76,11 @@ in description = "Makes the bot mention @room when posting an alert"; }; tokenFile = lib.mkOption { - type = lib.types.pathWith { - inStore = false; - absolute = true; - }; + type = lib.types.externalPath; description = "File that contains a valid Matrix token for the Matrix user."; }; secretFile = lib.mkOption { - type = lib.types.pathWith { - inStore = false; - absolute = true; - }; + type = lib.types.externalPath; description = "File that contains a secret for the Alertmanager webhook."; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix b/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix index 10a102bbf62f..f4d30465f7be 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/storagebox.nix @@ -15,10 +15,7 @@ in extraOpts = { package = mkPackageOption pkgs "prometheus-storagebox-exporter" { }; tokenFile = lib.mkOption { - type = lib.types.pathWith { - inStore = false; - absolute = true; - }; + type = lib.types.externalPath; description = "File that contains the Hetzner API token to use."; }; diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index 675fedeaf9b4..2dedbe9b7922 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -15,11 +15,7 @@ in package = lib.mkPackageOption pkgs "cloudflare-dyndns" { }; apiTokenFile = lib.mkOption { - type = lib.types.pathWith { - absolute = true; - inStore = false; - }; - + type = lib.types.externalPath; description = '' The path to a file containing the CloudFlare API token. ''; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index f1fcaf855e96..9bc65451a1e0 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -559,12 +559,7 @@ in ''; }; encryptionPasswordFile = mkOption { - type = types.nullOr ( - types.pathWith { - inStore = false; - absolute = true; - } - ); + type = types.nullOr types.externalPath; default = null; description = '' Path to encryption password. If set, the file will be read during diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index 746d3c0b3839..3e57180a5b28 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -55,12 +55,7 @@ in ''; }; intermediatePasswordFile = lib.mkOption { - type = lib.types.nullOr ( - lib.types.pathWith { - inStore = false; - absolute = true; - } - ); + type = lib.types.nullOr lib.types.externalPath; default = null; example = "/run/keys/smallstep-password"; description = '' diff --git a/nixos/modules/services/web-apps/librespeed.nix b/nixos/modules/services/web-apps/librespeed.nix index 2f7658339751..09a0ee4767bd 100644 --- a/nixos/modules/services/web-apps/librespeed.nix +++ b/nixos/modules/services/web-apps/librespeed.nix @@ -71,14 +71,7 @@ in The contents of the specified paths will be read at service start time and merged with the attributes provided in `settings`. ''; default = { }; - type = - with lib.types; - nullOr ( - attrsOf (pathWith { - inStore = false; - absolute = true; - }) - ); + type = with lib.types; nullOr (attrsOf externalPath); }; settings = lib.mkOption { diff --git a/nixos/modules/services/web-apps/oncall.nix b/nixos/modules/services/web-apps/oncall.nix index 98ddae259e7a..19b71dd92f02 100644 --- a/nixos/modules/services/web-apps/oncall.nix +++ b/nixos/modules/services/web-apps/oncall.nix @@ -78,10 +78,7 @@ in }; secretFile = lib.mkOption { - type = lib.types.pathWith { - inStore = false; - absolute = true; - }; + type = lib.types.externalPath; example = "/run/keys/oncall-dbpassword"; description = '' A YAML file containing secrets such as database or user passwords. diff --git a/nixos/modules/services/web-apps/photoprism.nix b/nixos/modules/services/web-apps/photoprism.nix index f33899ce22f9..f4b91288b1d2 100644 --- a/nixos/modules/services/web-apps/photoprism.nix +++ b/nixos/modules/services/web-apps/photoprism.nix @@ -33,12 +33,7 @@ in enable = lib.mkEnableOption "Photoprism web server"; passwordFile = lib.mkOption { - type = lib.types.nullOr ( - lib.types.pathWith { - inStore = false; - absolute = true; - } - ); + type = lib.types.nullOr lib.types.externalPath; default = null; description = '' Admin password file. @@ -46,12 +41,7 @@ in }; databasePasswordFile = lib.mkOption { - type = lib.types.nullOr ( - lib.types.pathWith { - inStore = false; - absolute = true; - } - ); + type = lib.types.nullOr lib.types.externalPath; default = null; description = '' Database password file. From acecb79fe4c1b8e59629b9b09ef73ff46a60b0f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 20:27:03 +0000 Subject: [PATCH 2226/2279] vscode-extensions.tabnine.tabnine-vscode: 3.321.0 -> 3.324.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 d18f1fc16498..ad0ab7618a60 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4514,8 +4514,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.321.0"; - hash = "sha256-GIszVwrS0brC+3jT+48zUa0E2Q+DUau/WuoOfRDobb8="; + version = "3.324.0"; + hash = "sha256-W1+TCXUmuTCb+IZZk3n6dyIDfVbMuU3jJUOsfrdjoXo="; }; meta = { license = lib.licenses.mit; From 3a661a262fe0081031fbb7b4fef2d726dcb39cc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 20:45:25 +0000 Subject: [PATCH 2227/2279] ty: 0.0.1-alpha.25 -> 0.0.1-alpha.26 --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 3846715e48f9..69b9978c59d5 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.25"; + version = "0.0.1-alpha.26"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-roN8sU0WjGXd1jfQiTXSJ0OQRW8MbNYUfCdz744lnRM="; + hash = "sha256-ykkOCFNtEqtEqzjiC/MnxM6X02VtToz5bSqtxCKa418="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-A2lPCweusmDPwh6IXAj4D6+GRK6CaZSP5gFDhrsBI5Q="; + cargoHash = "sha256-7bGmTQ5+tqju6aA5t81zbW5mhrBzMtdp+02y2I1eMBI="; nativeBuildInputs = [ installShellFiles ]; From 19e0510dba1908eeef8cee3e5b9ba2e386194579 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 21:02:21 +0000 Subject: [PATCH 2228/2279] snort: 3.9.6.0 -> 3.9.7.0 --- pkgs/by-name/sn/snort/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snort/package.nix b/pkgs/by-name/sn/snort/package.nix index 2a58e87a1bb4..599a065c34df 100644 --- a/pkgs/by-name/sn/snort/package.nix +++ b/pkgs/by-name/sn/snort/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snort"; - version = "3.9.6.0"; + version = "3.9.7.0"; src = fetchFromGitHub { owner = "snort3"; repo = "snort3"; tag = finalAttrs.version; - hash = "sha256-YZCS2w4T9XskydnC4C2EMies9cUklvL56Umdw9EogLo="; + hash = "sha256-oJTRTcPQ3ByC2v9yM3yp7UVZqcX84StP4Ii96ZX/sIQ="; }; nativeBuildInputs = [ From d5dce9e8f4062a0c6902a4aa952f453c16179a92 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 10 Nov 2025 16:10:08 -0500 Subject: [PATCH 2229/2279] python3Packages.openai: 2.6.0 -> 2.7.2 Diff: https://github.com/openai/openai-python/compare/v2.6.0...v2.7.2 Changelog: https://github.com/openai/openai-python/blob/v2.7.2/CHANGELOG.md --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index c1f9d59eea50..7c021dfe81d5 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "2.6.0"; + version = "2.7.2"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-GD9+81r0vw4n5jdpJW72cmtfqfz7zGs01YuwiziC3h4="; + hash = "sha256-g7YbKzRZQOM4e16Mgo7u3QoQQI6VTNrV4DUip9fYsLA="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; From 86dc78a174642f70de2cdb8a2e9931138cfd9e30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 21:19:40 +0000 Subject: [PATCH 2230/2279] vscode-extensions.ms-azuretools.vscode-containers: 2.2.0 -> 2.3.0 --- .../extensions/ms-azuretools.vscode-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix index 9908fcaa5a91..af6d57405caa 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-containers"; - version = "2.2.0"; - hash = "sha256-UxWsu7AU28plnT0QMdpPJrcYZIV09FeC+rmYKf39a6M="; + version = "2.3.0"; + hash = "sha256-zrEZpd2geX2G4u6LkIk3d6C7vhwZZ4lwHGQR3Z0OWY4="; }; meta = { From 694cb8ac102f3bc3a427fe3cf716a844648b5bad Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Mon, 10 Nov 2025 20:57:47 +0100 Subject: [PATCH 2231/2279] workflows/teams: restrict to NixOS org without the restriction the workflow would trigger on all forks, but it is only relevant on NixOS/nixpkgs --- .github/workflows/teams.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index b848983b5aa2..cca0ca1f65da 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -14,6 +14,7 @@ defaults: jobs: sync: + if: github.event_name != 'schedule' || github.repository_owner == 'NixOS' runs-on: ubuntu-24.04-arm steps: # Use a GitHub App to create the PR so that CI gets triggered and to From 513a63227f05e040d5f51ebec69e786a50ccfb06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 21:36:35 +0000 Subject: [PATCH 2232/2279] python3Packages.glyphslib: 6.12.2 -> 6.12.3 --- pkgs/development/python-modules/glyphslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index c5a929139e2e..335fdf391ac7 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.12.2"; + version = "6.12.3"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; tag = "v${version}"; - hash = "sha256-w9n9IWd3E9Bd9pggdFe9PZXx235k81oWL9BpdyerShQ="; + hash = "sha256-bcljg9PZXvUk6KQJKKotzifvKYQaS6AKRYkMseX2mx0="; }; build-system = [ setuptools-scm ]; From 29d6bd3cfcb1f9271925c5ed883801017c3a2f5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 21:56:10 +0000 Subject: [PATCH 2233/2279] terraform-providers.hashicorp_google-beta: 7.9.0 -> 7.10.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 2c413730cf25..0804c82220da 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -570,13 +570,13 @@ "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84=" }, "hashicorp_google-beta": { - "hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=", + "hash": "sha256-lL4BtInJu/STew7SaNrwPnmLDLucMvbyGanAK9tsJKE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.9.0", + "rev": "v7.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ=" + "vendorHash": "sha256-zLUlrIdfqhiVITQe7bmoYl570LvLS8aEMU2HC4xmKTU=" }, "hashicorp_helm": { "hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=", From acab29c56863de79788ddc921e4f27c651aa41fc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 11 Nov 2025 00:59:06 +0300 Subject: [PATCH 2234/2279] nixos/plasma6: enable fwupd by default Used by system info and other places. --- nixos/modules/services/desktop-managers/plasma6.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 4dcfecd7746d..99326ad5a24e 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -268,6 +268,7 @@ in services.upower.enable = config.powerManagement.enable; services.libinput.enable = mkDefault true; services.geoclue2.enable = mkDefault true; + services.fwupd.enable = mkDefault true; # Extra UDEV rules used by Solid services.udev.packages = [ From 7d26e75ebe1766c527645e9181ecaaf1c7190153 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 22:34:04 +0000 Subject: [PATCH 2235/2279] python3Packages.pylutron-caseta: 0.25.0 -> 0.26.0 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 6b5af6670d34..3ce36ca60b79 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.25.0"; + version = "0.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; tag = "v${version}"; - hash = "sha256-VK53y4m86xVVGibAiWtxNge+kBYxQnltmc3mYpoGedw="; + hash = "sha256-aH6EX0cpMteCmZCoUd9pwB0sQ7GIhxtesvURIx32adA="; }; build-system = [ hatchling ]; From c348d5656e5028db9b602e4c6c5b62cc80efd765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Nov 2025 14:34:51 -0800 Subject: [PATCH 2236/2279] python3Packages.aiomusiccast: 0.14.8 -> 0.15.0 Diff: https://github.com/vigonotion/aiomusiccast/compare/0.14.8...0.15.0 Changelog: https://github.com/vigonotion/aiomusiccast/releases/tag/0.15.0 --- .../python-modules/aiomusiccast/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 3ec1903f0228..5e6d1f494344 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -1,25 +1,21 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, - setuptools, }: buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.8"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + version = "0.15.0"; + pyproject = true; src = fetchFromGitHub { owner = "vigonotion"; repo = "aiomusiccast"; tag = version; - hash = "sha256-V4xl2QY+pPEnJtx7dxSNj/aXqHvV9Z6uuWgbVHNyLjA="; + hash = "sha256-oFA8i/cdDqOQ9Fq0VWd8eiOg8F1+MNxWanNqoao5+pM="; }; postPatch = '' @@ -27,11 +23,10 @@ buildPythonPackage rec { --replace '"0.0.0"' '"${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - setuptools ]; # upstream has no tests @@ -39,11 +34,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiomusiccast" ]; - meta = with lib; { + meta = { description = "Companion library for musiccast devices intended for the Home Assistant integration"; homepage = "https://github.com/vigonotion/aiomusiccast"; - changelog = "https://github.com/vigonotion/aiomusiccast/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + changelog = "https://github.com/vigonotion/aiomusiccast/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From a811adf104532adca2d0b275989fc41ab9b9c273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 22:43:46 +0000 Subject: [PATCH 2237/2279] libretro.genesis-plus-gx: 0-unstable-2025-10-23 -> 0-unstable-2025-11-07 --- .../emulators/libretro/cores/genesis-plus-gx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index c17c8fb73dbf..464630bde241 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-10-23"; + version = "0-unstable-2025-11-07"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "cecccacf767b1c8e86af3e315223b052a7f81b95"; - hash = "sha256-x2ClmCtWIF9HS8Yb+8cNm9MSxwcwSm05G+hZGWBz2OY="; + rev = "180bed8e35fc48827f087926c4770f9ccdeaad0c"; + hash = "sha256-7RfO2GdsMZ/9VZ0cK2pl/s+kOUyUBbqTSDVzn1icN6k="; }; meta = { From e400f0d2f7f0aae8a3abf22710cd8dff2030c251 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 23:02:26 +0000 Subject: [PATCH 2238/2279] rabbitmq-server: 4.1.4 -> 4.2.0 --- pkgs/by-name/ra/rabbitmq-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix index 4c242a6ed253..0368a6bd2acf 100644 --- a/pkgs/by-name/ra/rabbitmq-server/package.nix +++ b/pkgs/by-name/ra/rabbitmq-server/package.nix @@ -43,12 +43,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "rabbitmq-server"; - version = "4.1.4"; + version = "4.2.0"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-dqNdrbXSysYUMN+6gMMb9GXKER/mOGXgW6j3iOLHNks="; + hash = "sha256-zmPo6+z+elyjROLphqw7HxrYzCP83n3//qMzMML1fDw="; }; nativeBuildInputs = [ From 1202776fb33256135bf9276ab387657f1f148efb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Nov 2025 23:08:12 +0000 Subject: [PATCH 2239/2279] stevenblack-blocklist: 3.16.29 -> 3.16.31 --- pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 920059c2e686..4078267b82ec 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.29"; + version = "3.16.31"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-y4JK99EDlDdRgOJj6NkiafVDab6umWJCjupKm9Leekk="; + hash = "sha256-9L4jyN+ByqdjpsymZW+W56IV3D1mi63D9hm4bcltlfI="; }; outputs = [ From 9ee7704b8c80050d91c5876baa0fcebe31975f7d Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:24:48 -0500 Subject: [PATCH 2240/2279] home-assistant-custom-lovelace-modules.atomic-calendar-revive: modernize Gets rid of mkYarnPackage and the custom update script, which was only needed because of mkYarnPackage's need for a package.json file. --- .../atomic-calendar-revive/package.json | 142 ------------------ .../atomic-calendar-revive/package.nix | 45 +++--- .../atomic-calendar-revive/update.sh | 42 ------ 3 files changed, 21 insertions(+), 208 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json delete mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json deleted file mode 100644 index c6c7707172b3..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "name": "atomic-calendar-revive", - "version": "10.0.0", - "description": "Calendar Card for Home Assistant", - "main": "atomic-calendar-revive.js", - "scripts": { - "lint": "eslint src/*.ts | more ", - "lintindex": "eslint src/index.ts | more", - "lintindexfix": "eslint src/index.ts --fix", - "lintfixall": "eslint src/*.ts --fix", - "linteditor": "eslint src/index-editor.ts", - "babel": "babel dist/index.js --out-file dist/atomic-calendar-revive.js", - "rollup": "rollup -c", - "start": "rollup -c --watch --bundleConfigAsCjs", - "build": "rollup -c --bundleConfigAsCjs", - "watch": "rollup -c rollup-dev.config.mjs --bundleConfigAsCjs", - "commit": "cz" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/totaldebug/atomic-calendar-revive.git" - }, - "author": "Steven Marks", - "license": "ISC", - "devDependencies": { - "@babel/cli": "^7.24.7", - "@babel/core": "^7.24.7", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/preset-env": "^7.24.7", - "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-commonjs": "^26.0.1", - "@rollup/plugin-eslint": "^9.0.5", - "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-terser": "^0.4.4", - "@semantic-release/changelog": "^6.0.3", - "@semantic-release/exec": "^6.0.3", - "@semantic-release/git": "^10.0.1", - "@typescript-eslint/eslint-plugin": "^7.13.1", - "@typescript-eslint/parser": "^7.13.1", - "babel-preset-minify": "^0.5.2", - "commitizen": "^4.3.0", - "conventional-changelog-conventionalcommits": "^8.0.0", - "cz-conventional-changelog": "^3.3.0", - "eslint": "^9.5.0", - "eslint-config-prettier": "^9.1.0", - "eslint-import-resolver-typescript": "^3.6.1", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-prettier": "^5.1.3", - "prettier": "^3.3.2", - "rollup": "^4.18.0", - "rollup-plugin-serve": "^2.0.3", - "rollup-plugin-typescript2": "^0.36.0", - "semantic-release": "^24.0.0" - }, - "dependencies": { - "@formatjs/icu-messageformat-parser": "^2.7.8", - "@lit-labs/scoped-registry-mixin": "^1.0.3", - "@lit/reactive-element": "2.0.4", - "@material/mwc-formfield": "^0.27.0", - "@material/mwc-icon-button": "^0.27.0", - "@material/mwc-linear-progress": "^0.27.0", - "@material/mwc-list": "^0.27.0", - "@material/mwc-menu": "^0.27.0", - "@material/mwc-notched-outline": "^0.27.0", - "@material/mwc-ripple": "^0.27.0", - "@material/mwc-select": "^0.27.0", - "@material/mwc-switch": "^0.27.0", - "@material/mwc-textfield": "^0.27.0", - "@mdi/js": "^7.4.47", - "@webcomponents/webcomponentsjs": "^2.8.0", - "dayjs": "^1.11.11", - "home-assistant-js-websocket": "^9.4.0", - "lit": "^3.1.4", - "memoize-one": "^6.0.0", - "npm": "^10.8.1", - "typescript": "^5.5.2" - }, - "resolutions": { - "lit": "^3.0.2", - "@lit/reactive-element": "2.0.1" - }, - "bugs": { - "url": "https://github.com/totaldebug/atomic-calendar-revive/issues" - }, - "homepage": "https://github.com/totaldebug/atomic-calendar-revive#readme", - "config": { - "commitizen": { - "path": "./node_modules/cz-conventional-changelog" - } - }, - "release": { - "plugins": [ - [ - "@semantic-release/commit-analyzer", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/release-notes-generator", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/npm", - { - "npmPublish": false - } - ], - [ - "@semantic-release/exec", - { - "prepareCmd": "yarn run build" - } - ], - [ - "@semantic-release/git", - { - "assets": [ - "package.json" - ], - "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" - } - ], - [ - "@semantic-release/github", - { - "assets": [ - { - "path": "dist/atomic-calendar-revive.js" - } - ] - } - ], - "@semantic-release/changelog" - ] - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix index f2d4262a8595..8f71dcce88bf 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix @@ -1,56 +1,53 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, + yarnBuildHook, + yarnConfigHook, + nodejs, + nix-update-script, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "atomic-calendar-revive"; version = "10.0.0"; src = fetchFromGitHub { owner = "totaldebug"; repo = "atomic-calendar-revive"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - name = "${pname}-yarn-offline-cache"; - yarnLock = src + "/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-d3lk3mwgaWMPFl/EDUWH/tUlAC7OfhNycOLbi1GzkfM="; }; - buildPhase = '' - runHook preBuild - - yarn run build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - cp ./deps/atomic-calendar-revive/dist/atomic-calendar-revive.js $out + cp ./dist/atomic-calendar-revive.js $out runHook postInstall ''; - doDist = false; + passthru.updateScript = nix-update-script { }; - passthru.updateScript = ./update.sh; - - meta = with lib; { - changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${src.rev}"; + meta = { + changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${finalAttrs.version}"; description = "Advanced calendar card for Home Assistant Lovelace"; homepage = "https://github.com/totaldebug/atomic-calendar-revive"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh deleted file mode 100755 index e3841f2a2feb..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update git jq -# shellcheck shell=bash - -ROOT=$(git rev-parse --show-toplevel) -ATTR=home-assistant-custom-lovelace-modules.atomic-calendar-revive - -cd "$ROOT" || exit 1 - -# get current version in nixpkgs -CURRENT_VERSION=$(nix eval -f ./default.nix --raw "$ATTR") - -# get latest release tag -LATEST_RELEASE=$(curl https://api.github.com/repos/totaldebug/atomic-calendar-revive/releases | jq "[.[] | select(.prerelease == false)][0].tag_name") - -# strip version prefix -LATEST_VERSION=${LATEST_RELEASE//"v"} - -# strip quotes -LATEST_VERSION=${LATEST_VERSION%\"} -LATEST_VERSION=${LATEST_VERSION#\"} - -if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; -then - echo Already on latest version - exit 0 -fi - -echo "Updating to ${LATEST_VERSION}" - -PKGDIR=$(dirname "$0") - -# change to package directory -cd "$PKGDIR" || exit 1 - -# update package.json -echo "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json" -curl -o ./package.json "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json" - -# update package -cd "$ROOT" || exit 1 -nix-update --version "$LATEST_VERSION" "$ATTR" From 4599cad6b9687b316ee39ed549b88cb809ee0b3a Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:25:08 -0500 Subject: [PATCH 2241/2279] home-assistant-custom-lovelace-modules.button-card: modernize Gets rid of mkYarnPackage and its need for a package.json --- .../button-card/package.json | 78 ------------------- .../button-card/package.nix | 41 +++++----- 2 files changed, 19 insertions(+), 100 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json deleted file mode 100644 index 55bf12512470..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "name": "button-card", - "version": "4.1.2", - "description": "Button card for lovelace", - "main": "dist/button-card.js", - "scripts": { - "build": "npm run lint && npm run rollup", - "rollup": "rollup -c", - "babel": "babel dist/button-card.js --out-file dist/button-card.js", - "lint": "eslint src/*.ts", - "watch": "rollup -c --watch", - "postversion": "npm run build", - "audit-fix": "npx yarn-audit-fix" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/custom-cards/button-card.git" - }, - "keywords": [ - "lovelace" - ], - "author": "kuuji", - "contributors": [ - "Ian Richardson (https://github.com/iantrich)", - "Jérôme Wiedemann (https://github.com/RomRider)" - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/custom-cards/button-card/issues" - }, - "homepage": "https://github.com/custom-cards/button-card#readme", - "devDependencies": { - "@babel/core": "^7.12.3", - "@babel/plugin-proposal-class-properties": "^7.12.1", - "@babel/plugin-proposal-decorators": "^7.12.1", - "@rollup/plugin-babel": "^5.2.1", - "@rollup/plugin-commonjs": "^16.0.0", - "@rollup/plugin-json": "^4.0.2", - "@rollup/plugin-node-resolve": "^10.0.0", - "@semantic-release/changelog": "^5.0.1", - "@semantic-release/commit-analyzer": "^8.0.1", - "@semantic-release/exec": "^5.0.0", - "@semantic-release/git": "^9.0.0", - "@semantic-release/npm": "^7.0.10", - "@semantic-release/release-notes-generator": "^9.0.1", - "@typescript-eslint/eslint-plugin": "^6.1.0", - "@typescript-eslint/parser": "^6.1.0", - "conventional-changelog-conventionalcommits": "^4.5.0", - "eslint": "7.12.1", - "eslint-config-airbnb-base": "^14.1.0", - "eslint-config-prettier": "^6.15.0", - "eslint-plugin-import": "^2.22.1", - "eslint-plugin-prettier": "^3.1.2", - "npm": "^6.14.3", - "prettier": "^2.1.2", - "prettier-eslint": "^11.0.0", - "rollup": "^2.33.1", - "rollup-plugin-cleanup": "^3.2.1", - "rollup-plugin-serve": "^1.1.0", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.29.0", - "semantic-release": "^17.3.8", - "ts-lit-plugin": "^1.1.10", - "typescript": "^4.0.5", - "typescript-styled-plugin": "^0.15.0", - "yarn-audit-fix": "^9.3.10" - }, - "dependencies": { - "@ctrl/tinycolor": "^3.1.6", - "@material/mwc-ripple": "^0.19.1", - "fast-copy": "^2.1.0", - "home-assistant-js-websocket": "^8.2.0", - "lit": "^2.7.6", - "lit-element": "^3.3.2", - "lit-html": "^2.7.5", - "memoize-one": "^6.0.0" - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix index e0c4883406cc..adab8aafae02 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix @@ -1,53 +1,50 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, + yarnBuildHook, + yarnConfigHook, + nodejs, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "button-card"; version = "4.1.2"; src = fetchFromGitHub { owner = "custom-cards"; repo = "button-card"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Ntg1sNgAehcL2fT0rP0YHzV5q6rB5p1TyFXtbZyB3Vo="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-OFnsRR9zA9D22xBdh4XfLueGVA2ERXmGEp54x0OFDFY="; }; - buildPhase = '' - runHook preBuild - - yarn build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - cp ./deps/button-card/dist/button-card.js $out + cp ./dist/button-card.js $out runHook postInstall ''; - doDist = false; - - meta = with lib; { + meta = { description = "Lovelace button-card for home assistant"; homepage = "https://github.com/custom-cards/button-card"; - changelog = "https://github.com/custom-cards/button-card/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ k900 ]; - platforms = platforms.all; + changelog = "https://github.com/custom-cards/button-card/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ k900 ]; + platforms = lib.platforms.all; }; -} +}) From 68005ab69dc94f56111186bbc3b5199efc676ccf Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:25:20 -0500 Subject: [PATCH 2242/2279] home-assistant-custom-lovelace-modules.multiple-entity-row: modernize Gets rid of mkYarnPackage and its need for a package.json --- .../multiple-entity-row/package.json | 39 ------------------- .../multiple-entity-row/package.nix | 39 +++++++++---------- 2 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json deleted file mode 100644 index 28a6d7b3bb86..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "multiple-entity-row", - "version": "4.5.1", - "description": "Show multiple entity states, attributes and icons on entity rows in Home Assistant's Lovelace UI", - "keywords": [ - "home-assistant", - "homeassistant", - "lovelace", - "custom-cards", - "multiple", - "entity", - "row" - ], - "module": "multiple-entity-row.js", - "repository": "https://github.com/benct/lovelace-multiple-entity-row.git", - "author": "benct ", - "license": "MIT", - "dependencies": { - "custom-card-helpers": "1.8.0", - "lit": "^2.7.4", - "memoize-one": "^6.0.0" - }, - "devDependencies": { - "@babel/core": "^7.22.1", - "@babel/preset-env": "^7.22.4", - "babel-loader": "^9.1.2", - "eslint": "^8.41.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-prettier": "^4.2.1", - "prettier": "^2.8.8", - "webpack": "^5.84.1", - "webpack-cli": "^5.1.1" - }, - "scripts": { - "lint": "eslint src/**/*.js", - "dev": "webpack -c webpack.config.js", - "build": "yarn lint && webpack -c webpack.config.js" - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix index 2ece70bd477d..3ff0c62aa1e1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix @@ -1,52 +1,49 @@ { lib, - mkYarnPackage, + stdenv, fetchFromGitHub, fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "multiple-entity-row"; version = "4.5.1"; src = fetchFromGitHub { owner = "benct"; repo = "lovelace-multiple-entity-row"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CXRgXyH1NUg7ssQhenqP0tXr1m2qOkHna3Rf30K3SjI="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-8YIcQhbYf0e2xO620zVHEk/0sssBmzF/jCq+2za+D6E="; }; - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnBuildHook + yarnConfigHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - install -m0644 ./deps/multiple-entity-row/multiple-entity-row.js $out + install -m0644 ./multiple-entity-row.js $out runHook postInstall ''; - doDist = false; - - meta = with lib; { + meta = { description = "Show multiple entity states and attributes on entity rows in Home Assistant's Lovelace UI"; homepage = "https://github.com/benct/lovelace-multiple-entity-row"; - changelog = "https://github.com/benct/lovelace-multiple-entity-row/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + changelog = "https://github.com/benct/lovelace-multiple-entity-row/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; -} +}) From 4f4005dd713aa37f6b0b0d19b7d75e9d6bb67753 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 10 Nov 2025 18:25:51 -0500 Subject: [PATCH 2243/2279] home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap: modernize Gets rid of mkYarnPackage and its need for a package.json, as well as the custom updateScript which was needed because of the package.json --- .../zigbee2mqtt-networkmap/package.json | 25 ---------- .../zigbee2mqtt-networkmap/package.nix | 49 +++++++------------ .../zigbee2mqtt-networkmap/update.sh | 13 ----- 3 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json delete mode 100755 pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json deleted file mode 100644 index e1096d103f1f..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "zigbee2mqtt-networkmap", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "vue": "^2.7.15" - }, - "devDependencies": { - "@babel/core": "^7.26.0", - "@babel/eslint-parser": "^7.25.9", - "@material/mwc-button": "^0.27.0", - "@vue/cli-plugin-eslint": "^5.0.8", - "@vue/cli-service": "^5.0.8", - "@vue/eslint-config-standard": "^8.0.1", - "eslint": "^8.57.1", - "eslint-plugin-vue": "^9.32.0", - "lodash.isequal": "^4.5.0", - "vue-d3-network": "^0.1.28" - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix index 2a16391ef221..36e0f5e8fbf1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.nix @@ -1,44 +1,35 @@ { lib, + stdenv, fetchFromGitHub, fetchYarnDeps, - mkYarnPackage, + yarnConfigHook, + yarnBuildHook, + nodejs, + nix-update-script, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt-networkmap"; version = "0.10.0"; src = fetchFromGitHub { owner = "azuwis"; repo = "zigbee2mqtt-networkmap"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-S4iUTjI+pFfa8hg1/lJSI1tl2nEIh+LO2WTYhWWLh/s="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-yo+K3vUJH6WwyNj/UuvbhhmhdqzJ3XUzX+cKUueutjE="; }; - configurePhase = '' - runHook preConfigure - - cp -r $node_modules node_modules - chmod +w node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall @@ -51,16 +42,14 @@ mkYarnPackage rec { dontFixup = true; - doDist = false; - passthru.entrypoint = "zigbee2mqtt-networkmap.js"; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; - meta = with lib; { - changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${version}"; + meta = { + changelog = "https://github.com/azuwis/zigbee2mqtt-networkmap/releases/tag/v${finalAttrs.version}"; description = "Home Assistant Custom Card to show Zigbee2mqtt network map"; homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap"; - maintainers = with maintainers; [ azuwis ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ azuwis ]; + license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh deleted file mode 100755 index 6370cc85efcc..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update - -set -xe - -dirname="$(dirname "$0")" - -# nix-update picks the wrong file `pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix` -nix-update --override-filename "$dirname/package.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap - -# update package.json -source=$(nix-build -A home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap.src) -cp "$source/package.json" "$dirname/package.json" From 25481c5e851d8a509f5013914f8e2ce2b2c51a28 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 10 Nov 2025 23:45:18 +0000 Subject: [PATCH 2244/2279] opensupaplex: modernize --- pkgs/by-name/op/opensupaplex/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/op/opensupaplex/package.nix b/pkgs/by-name/op/opensupaplex/package.nix index b1cbe51469f0..9181bd82045f 100644 --- a/pkgs/by-name/op/opensupaplex/package.nix +++ b/pkgs/by-name/op/opensupaplex/package.nix @@ -18,15 +18,15 @@ let sha256 = "sha256-nKeSBUGjSulbEP7xxc6smsfCRjyc/xsLykH0o3Rq5wo="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opensupaplex"; version = "7.1.2"; src = fetchFromGitHub { owner = "sergiou87"; repo = "open-supaplex"; - rev = "v${version}"; - sha256 = "sha256-hP8dJlLXE5J/oxPhRkrrBl1Y5e9MYbJKi8OApFM3+GU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hP8dJlLXE5J/oxPhRkrrBl1Y5e9MYbJKi8OApFM3+GU="; }; nativeBuildInputs = [ @@ -66,18 +66,17 @@ stdenv.mkDerivation rec { passthru.tests.version = testers.testVersion { package = opensupaplex; command = "opensupaplex --help"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; desktopItems = [ (makeDesktopItem { name = "opensupaplex"; - exec = meta.mainProgram; + exec = finalAttrs.meta.mainProgram; icon = "open-supaplex"; desktopName = "OpenSupaplex"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ - "Application" "Game" ]; }) @@ -86,10 +85,10 @@ stdenv.mkDerivation rec { meta = { description = "Decompilation of Supaplex in C and SDL"; homepage = "https://github.com/sergiou87/open-supaplex"; - changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${version}.txt"; + changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${finalAttrs.version}.txt"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ matteopacini ]; platforms = lib.platforms.linux; # Many more are supported upstream, but only linux is tested. mainProgram = "opensupaplex"; }; -} +}) From f8960b06c25d07d0f3b0e5ef91b7e91e0c231246 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Mon, 10 Nov 2025 23:46:10 +0000 Subject: [PATCH 2245/2279] opensupaplex: darwin support --- pkgs/by-name/op/opensupaplex/darwin.patch | 16 ++++++++++++++++ pkgs/by-name/op/opensupaplex/package.nix | 15 ++++++++++++++- .../op/opensupaplex/reproducible-build.patch | 17 +++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/op/opensupaplex/darwin.patch create mode 100644 pkgs/by-name/op/opensupaplex/reproducible-build.patch diff --git a/pkgs/by-name/op/opensupaplex/darwin.patch b/pkgs/by-name/op/opensupaplex/darwin.patch new file mode 100644 index 000000000000..7db9432f7302 --- /dev/null +++ b/pkgs/by-name/op/opensupaplex/darwin.patch @@ -0,0 +1,16 @@ +diff --git a/src/sdl_common/audio.c b/src/sdl_common/audio.c +index 797c678..ebb9eda 100644 +--- a/src/sdl_common/audio.c ++++ b/src/sdl_common/audio.c +@@ -25,11 +25,7 @@ + + #if HAVE_SDL2 + #include +-#if TARGET_OS_MAC +-#include +-#else + #include +-#endif + #elif HAVE_SDL + #include + #include diff --git a/pkgs/by-name/op/opensupaplex/package.nix b/pkgs/by-name/op/opensupaplex/package.nix index 9181bd82045f..cb95343bec73 100644 --- a/pkgs/by-name/op/opensupaplex/package.nix +++ b/pkgs/by-name/op/opensupaplex/package.nix @@ -9,6 +9,7 @@ opensupaplex, SDL2, SDL2_mixer, + desktopToDarwinBundle, }: let @@ -29,10 +30,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hP8dJlLXE5J/oxPhRkrrBl1Y5e9MYbJKi8OApFM3+GU="; }; + patches = [ + ./reproducible-build.patch + ./darwin.patch + ]; + nativeBuildInputs = [ SDL2 # For "sdl2-config" copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle ]; + buildInputs = [ SDL2_mixer ]; enableParallelBuilding = true; @@ -82,13 +92,16 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # Strip only the main binary, not the data files which would corrupt them. + stripExclude = [ "lib/opensupaplex/*" ]; + meta = { description = "Decompilation of Supaplex in C and SDL"; homepage = "https://github.com/sergiou87/open-supaplex"; changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${finalAttrs.version}.txt"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ matteopacini ]; - platforms = lib.platforms.linux; # Many more are supported upstream, but only linux is tested. + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "opensupaplex"; }; }) diff --git a/pkgs/by-name/op/opensupaplex/reproducible-build.patch b/pkgs/by-name/op/opensupaplex/reproducible-build.patch new file mode 100644 index 000000000000..3c2a14917064 --- /dev/null +++ b/pkgs/by-name/op/opensupaplex/reproducible-build.patch @@ -0,0 +1,17 @@ +diff --git a/linux/Makefile b/linux/Makefile +index 6041a89..588341c 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -5,6 +5,12 @@ LDFLAGS += -lSDL2_mixer -lvorbis -logg `sdl2-config --libs` -lm + + CFLAGS += `sdl2-config --cflags` -DHAVE_SDL2 + ++UNAME_S := $(shell uname -s) ++ifeq ($(UNAME_S),Darwin) ++# Darwin-specific reproducible build flags ++LDFLAGS += -Wl,-no_uuid ++endif ++ + opensupaplex: $(obj) + $(CC) -o $@ $^ $(LDFLAGS) + From b99a5528c601010853e16b8899a5bc62308375a6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 10 Nov 2025 23:40:40 +0000 Subject: [PATCH 2246/2279] python3Packages.finetuning-scheduler: 2.9.0 -> 2.9.1 Diff: https://github.com/speediedan/finetuning-scheduler/compare/v2.9.0...v2.9.1 Changelog: https://github.com/speediedan/finetuning-scheduler/blob/v2.9.1/CHANGELOG.md --- .../python-modules/finetuning-scheduler/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix index 85b46d882a52..bf61fe277f3f 100644 --- a/pkgs/development/python-modules/finetuning-scheduler/default.nix +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -17,24 +17,16 @@ buildPythonPackage rec { pname = "finetuning-scheduler"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; src = fetchFromGitHub { owner = "speediedan"; repo = "finetuning-scheduler"; tag = "v${version}"; - hash = "sha256-AfkrWuqpFS71Zrh5NsamzxMitKCsqPF50F9zTDdDhRg="; + hash = "sha256-6v7KhY2dOc/Sbw85UO9KVDSS0+4DJ+VWrQ5Tg5E8Ddc="; }; - # See https://github.com/speediedan/finetuning-scheduler/pull/21 - postPatch = '' - substituteInPlace src/finetuning_scheduler/strategy_adapters/base.py \ - --replace-fail \ - "from lightning.fabric.utilities.types import ReduceLROnPlateau" \ - "from torch.optim.lr_scheduler import ReduceLROnPlateau" - ''; - build-system = [ setuptools ]; pythonRelaxDeps = [ From 57c93f7deeb59f3e6c17cb0478fa7de6c0993bc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 00:07:53 +0000 Subject: [PATCH 2247/2279] terraform-providers.wgebis_mailgun: 0.8.0 -> 0.8.1 --- .../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 2c413730cf25..9a9a7205de6c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1489,11 +1489,11 @@ "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8=" }, "wgebis_mailgun": { - "hash": "sha256-/AYzQgMWo2cPjEMlrOSZLn4IVq4At09KFXkIpc7L5p0=", + "hash": "sha256-W+cvYNwsa5T6ZIPeEVbO9ogdZurwDPOKUwJfPXNKSqg=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.8.0", + "rev": "v0.8.1", "spdx": "MPL-2.0", "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, From 4c45d0f6d372585d99089ca9d8969c9c3021f416 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 00:10:44 +0000 Subject: [PATCH 2248/2279] python3Packages.unstructured: 0.18.15 -> 0.18.18 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 08fe5f5d1cda..a2436d745d52 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -116,7 +116,7 @@ grpcio, }: let - version = "0.18.15"; + version = "0.18.18"; in buildPythonPackage rec { pname = "unstructured"; @@ -127,7 +127,7 @@ buildPythonPackage rec { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-rzspozQQ+WrS3cKAGe9O7clAIDo4P/6PdZzCXIRdNn8="; + hash = "sha256-v6g3melJAegYNJPtiDMob0VwgCu91iG0hdebmuya7Jw="; }; build-system = [ setuptools ]; From 96ddcf1ec76a5e6f7657d9b0d31cd2d19a1b5cba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 00:27:17 +0000 Subject: [PATCH 2249/2279] python3Packages.molecule: 25.9.0 -> 25.11.0 --- pkgs/development/python-modules/molecule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index c7ccc7261b47..517f04891c11 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "25.9.0"; + version = "25.11.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-GlbSg7H7VIhDnqyUWXHb1mt3LtQ7LGandpIsuT05+/0="; + hash = "sha256-8+W1HbBKMXtpi8vmgeHnRmwJ7dODjU1Qh9YhvZ5Etz8="; }; nativeBuildInputs = [ From 75d4287f7e518bcb56f8c49cf74b74d0529af430 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 00:37:07 +0000 Subject: [PATCH 2250/2279] myks: 5.1.0 -> 5.2.0 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 69db57b6e89b..1d14a6d1b691 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-nVm5AmfKfoBDBIFt2g4PXc5Ff2kbrBGTThqdpslpYow="; + hash = "sha256-Uywbhz+dMX49fYOypybNLP8Jrvxo8gN/YAOcODcThM8="; }; - vendorHash = "sha256-jprXaNd/S2fJcejSG5nH7rvg/yNmRRRgCOkJrUkiwmY="; + vendorHash = "sha256-GZWXiL8VJTx0EcwWKy4jryr1jzoT44tWO2U7TCjhhfU="; subPackages = "."; From 7254157b1cab080f97aa9af889585177259a48ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 11 Nov 2025 00:42:25 +0000 Subject: [PATCH 2251/2279] python3Packages.sse-starlette: fix build in the darwin sandbox --- pkgs/development/python-modules/sse-starlette/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index 97227795ec1c..8a2882414cae 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -77,11 +77,13 @@ buildPythonPackage rec { "test_sse_server_termination" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Server Sent Events for Starlette and FastAPI"; homepage = "https://github.com/sysid/sse-starlette"; changelog = "https://github.com/sysid/sse-starlette/blob/${src.tag}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; }; } From 88c2af43cca9d41fc5934ad323743e5743802dd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 01:28:18 +0000 Subject: [PATCH 2252/2279] dwarf-fortress-packages.dwarf-fortress-original: 53.02 -> 53.03 --- pkgs/games/dwarf-fortress/df.lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json index a31c7c48efde..edc7c2755a7a 100644 --- a/pkgs/games/dwarf-fortress/df.lock.json +++ b/pkgs/games/dwarf-fortress/df.lock.json @@ -1,28 +1,28 @@ { "game": { "latest": { - "linux": "53.02", + "linux": "53.03", "darwin": "0.47.05" }, "versions": { - "53.02": { + "53.03": { "df": { - "version": "53.02", + "version": "53.03", "urls": { "linux": { - "url": "https://www.bay12games.com/dwarves/df_53_02_linux.tar.bz2", - "outputHash": "sha256-SprD05MMynNCBr2oKnBYvimm+RmOoceEC2MF9IhCc5Q=" + "url": "https://www.bay12games.com/dwarves/df_53_03_linux.tar.bz2", + "outputHash": "sha256-xvpgkUjZzAeayWEK6KFLHoikDZLwh3PnTmosqjlL3m8=" } } }, "hack": { - "version": "53.02-r1", + "version": "53.03-r1", "git": { "url": "https://github.com/DFHack/dfhack.git", - "revision": "53.02-r1", - "outputHash": "sha256-ybDaFYNVhNS1xJU/dD8KBzNu3ceetFbvX7xNp5DLzyU=" + "revision": "53.03-r1", + "outputHash": "sha256-q0IWKUGfpFdA8VyXmmsZvx7v9S2kD7pI0fUr74sj4pU=" }, - "xmlRev": "99cb51ac849a17652dbb74efa757df5b5716a9ba" + "xmlRev": "145f317340ac9327854318c7ba758ee2af5e1928" } }, "52.05": { @@ -136,12 +136,12 @@ } }, "therapist": { - "version": "42.1.20", - "maxDfVersion": "52.05", + "version": "42.1.21", + "maxDfVersion": "53.02", "git": { "url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git", - "revision": "v42.1.20", - "outputHash": "sha256-nKMQSDrxhqRRaCDUK7GbexFHdxeD/P9c2UDkiMdWsyU=" + "revision": "v42.1.21", + "outputHash": "sha256-chdMle+HEKwALuef36RjKbijYk+zXcNBWQNsaZXs2us=" } } } From 69b0b93e040fe4d0a3929095292851aa6ca4136a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 01:40:56 +0000 Subject: [PATCH 2253/2279] home-manager: 0-unstable-2025-11-03 -> 0-unstable-2025-11-10 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index d3ba7e38295e..a77fed189b93 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-11-03"; + version = "0-unstable-2025-11-10"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "aa6936bb637e46a49cf1292486200ba41dd4bcf7"; - hash = "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg="; + rev = "37a3d97f2873e0f68711117c34d04b7c7ead8f4e"; + hash = "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs="; }; nativeBuildInputs = [ From 330e69c5e4979feb6e6b00254667c54524fd8c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 01:45:21 +0000 Subject: [PATCH 2254/2279] nixbit: 0.1.5 -> 0.2.0 --- pkgs/by-name/ni/nixbit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix index 5c507514b6d7..7141ae86fabc 100644 --- a/pkgs/by-name/ni/nixbit/package.nix +++ b/pkgs/by-name/ni/nixbit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixbit"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pbek"; repo = "nixbit"; tag = "v${finalAttrs.version}"; - hash = "sha256-DpjLPvmn61rEn6ui8cFfqeZEPYGyCUVVP/V7mQw1l5Y="; + hash = "sha256-sMi3hQZCzHbWTgRdqwGy6srfkmmY11B0OIqJKp5/HB0="; }; nativeBuildInputs = [ From faf1da13304707b370b629981c02b80823950b11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 02:07:35 +0000 Subject: [PATCH 2255/2279] vscode-extensions.streetsidesoftware.code-spell-checker: 4.2.6 -> 4.3.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 d18f1fc16498..40fa47d2eef6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4400,8 +4400,8 @@ let mktplcRef = { publisher = "streetsidesoftware"; name = "code-spell-checker"; - version = "4.2.6"; - hash = "sha256-veP2G/5vcaimjd98ur6Mhl4x1NKuvS21oO+HFJLHN+I="; + version = "4.3.0"; + hash = "sha256-Wyy9DAHDYjMLf7bLG34yp7eNGY2k7IU10kmwhTw2vWA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From be50a3118c3722e7a4c60fd886f5392e22ab31d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 02:25:04 +0000 Subject: [PATCH 2256/2279] telepresence2: 2.25.0 -> 2.25.1 --- pkgs/by-name/te/telepresence2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 92529d59f4be..216fc379a228 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.25.0"; + version = "2.25.1"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-ke3Si55CVc3JJgzwcCXmeGiT1GQKF+8ocrNfiLtRRcA="; + hash = "sha256-Itj+tC5OclTXsRdJ6Rh4xQ1YwMSZTTdcRzpUQrmpC0M="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-R+7tw2nX2rM46ETOgcQuwMCRLU23ejtNOGA3Bt/+Guw="; + vendorHash = "sha256-iNvvFl05Q/6uXDSYyAijayXfvObmwh6aDR6XmFQkSHI="; ldflags = [ "-s" From 01d9bf2846d7441d79c2dbbe8ed34fd7b24fea92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 03:08:11 +0000 Subject: [PATCH 2257/2279] python3Packages.qh3: 1.5.5 -> 1.5.6 --- 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 6b048f63c97d..a64c015f77dc 100644 --- a/pkgs/development/python-modules/qh3/default.nix +++ b/pkgs/development/python-modules/qh3/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "qh3"; - version = "1.5.5"; + version = "1.5.6"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "qh3"; tag = "v${version}"; - hash = "sha256-mUbKIjPFmuQB+GV7IMtUPXTKClCKWG8lAKLs1ezKYEU="; + hash = "sha256-QJfun9CjqdtVmn7Ws4+VJaeGCQgxnEy+L3SMCZFMK1o="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-drTXh7WkcXpNwWNfDGf+7qlXLUIOH0ysom6pUkVSD6s="; + hash = "sha256-4CLvkyOd0GYh4/v40Qtv3rPJXRwOPXHg9Oo+eWN0luA="; }; nativeBuildInputs = [ From d509172e86f92aa0ac29cbca8b77d1c23bccd194 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 04:20:55 +0000 Subject: [PATCH 2258/2279] olympus-unwrapped: 25.11.02.03 -> 25.11.09.03 --- pkgs/by-name/ol/olympus-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index b49bc930d789..57fbcc195e8e 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -31,9 +31,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "25.11.02.03"; - buildId = "5271"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "79673980d47003d9756b373001a9f57c267acbfb"; + version = "25.11.09.03"; + buildId = "5277"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "6a1e895a5fa5ccf2d0ba494d03ffe3280aebd9d9"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -44,7 +44,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-KMGSAIYNlzWK9jvn7QTmxUQRNjn0VQU5kLVzTc9mzf8="; + hash = "sha256-Qog5U4MuGm50aULo1U0WcSASH+hEJ1QMyhV6u+1r6jU="; }; nativeBuildInputs = [ From 483a5e7a0e868e4fe43dcc95afb82085b93f586d Mon Sep 17 00:00:00 2001 From: Rowenna Emma Date: Thu, 25 Sep 2025 21:15:57 -0700 Subject: [PATCH 2259/2279] buildGraalvm: remove unset vars This patch removes remaining uses of unset bash var $extraNativeImageArgs which commit bc1bc1aa3 forgot to remove when deleting the var. --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 7be63b3a0a5f..d1ef2e8470f1 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -224,7 +224,7 @@ let # -H:+StaticExecutableWithDynamicLibC is only available in Linux lib.optionalString (stdenv.hostPlatform.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' '' } @@ -233,7 +233,7 @@ let # --static is only available in x86_64 Linux lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld + $out/bin/native-image -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' '' } From 727a55225f6018476bacdc4ae428329a3dbb7695 Mon Sep 17 00:00:00 2001 From: Rowenna Emma Date: Sat, 27 Sep 2025 21:36:33 -0700 Subject: [PATCH 2260/2279] buildGraalvm: refactor use of --add-flags Simplifies the flag-handling code by using only one --add-flags, rather than treating --add-flags like --add-flag by mapping it onto every flag --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index d1ef2e8470f1..13c9ff105e91 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -137,8 +137,8 @@ let postInstall = let - cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs); - preservedNixVariables = [ + cLibsFlags = (map (l: "-H:CLibraryPath=${l}/lib") cLibs); + preservedNixVarFlags = [ "-ENIX_BINTOOLS" "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" "-ENIX_BUILD_CORES" @@ -161,7 +161,6 @@ let "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET" "-ENIX_APPLE_SDK_VERSION" ]; - preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables); in '' # jni.h expects jni_md.h to be in the header search path. @@ -182,7 +181,7 @@ let wrapProgram $out/bin/native-image \ --prefix PATH : ${binPath} \ - ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)} + --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags)}" ''; preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' From 006ab01d64a708cd1c9c30454b1a4a002ab77b72 Mon Sep 17 00:00:00 2001 From: Rowenna Emma Date: Thu, 25 Sep 2025 21:30:11 -0700 Subject: [PATCH 2261/2279] buildGraalvm: fix native-image on darwin On Darwin, it is apparently Oracle's intention to be hostile towards builds of Clang which are not by Apple. see https://github.com/oracle/graal/issues/12041 If you want native-image to both work on Darwin and use the nix-provided CC then you must pass it the flags to disable toolchain checking entirely. Since the flags are mandatory for functionality, they should be part of the wrapper. --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 13c9ff105e91..5b4821bf63df 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -161,6 +161,10 @@ let "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET" "-ENIX_APPLE_SDK_VERSION" ]; + checkToolchainFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "-H:+UnlockExperimentalVMOptions" + "-H:-CheckToolchain" + ]; in '' # jni.h expects jni_md.h to be in the header search path. @@ -181,7 +185,7 @@ let wrapProgram $out/bin/native-image \ --prefix PATH : ${binPath} \ - --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags)}" + --add-flags "${toString (cLibsFlags ++ preservedNixVarFlags ++ checkToolchainFlags)}" ''; preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) '' @@ -216,7 +220,7 @@ let $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility HelloWorld + $out/bin/native-image -H:+ReportExceptionStackTraces -march=compatibility HelloWorld ./helloworld | fgrep 'Hello World' ${ From b2ddc71a88b17035ac5a89d4bd4b0315de057f80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 05:56:02 +0000 Subject: [PATCH 2262/2279] monkeysAudio: 11.80 -> 11.82 --- pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index a9874a5aab18..05c8af165a66 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.80"; + version = "11.82"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-Y1Zeuelx4fAWYm9dCETM47t80b4w2biTBrLujkgH1oA="; + hash = "sha256-M/ndWIga0FTqOQcekFRT4sQ3gpPsQKSdOVHmx8kiQZI="; stripRoot = false; }; From c04a6a10c58c2f10f6185f485c05cd2121d418c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 06:19:58 +0000 Subject: [PATCH 2263/2279] libretro.gambatte: 0-unstable-2025-10-10 -> 0-unstable-2025-11-07 --- pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index 87f426946fc9..3a754dd50bce 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2025-10-10"; + version = "0-unstable-2025-11-07"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "b75225203ffea8b65124bb31acb598e91e7f22d9"; - hash = "sha256-q2gq4eBa1I89PROkxTt7XGIjI2H1eWFDi6lMH+emlmg="; + rev = "45ee875b71de88502f8c0a7fe497e3dc708c1fee"; + hash = "sha256-E6rrPE/cu8xhM0dOY/MnWpYrqG/NKtmmbas9ieBle/8="; }; meta = { From a14f80c97ab0b0f459ee10c7d8497889dc91b1c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 07:11:40 +0000 Subject: [PATCH 2264/2279] geminicommit: 0.5.0 -> 0.6.0 --- pkgs/by-name/ge/geminicommit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ge/geminicommit/package.nix b/pkgs/by-name/ge/geminicommit/package.nix index adca1bc69f2a..2a8c84288da2 100644 --- a/pkgs/by-name/ge/geminicommit/package.nix +++ b/pkgs/by-name/ge/geminicommit/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "geminicommit"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tfkhdyt"; repo = "geminicommit"; tag = "v${finalAttrs.version}"; - hash = "sha256-wUqu6/j9AyD/THblX0w+Wt43FK//WammB6c425pTwbc="; + hash = "sha256-PH9IYVlHZuXEzpRvT0luSZej1dFzUyxGzoQ+z79u5kU="; }; vendorHash = "sha256-4aVUD16zhzWvgD90gttmoDRoKKb0dRgDdH1HMfgd3LU="; @@ -29,8 +29,8 @@ buildGoModule (finalAttrs: { cmd = finalAttrs.meta.mainProgram; goDefaultCmd = finalAttrs.pname; in - # The official github released binary is renamed since v0.5.0, - # see: https://github.com/tfkhdyt/geminicommit/releases/tag/v0.5.0 + # The official github released binary is renamed since v0.6.0, + # see: https://github.com/tfkhdyt/geminicommit/releases/tag/v0.6.0 # Here we link the old name (which is also the `go build` default name) # for backward compatibility: '' From 25d75d77cd6b7d26fb1299712349cc63a4020301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 11 Nov 2025 08:29:51 +0100 Subject: [PATCH 2265/2279] retroarch: fix build by pinning to ffmpeg_7 Apparently it needs adapting for ffmpeg_8 (since 130c992961), and I noticed at least no new retroarch release upstream so far. https://hydra.nixos.org/build/312822244/nixlog/2/tail --- pkgs/by-name/re/retroarch-bare/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/retroarch-bare/package.nix b/pkgs/by-name/re/retroarch-bare/package.nix index 44fa61e1b947..266ac84cbdf9 100644 --- a/pkgs/by-name/re/retroarch-bare/package.nix +++ b/pkgs/by-name/re/retroarch-bare/package.nix @@ -5,7 +5,7 @@ alsa-lib, dbus, fetchFromGitHub, - ffmpeg, + ffmpeg_7, flac, freetype, gamemode, @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ++ lib.optional (runtimeLibs != [ ]) makeBinaryWrapper; buildInputs = [ - ffmpeg + ffmpeg_7 flac freetype libGL From 699808657b7b69ad29aa00fb38c7cdaf24b97b27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 07:46:13 +0000 Subject: [PATCH 2266/2279] pyradio: 0.9.3.11.20 -> 0.9.3.11.21 --- pkgs/by-name/py/pyradio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index f294c5138555..2c6592de1d24 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.3.11.20"; + version = "0.9.3.11.21"; pyproject = true; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = version; - hash = "sha256-dcs9kwuS1/pNtBPhj6Z1VAHFJw/ajwzc2aTWGU/h4W0="; + hash = "sha256-elNApj+zslOd2BvXKxLPaCrUhLYBN38yqi6xgFAponI="; }; nativeBuildInputs = [ From 615a92cb028d65cbfbbd9e4c3b622b744e354a50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Nov 2025 07:53:58 +0000 Subject: [PATCH 2267/2279] limine: 10.2.1 -> 10.3.0 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 6e71ee80c310..3245cc408eef 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.2.1"; + version = "10.3.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-t9uNKbJKU9qvx9LJRCyDAeLeImDMBxl6m13VQt8E6BY="; + hash = "sha256-0LmbQ+BuzfPn2xBdcKqcBkxbR1nJrSwIkomaupmiJJk="; }; enableParallelBuilding = true; From 783c88af4cf5934d0edffad2bb6b09287083fb83 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 11 Nov 2025 10:26:21 +0100 Subject: [PATCH 2268/2279] asciinema_3: use `versionCheckHook` --- pkgs/by-name/as/asciinema_3/package.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index d3a841bdbf30..2803cd784ab2 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -4,7 +4,7 @@ installShellFiles, python3, rustPlatform, - testers, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -12,10 +12,9 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "3.0.1"; src = fetchFromGitHub { - name = "asciinema-source-${finalAttrs.version}"; owner = "asciinema"; repo = "asciinema"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jWRq/LeDdCETiOMkWr9EIWztb14IYGCSo05QPw5HZZk="; }; @@ -23,6 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: { env.ASCIINEMA_GEN_DIR = "gendir"; + strictDeps = true; + nativeCheckInputs = [ python3 ]; nativeBuildInputs = [ installShellFiles ]; @@ -34,14 +35,9 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh gendir/completion/_asciinema ''; - strictDeps = true; - - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "asciinema --version"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { homepage = "https://asciinema.org/"; From 6f64c3e57659866603abb15d54411840c5e5039a Mon Sep 17 00:00:00 2001 From: jaen <227236+jaen@users.noreply.github.com> Date: Tue, 11 Nov 2025 10:41:28 +0100 Subject: [PATCH 2269/2279] yq-go: fix cross-compilation Using `lib.optionalAttrs` returned wrong attribute type (`{}` vs. expected `[]`) when cross-compiling, breaking the package. --- pkgs/by-name/yq/yq-go/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index e400e15a5478..485e199ae32b 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-p+7dD3NVXg3XZowIgDaGs1MSaxXY5OPLmnw44p4m4A4="; - nativeBuildInputs = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles pandoc ]; From 579fbfaa0b4ac61f007f7b898389ab7436f5cbf7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 11 Nov 2025 11:19:40 +0100 Subject: [PATCH 2270/2279] haskellPackages.cabal2nix-unstable: 2025-10-31 -> 2025-10-11 poppler-cpp is now recognized automatically. (This partially reverts commit 2f1f72d5a2ea8d96f5ba200567815cb6d43d79f3.) --- .../haskell-modules/cabal2nix-unstable/cabal2nix.nix | 6 +++--- .../cabal2nix-unstable/distribution-nixpkgs.nix | 6 +++--- .../haskell-modules/cabal2nix-unstable/hackage-db.nix | 6 +++--- .../haskell-modules/cabal2nix-unstable/language-nix.nix | 6 +++--- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix index 8e72a9cd0691..dc82033beeef 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "2.20.1-unstable-2025-10-31"; + version = "2.20.1-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix index aec2e430ae4e..00afd0bb28c4 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix @@ -18,10 +18,10 @@ }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.7.1.1-unstable-2025-10-31"; + version = "1.7.1.1-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot"; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix index 34cb94b054c7..2ad97d7259df 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix @@ -17,10 +17,10 @@ }: mkDerivation { pname = "hackage-db"; - version = "2.1.3-unstable-2025-10-31"; + version = "2.1.3-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix index 4bb491849207..d0e04dc856ab 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix @@ -13,10 +13,10 @@ }: mkDerivation { pname = "language-nix"; - version = "2.3.0-unstable-2025-10-31"; + version = "2.3.0-unstable-2025-11-11"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz"; - sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z"; + url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz"; + sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49"; }; postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce2c3143bb67..c08915cbc734 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2944,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (super.pdftotext.override { poppler-cpp = pkgs.poppler; }); + }) super.pdftotext; # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 85cb7460a388..64d8e83a797e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -510629,7 +510629,7 @@ self: { hspec, hspec-discover, optparse-applicative, - poppler-cpp, + poppler, range, text, }: @@ -510644,7 +510644,7 @@ self: { bytestring text ]; - libraryPkgconfigDepends = [ poppler-cpp ]; + libraryPkgconfigDepends = [ poppler ]; executableHaskellDepends = [ aeson ansi-wl-pprint @@ -510664,7 +510664,7 @@ self: { mainProgram = "pdftotext.hs"; maintainers = [ lib.maintainers.mpscholten ]; } - ) { poppler-cpp = null; }; + ) { inherit (pkgs) poppler; }; pdynload = callPackage ( { From ae0b6c5a8b97d0bf01ac8fd335c993aa545e221e Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 11 Nov 2025 06:23:26 -0500 Subject: [PATCH 2271/2279] build-tex-env: Pass `pathsToLink` as an argument, not an attr. Resolves an issue that began with https://github.com/NixOS/nixpkgs/pull/451871 because `pathsToLink` is no longer the operative attr in the derivation. Passing it as an argument properly translates it to the `pathsToLinkJSON` attr that it needs to be. --- pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index d179ef835a92..154ad98cab05 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -45,13 +45,17 @@ lib.fix ( ### buildEnv with custom attributes buildEnv' = args: - ( - buildEnv { inherit (args) name paths; } + (buildEnv ( + { + inherit (args) name paths; + } // lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; } - ).overrideAttrs + // lib.optionalAttrs (args ? pathsToLink) { inherit (args) pathsToLink; } + )).overrideAttrs ( removeAttrs args [ "extraOutputsToInstall" + "pathsToLink" "name" "paths" "pkgs" From 01258c1162aba93cb7e7be0d10cfa495d1f97ec6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:46:47 +0100 Subject: [PATCH 2272/2279] postgresql_13: 13.22 -> 13.23 Release Notes: https://github.com/postgres/postgres/blob/89df812eb890814b105d871185935b580478e660/doc/src/sgml/release-13.sgml Fixes: CVE-2025-12817 CVE-2025-12818 --- pkgs/servers/sql/postgresql/13.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/13.nix b/pkgs/servers/sql/postgresql/13.nix index 53aa3ea5e44e..7be01f723e00 100644 --- a/pkgs/servers/sql/postgresql/13.nix +++ b/pkgs/servers/sql/postgresql/13.nix @@ -1,7 +1,9 @@ import ./generic.nix { - version = "13.22"; - rev = "refs/tags/REL_13_22"; - hash = "sha256-6zHA+WU1FroUbGJcTAeEbPKBVQY7SKpT5+Kxe9ZhtoM="; + version = "13.23"; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_13_23"; + rev = "89df812eb890814b105d871185935b580478e660"; + hash = "sha256-GSIHFSt2wzaI3HkA3yX/gZZF+LKwODHYislagdhQjmE="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b"; From 88fd06566cd47d1d52ab86e7adecab91e06c8c56 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:47:55 +0100 Subject: [PATCH 2273/2279] postgresql_14: 14.19 -> 14.20 Release Notes: https://github.com/postgres/postgres/blob/9ad034be354da9af1cea76836a9e576c110d1ff3/doc/src/sgml/release-14.sgml Fixes: CVE-2025-12817 CVE-2025-12818 --- pkgs/servers/sql/postgresql/14.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index e0b6deadab98..09262f8be453 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,9 @@ import ./generic.nix { - version = "14.19"; - rev = "refs/tags/REL_14_19"; - hash = "sha256-z8MEeLae4W4YqGBNcPtKnUENxnixugnv5Q6r+LW4uu8="; + version = "14.20"; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_14_20"; + rev = "9ad034be354da9af1cea76836a9e576c110d1ff3"; + hash = "sha256-5wWuS78yn1p+ZjlUy5jCf1mLq78D3iI7mWPBVTd1Ufk="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; From 534d73a49febcc48e80a8a6467024f1fd93fe140 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:48:32 +0100 Subject: [PATCH 2274/2279] postgresql_15: 15,14 -> 15.15 Release Notes: https://github.com/postgres/postgres/blob/32f38816779420502d4a311835d5fe939e9548a0/doc/src/sgml/release-15.sgml Fixes: CVE-2025-12817 CVE-2025-12818 --- pkgs/servers/sql/postgresql/15.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 6cb49891ad0d..11e4144564e8 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,9 @@ import ./generic.nix { - version = "15.14"; - rev = "refs/tags/REL_15_14"; - hash = "sha256-KzN0gsEY6wFLqNYMxbTj2NH+4IWO0pplWP4XO/fqRLM="; + version = "15.15"; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_15_15"; + rev = "32f38816779420502d4a311835d5fe939e9548a0"; + hash = "sha256-veGKXAvK+dNofBuSXsmCsPdXDJOC04+QV3HEr0XaE68="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; From 1a270675e209963dcb7f0af94a727d3b82ce1438 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:49:07 +0100 Subject: [PATCH 2275/2279] postgresql_16: 16.10 -> 16.11 Release Notes: https://github.com/postgres/postgres/blob/d61dd817be70749d14e982a369e97fdda9d5cba6/doc/src/sgml/release-16.sgml Fixes: CVE-2025-12817 CVE-2025-12818 --- pkgs/servers/sql/postgresql/16.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index c0b7498da49c..478c1dc234bd 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,9 @@ import ./generic.nix { - version = "16.10"; - rev = "refs/tags/REL_16_10"; - hash = "sha256-1zG8+G/lNA1xm0hxLVEilIaI+25d4gfpqA2aCb4+taY="; + version = "16.11"; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_16_11"; + rev = "d61dd817be70749d14e982a369e97fdda9d5cba6"; + hash = "sha256-hxv+N+OWqiXmFmsB+SSYGKQLBbHtNMnneHFvOtUz8z4="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; From a52728a9b15eb5a052ba9ca47e4d0a0e7f6194d3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:59:00 +0100 Subject: [PATCH 2276/2279] libpq: 18.0 -> 18.1 Release Notes: https://github.com/postgres/postgres/blob/4b324845ba5d24682b9b3708a769f00d160afbd7/doc/src/sgml/release-18.sgml Fixes: CVE-2025-12818 --- pkgs/servers/sql/postgresql/libpq.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 79cb7e76360f..32878f3660ab 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -40,14 +40,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "libpq"; - version = "18.0"; + version = "18.1"; src = fetchFromGitHub { owner = "postgres"; repo = "postgres"; # rev, not tag, on purpose: see generic.nix. - rev = "refs/tags/REL_18_0"; - hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec="; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_18_1"; + rev = "4b324845ba5d24682b9b3708a769f00d160afbd7"; + hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g="; }; __structuredAttrs = true; From 8e8cc8abefc4667c7576bf7748bad2c263796faa Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:49:36 +0100 Subject: [PATCH 2277/2279] postgresql_17: 17.6 -> 17.7 Release Notes: https://github.com/postgres/postgres/blob/fbb530a3dff569222bea7098ad4de3d8bde97740/doc/src/sgml/release-17.sgml Fixes: CVE-2025-12817 CVE-2025-12818 --- pkgs/servers/sql/postgresql/17.nix | 8 +++++--- pkgs/servers/sql/postgresql/generic.nix | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index faacd3b72fc5..3f6e2b3f5b22 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,9 @@ import ./generic.nix { - version = "17.6"; - rev = "refs/tags/REL_17_6"; - hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU="; + version = "17.7"; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_17_7"; + rev = "fbb530a3dff569222bea7098ad4de3d8bde97740"; + hash = "sha256-W+505LAeiO5ln7wBhxZLv/p3GxiJp8MFfCGVDyvHREg="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 836b48664aa5..1ab79b168039 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -163,11 +163,12 @@ let dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; - # Pin LLVM 20 until upstream has resolved: + # Pin LLVM 20 until upstream has fully resolved: # https://www.postgresql.org/message-id/flat/d25e6e4a-d1b4-84d3-2f8a-6c45b975f53d%40applied-asynchrony.com + # Currently still a problem on aarch64. # TODO: Remove with next minor releases llvmPackages = lib.warnIf ( - version == "17.7" + version == "17.8" ) "PostgreSQL: Is the pin for LLVM 20 still needed?" llvmPackages_20; stdenv' = @@ -426,7 +427,7 @@ let ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [ ./patches/export-dynamic-darwin-15-.patch ] - ++ lib.optionals (atLeast "17") [ + ++ lib.optionals (atLeast "18") [ (fetchpatch2 { url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch"; hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus="; From 07885bcfa1021fc2e7e4cac4812c27d5be9e2eb9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Nov 2025 12:50:19 +0100 Subject: [PATCH 2278/2279] postgresql_18: 18.0 -> 18.1 Release Notes: https://github.com/postgres/postgres/blob/4b324845ba5d24682b9b3708a769f00d160afbd7/doc/src/sgml/release-18.sgml Fixes: CVE-2025-12817 CVE-2025-12818 --- pkgs/servers/sql/postgresql/18.nix | 8 +++++--- pkgs/servers/sql/postgresql/generic.nix | 6 ------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix index 401471cde9a7..ab7a401d8b98 100644 --- a/pkgs/servers/sql/postgresql/18.nix +++ b/pkgs/servers/sql/postgresql/18.nix @@ -1,7 +1,9 @@ import ./generic.nix { - version = "18.0"; - rev = "refs/tags/REL_18_0"; - hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec="; + version = "18.1"; + # TODO: Move back to tag, when they appear upstream: + # rev = "refs/tags/REL_18_1"; + rev = "4b324845ba5d24682b9b3708a769f00d160afbd7"; + hash = "sha256-cZA2hWtr5RwsUrRWkvl/yvUzFPSfdtpyAKGXfrVUr0g="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 1ab79b168039..5cc4f21ea8db 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -426,12 +426,6 @@ let ] ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [ ./patches/export-dynamic-darwin-15-.patch - ] - ++ lib.optionals (atLeast "18") [ - (fetchpatch2 { - url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch"; - hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus="; - }) ]; installTargets = [ "install-world" ]; From ccaa0205bcac5abc582645d94826164ddedd3b4f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 11 Nov 2025 14:19:11 +0000 Subject: [PATCH 2279/2279] typesetter: init at 0.5.0 --- pkgs/by-name/ty/typesetter/package.nix | 85 ++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 pkgs/by-name/ty/typesetter/package.nix diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix new file mode 100644 index 000000000000..6325c3880b40 --- /dev/null +++ b/pkgs/by-name/ty/typesetter/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitea, + rustPlatform, + + # nativeBuildInputs + cargo, + desktop-file-utils, + gettext, + meson, + ninja, + pkg-config, + python3, + rustc, + wrapGAppsHook4, + + # buildInputs + gdk-pixbuf, + graphene, + gtk4, + gtksourceview5, + libadwaita, + libspelling, + openssl, + pango, + + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "typesetter"; + version = "0.5.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "haydn"; + repo = "typesetter"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TYSmkjYvRUlKxilKr7WlUYQ2U/PsSuI/b8HOnUreXYk="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-lizLARb0wL3hHRl3kbxrlWyt0rB1BUuoZbaVIUeFMXU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cargo + desktop-file-utils + gettext # msgfmt + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + gdk-pixbuf + graphene + gtk4 + gtksourceview5 + libadwaita + libspelling + openssl + pango + ]; + + env.OPENSSL_NO_VENDOR = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minimalist, local-first Typst editor"; + homepage = "https://codeberg.org/haydn/typesetter"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "typesetter"; + }; +})